Moved global g_ticker from XmlDoc to a local in Threads.cpp

This commit is contained in:
Ivan Skytte Jørgensen
2016-01-26 12:01:08 +01:00
parent a31aeb917a
commit ce1501dda7
3 changed files with 2 additions and 4 deletions

@ -10,8 +10,6 @@
#include <sys/wait.h> // waitpid()
#include "Rdb.h" // g_mergeUrgent
#include <sched.h> // clone()
//#include "Msg16.h" // g_pid g_ticker
#include "XmlDoc.h" // g_pid g_ticker
#include "Profiler.h"
#include "Stats.h"
#include "Process.h"
@ -34,6 +32,8 @@ int pthread_mutex_unlock (pthread_mutex_t *t ) { return 0; }
// on 64-bit architectures pthread_t is 64 bit and pid_t is 32 bit:
static pthread_t s_pid = (pthread_t) -1;
static int32_t g_ticker = 0;
//pid_t getpidtid() {
// on 64-bit architectures pthread_t is 64 bit and pid_t is 32 bit:
pthread_t getpidtid() {

@ -15746,7 +15746,6 @@ void XmlDoc::filterStart_r ( bool amThread ) {
}
pid_t g_pid = -1;
int32_t g_ticker = 0;
int32_t g_filterTimeout = -1;
// return downloaded content as utf8

@ -2298,7 +2298,6 @@ public:
extern uint8_t score32to8 ( uint32_t score ) ;
extern pid_t g_pid ;
extern int32_t g_ticker ;
extern int32_t g_filterTimeout ;
// as recommended in the "man system" page we use our own