Move variables to prevent duplicates

This commit is contained in:
Jon Burgess
2020-05-23 12:42:07 +01:00
parent e25bfdba1c
commit a22065b8ae
7 changed files with 3 additions and 6 deletions

View File

@ -45,7 +45,7 @@ typedef struct {
struct request_queue * render_request_queue; extern struct request_queue * render_request_queue;
void statsRenderFinish(int z, long time); void statsRenderFinish(int z, long time);
void request_exit(void); void request_exit(void);

View File

@ -5,8 +5,6 @@ extern "C" {
#endif #endif
int work_complete;
void enqueue(const char *xmlname, int x, int y, int z); void enqueue(const char *xmlname, int x, int y, int z);
void spawn_workers(int num, const char *socketpath, int maxLoad); void spawn_workers(int num, const char *socketpath, int maxLoad);
void wait_for_empty_queue(void); void wait_for_empty_queue(void);

View File

@ -49,6 +49,7 @@ static renderd_config config;
int noSlaveRenders; int noSlaveRenders;
struct request_queue * render_request_queue;
static const char *cmdStr(enum protoCmd c) static const char *cmdStr(enum protoCmd c)
{ {

View File

@ -89,7 +89,6 @@ unsigned long long twopow[MAX_ZOOM];
static int minZoom = 0; static int minZoom = 0;
static int maxZoom = 18; static int maxZoom = 18;
static int verbose = 0; static int verbose = 0;
int work_complete;
static int maxLoad = MAX_LOAD_OLD; static int maxLoad = MAX_LOAD_OLD;
void display_rate(struct timeval start, struct timeval end, int num) void display_rate(struct timeval start, struct timeval end, int num)

View File

@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM;
static int verbose = 0; static int verbose = 0;
static int maxLoad = MAX_LOAD_OLD; static int maxLoad = MAX_LOAD_OLD;
int work_complete;
void display_rate(struct timeval start, struct timeval end, int num) void display_rate(struct timeval start, struct timeval end, int num)
{ {

View File

@ -47,7 +47,6 @@ static time_t planetTime;
static struct timeval start, end; static struct timeval start, end;
int work_complete;
void display_rate(struct timeval start, struct timeval end, int num) void display_rate(struct timeval start, struct timeval end, int num)
{ {

View File

@ -47,6 +47,7 @@ static struct qItem *qHead, *qTail;
static int no_workers; static int no_workers;
static pthread_t *workers; static pthread_t *workers;
static int work_complete;
static void check_load(void) static void check_load(void)
{ {