Merge branch 'ticket33290_v2_042' into ticket33290_v2_043

Conflicts:
	src/core/or/circuitmux_ewma.c

diff --cc src/core/or/circuitmux.c
index 0e932f032d1d5f1d2c0861229e87c8f9f4c459c9,72f6ba662bc7b87093ad6a349d9e14e4b2d349f9..1f79ea4d919442e760cefcb96024f5c06de78269
--- 1/src/core/or/circuitmux.c
--- 2/src/core/or/circuitmux.c
+++ b/src/core/or/circuitmux.c
@@@ -77,8 -75,12 +77,10 @@@
  #include "core/or/circuitmux.h"
  #include "core/or/relay.h"
  
 -#include "core/or/cell_queue_st.h"
 -#include "core/or/destroy_cell_queue_st.h"
  #include "core/or/or_circuit_st.h"
  
+ #include "lib/crypt_ops/crypto_util.h"
+ 
  /*
   * Private typedefs for circuitmux.c
   */

diff --cc src/core/or/circuitmux_ewma.c
Simple merge

diff --cc src/core/or/circuitmux_ewma.h
index fc7e7ebf7f3a1910daad7a360ed5a74f9d2f1f1d,b45ce1f916f5d66ed8616e2015a32e66838d789f..e41cf9e0f0dbe70acdbb97a2b3ff686f78bf39bf
--- 1/src/core/or/circuitmux_ewma.h
--- 2/src/core/or/circuitmux_ewma.h
+++ b/src/core/or/circuitmux_ewma.h
@@@ -22,114 -22,9 +22,117 @@@ void cmux_ewma_set_options(const or_opt
  void circuitmux_ewma_free_all(void);
  
  #ifdef CIRCUITMUX_EWMA_PRIVATE
-     tor_assert(pol->magic == EWMA_POL_DATA_MAGIC);
 +
 +/*** EWMA structures ***/
 +
 +typedef struct cell_ewma_t cell_ewma_t;
 +typedef struct ewma_policy_data_t ewma_policy_data_t;
 +typedef struct ewma_policy_circ_data_t ewma_policy_circ_data_t;
 +
 +/**
 + * The cell_ewma_t structure keeps track of how many cells a circuit has
 + * transferred recently.  It keeps an EWMA (exponentially weighted moving
 + * average) of the number of cells flushed from the circuit queue onto a
 + * connection in channel_flush_from_first_active_circuit().
 + */
 +
 +struct cell_ewma_t {
 +  /** The last 'tick' at which we recalibrated cell_count.
 +   *
 +   * A cell sent at exactly the start of this tick has weight 1.0. Cells sent
 +   * since the start of this tick have weight greater than 1.0; ones sent
 +   * earlier have less weight. */
 +  unsigned int last_adjusted_tick;
 +  /** The EWMA of the cell count. */
 +  double cell_count;
 +  /** True iff this is the cell count for a circuit's previous
 +   * channel. */
 +  unsigned int is_for_p_chan : 1;
 +  /** The position of the circuit within the OR connection's priority
 +   * queue. */
 +  int heap_index;
 +};
 +
 +struct ewma_policy_data_t {
 +  circuitmux_policy_data_t base_;
 +
 +  /**
 +   * Priority queue of cell_ewma_t for circuits with queued cells waiting
 +   * for room to free up on the channel that owns this circuitmux.  Kept
 +   * in heap order according to EWMA.  This was formerly in channel_t, and
 +   * in or_connection_t before that.
 +   */
 +  smartlist_t *active_circuit_pqueue;
 +
 +  /**
 +   * The tick on which the cell_ewma_ts in active_circuit_pqueue last had
 +   * their ewma values rescaled.  This was formerly in channel_t, and in
 +   * or_connection_t before that.
 +   */
 +  unsigned int active_circuit_pqueue_last_recalibrated;
 +};
 +
 +struct ewma_policy_circ_data_t {
 +  circuitmux_policy_circ_data_t base_;
 +
 +  /**
 +   * The EWMA count for the number of cells flushed from this circuit
 +   * onto this circuitmux.  Used to determine which circuit to flush
 +   * from next.  This was formerly in circuit_t and or_circuit_t.
 +   */
 +  cell_ewma_t cell_ewma;
 +
 +  /**
 +   * Pointer back to the circuit_t this is for; since we're separating
 +   * out circuit selection policy like this, we can't attach cell_ewma_t
 +   * to the circuit_t any more, so we can't use SUBTYPE_P directly to a
 +   * circuit_t like before; instead get it here.
 +   */
 +  circuit_t *circ;
 +};
 +
 +#define EWMA_POL_DATA_MAGIC 0x2fd8b16aU
 +#define EWMA_POL_CIRC_DATA_MAGIC 0x761e7747U
 +
 +/*** Downcasts for the above types ***/
 +
 +/**
 + * Downcast a circuitmux_policy_data_t to an ewma_policy_data_t and assert
 + * if the cast is impossible.
 + */
 +
 +static inline ewma_policy_data_t *
 +TO_EWMA_POL_DATA(circuitmux_policy_data_t *pol)
 +{
 +  if (!pol) return NULL;
 +  else {
-     tor_assert(pol->magic == EWMA_POL_CIRC_DATA_MAGIC);
++    tor_assertf(pol->magic == EWMA_POL_DATA_MAGIC,
++                "Mismatch: %"PRIu32" != %"PRIu32,
++                pol->magic, EWMA_POL_DATA_MAGIC);
 +    return DOWNCAST(ewma_policy_data_t, pol);
 +  }
 +}
 +
 +/**
 + * Downcast a circuitmux_policy_circ_data_t to an ewma_policy_circ_data_t
 + * and assert if the cast is impossible.
 + */
 +
 +static inline ewma_policy_circ_data_t *
 +TO_EWMA_POL_CIRC_DATA(circuitmux_policy_circ_data_t *pol)
 +{
 +  if (!pol) return NULL;
 +  else {
++    tor_assertf(pol->magic == EWMA_POL_CIRC_DATA_MAGIC,
++                "Mismatch: %"PRIu32" != %"PRIu32,
++                pol->magic, EWMA_POL_CIRC_DATA_MAGIC);
 +    return DOWNCAST(ewma_policy_circ_data_t, pol);
 +  }
 +}
 +
  STATIC unsigned cell_ewma_get_current_tick_and_fraction(double *remainder_out);
  STATIC void cell_ewma_initialize_ticks(void);
 -#endif
  
 -#endif /* !defined(TOR_CIRCUITMUX_EWMA_H) */
 +#endif /* defined(CIRCUITMUX_EWMA_PRIVATE) */
  
- 
 +#endif /* !defined(TOR_CIRCUITMUX_EWMA_H) */