Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move variables to prevent duplicates #202

Merged
merged 1 commit into from
Sep 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion includes/daemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 request_exit(void);
Expand Down
2 changes: 0 additions & 2 deletions includes/render_submit_queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ extern "C" {
#endif


int work_complete;

void enqueue(const char *xmlname, int x, int y, int z);
void spawn_workers(int num, const char *socketpath, int maxLoad);
void wait_for_empty_queue(void);
Expand Down
1 change: 1 addition & 0 deletions src/daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ static renderd_config config;

int noSlaveRenders;

struct request_queue * render_request_queue;

static const char *cmdStr(enum protoCmd c)
{
Expand Down
1 change: 0 additions & 1 deletion src/render_expired.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ unsigned long long twopow[MAX_ZOOM];
static int minZoom = 0;
static int maxZoom = 18;
static int verbose = 0;
int work_complete;
static int maxLoad = MAX_LOAD_OLD;

void display_rate(struct timeval start, struct timeval end, int num)
Expand Down
1 change: 0 additions & 1 deletion src/render_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM;
static int verbose = 0;
static int maxLoad = MAX_LOAD_OLD;

int work_complete;

void display_rate(struct timeval start, struct timeval end, int num)
{
Expand Down
1 change: 0 additions & 1 deletion src/render_old.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ static time_t planetTime;
static struct timeval start, end;


int work_complete;

void display_rate(struct timeval start, struct timeval end, int num)
{
Expand Down
1 change: 1 addition & 0 deletions src/render_submit_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ static struct qItem *qHead, *qTail;

static int no_workers;
static pthread_t *workers;
static int work_complete;

static void check_load(void)
{
Expand Down