mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 20:33:31 +01:00
sched: Implement SCHED_BUG()
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
parent
1e7e36da4b
commit
2e8de0de3b
@ -9,6 +9,9 @@
|
|||||||
#define SCHEDULER_KIST_PRIVATE
|
#define SCHEDULER_KIST_PRIVATE
|
||||||
#include "scheduler.h"
|
#include "scheduler.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include "buffers.h"
|
||||||
|
#define TOR_CHANNEL_INTERNAL_
|
||||||
|
#include "channeltls.h"
|
||||||
|
|
||||||
#include <event2/event.h>
|
#include <event2/event.h>
|
||||||
|
|
||||||
@ -667,6 +670,32 @@ scheduler_channel_wants_writes(channel_t *chan)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Log warn the given channel and extra scheduler context as well. This is
|
||||||
|
* used by SCHED_BUG() in order to be able to extract as much information as
|
||||||
|
* we can when we hit a bug. Channel chan can be NULL. */
|
||||||
|
void
|
||||||
|
scheduler_bug_occurred(const channel_t *chan)
|
||||||
|
{
|
||||||
|
char buf[128];
|
||||||
|
|
||||||
|
if (chan != NULL) {
|
||||||
|
const size_t outbuf_len =
|
||||||
|
buf_datalen(TO_CONN(BASE_CHAN_TO_TLS((channel_t *) chan)->conn)->outbuf);
|
||||||
|
tor_snprintf(buf, sizeof(buf),
|
||||||
|
"Channel %" PRIu64 " in state %s and scheduler state %d."
|
||||||
|
" Num cells on cmux: %d. Connection outbuf len: %lu.",
|
||||||
|
chan->global_identifier,
|
||||||
|
channel_state_to_string(chan->state),
|
||||||
|
chan->scheduler_state, circuitmux_num_cells(chan->cmux),
|
||||||
|
outbuf_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
log_warn(LD_BUG, "%s Num pending channels: %d. Channel in pending list: %s",
|
||||||
|
(chan != NULL) ? buf : "No channel in bug context.",
|
||||||
|
smartlist_len(channels_pending),
|
||||||
|
(smartlist_pos(channels_pending, chan) == -1) ? "no" : "yes");
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef TOR_UNIT_TESTS
|
#ifdef TOR_UNIT_TESTS
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -143,6 +143,14 @@ MOCK_DECL(void, scheduler_channel_has_waiting_cells, (channel_t *chan));
|
|||||||
/*********************************
|
/*********************************
|
||||||
* Defined in scheduler.c
|
* Defined in scheduler.c
|
||||||
*********************************/
|
*********************************/
|
||||||
|
|
||||||
|
/* Triggers a BUG() and extra information with chan if available. */
|
||||||
|
#define SCHED_BUG(cond, chan) \
|
||||||
|
(PREDICT_UNLIKELY(cond) ? \
|
||||||
|
((BUG(cond)) ? (scheduler_bug_occurred(chan), 1) : 0) : 0)
|
||||||
|
|
||||||
|
void scheduler_bug_occurred(const channel_t *chan);
|
||||||
|
|
||||||
smartlist_t *get_channels_pending(void);
|
smartlist_t *get_channels_pending(void);
|
||||||
MOCK_DECL(int, scheduler_compare_channels,
|
MOCK_DECL(int, scheduler_compare_channels,
|
||||||
(const void *c1_v, const void *c2_v));
|
(const void *c1_v, const void *c2_v));
|
||||||
|
Loading…
Reference in New Issue
Block a user