diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-27 17:33:25 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-27 17:33:25 -0700 |
| commit | 91c9f4cb205169d0ec151293136aa27d113f2090 (patch) | |
| tree | 526d87cbc5be7f18892872ab668bcac2cafe6c73 /node/Node.cpp | |
| parent | e4896b257fde05a216500804d9bcef3b84b0980e (diff) | |
| download | infinitytier-91c9f4cb205169d0ec151293136aa27d113f2090.tar.gz infinitytier-91c9f4cb205169d0ec151293136aa27d113f2090.zip | |
Fix TRACE and CLUSTER builds.
Diffstat (limited to 'node/Node.cpp')
| -rw-r--r-- | node/Node.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index 4e8d6655..e7dc637f 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -285,7 +285,7 @@ ZT_ResultCode Node::processBackgroundTasks(void *tptr,uint64_t now,volatile uint #ifdef ZT_ENABLE_CLUSTER // If clustering is enabled we have to call cluster->doPeriodicTasks() very often, so we override normal timer deadline behavior if (RR->cluster) { - RR->sw->doTimerTasks(now); + RR->sw->doTimerTasks(tptr,now); RR->cluster->doPeriodicTasks(); *nextBackgroundTaskDeadline = now + ZT_CLUSTER_PERIODIC_TASK_PERIOD; // this is really short so just tick at this rate } else { @@ -686,7 +686,7 @@ void Node::postTrace(const char *module,unsigned int line,const char *fmt,...) tmp2[sizeof(tmp2)-1] = (char)0; Utils::snprintf(tmp1,sizeof(tmp1),"[%s] %s:%u %s",nowstr,module,line,tmp2); - postEvent(ZT_EVENT_TRACE,tmp1); + postEvent((void *)0,ZT_EVENT_TRACE,tmp1); } #endif // ZT_TRACE |