nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

With COCCI defined, avoid PERIODIC_EVENT.

Browse Source 
Coccinelle doesn't understand the particular pattern of token
pasting we have going on here.
This commit is contained in:
Nick Mathewson 2019-10-09 10:34:43 -04:00
parent 48be922160
commit b867e97ce6
5 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/mainloop/mainloop.c
View File

@ -1363,8 +1363,10 @@ CALLBACK(second_elapsed);
#undef CALLBACK
/* Now we declare an array of periodic_event_item_t for each periodic event */
#define CALLBACK(name, r, f) \
#ifndef COCCI
#define CALLBACK(name, r, f) \
PERIODIC_EVENT(name, PERIODIC_EVENT_ROLE_ ## r, f)
#endif
#define FL(name) (PERIODIC_EVENT_FLAG_ ## name)
STATIC periodic_event_item_t mainloop_periodic_events[] = {

2
src/core/mainloop/periodic.h
View File

@ -71,8 +71,10 @@ typedef struct periodic_event_item_t {
} periodic_event_item_t;
/** events will get their interval from first execution */
#ifndef COCCI
#define PERIODIC_EVENT(fn, r, f) { fn##_callback, 0, NULL, #fn, r, f, 0 }
#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL, 0, 0, 0 }
#endif
/* Return true iff the given event was setup before thus is enabled to be
* scheduled. */

2
src/core/or/or_periodic.c
View File

@ -20,11 +20,13 @@
#include "feature/relay/routermode.h"
#ifndef COCCI
#define DECLARE_EVENT(name, roles, flags) \
static periodic_event_item_t name ## _event = \
PERIODIC_EVENT(name, \
PERIODIC_EVENT_ROLE_##roles, \
flags)
#endif
#define FL(name) (PERIODIC_EVENT_FLAG_ ## name)

2
src/feature/dirauth/dirauth_periodic.c
View File

@ -18,11 +18,13 @@
#include "core/mainloop/periodic.h"
#ifndef COCCI
#define DECLARE_EVENT(name, roles, flags) \
static periodic_event_item_t name ## _event = \
PERIODIC_EVENT(name, \
PERIODIC_EVENT_ROLE_##roles, \
flags)
#endif
#define FL(name) (PERIODIC_EVENT_FLAG_##name)

2
src/feature/relay/relay_periodic.c
View File

@ -31,11 +31,13 @@
#include "feature/nodelist/routerinfo_st.h"
#include "feature/control/control_events.h"
#ifndef COCCI
#define DECLARE_EVENT(name, roles, flags) \
static periodic_event_item_t name ## _event = \
PERIODIC_EVENT(name, \
PERIODIC_EVENT_ROLE_##roles, \
flags)
#endif
#define FL(name) (PERIODIC_EVENT_FLAG_##name)