|
|
@ -653,7 +653,6 @@ static void *receiver(void *arg) |
|
|
|
ckpool_t *ckp = cdata->ckp; |
|
|
|
ckpool_t *ckp = cdata->ckp; |
|
|
|
uint64_t serverfds, i; |
|
|
|
uint64_t serverfds, i; |
|
|
|
int ret, epfd; |
|
|
|
int ret, epfd; |
|
|
|
char *buf; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
rename_proc("creceiver"); |
|
|
|
rename_proc("creceiver"); |
|
|
|
|
|
|
|
|
|
|
@ -676,13 +675,8 @@ static void *receiver(void *arg) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* Wait for the stratifier to be ready for us */ |
|
|
|
/* Wait for the stratifier to be ready for us */ |
|
|
|
while (42) { |
|
|
|
while (!ckp->stratifier_ready) |
|
|
|
buf = send_recv_proc(ckp->stratifier, "ping"); |
|
|
|
|
|
|
|
if (buf) |
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
cksleep_ms(10); |
|
|
|
cksleep_ms(10); |
|
|
|
}; |
|
|
|
|
|
|
|
free(buf); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while (42) { |
|
|
|
while (42) { |
|
|
|
uint64_t edu64; |
|
|
|
uint64_t edu64; |
|
|
@ -1362,7 +1356,6 @@ static void connector_loop(proc_instance_t *pi, cdata_t *cdata) |
|
|
|
int ret = 0; |
|
|
|
int ret = 0; |
|
|
|
char *buf; |
|
|
|
char *buf; |
|
|
|
|
|
|
|
|
|
|
|
LOGWARNING("%s connector ready", ckp->name); |
|
|
|
|
|
|
|
last_stats = cdata->start_time; |
|
|
|
last_stats = cdata->start_time; |
|
|
|
|
|
|
|
|
|
|
|
retry: |
|
|
|
retry: |
|
|
@ -1608,6 +1601,9 @@ void *connector(void *arg) |
|
|
|
create_pthread(&cdata->pth_receiver, receiver, cdata); |
|
|
|
create_pthread(&cdata->pth_receiver, receiver, cdata); |
|
|
|
cdata->start_time = time(NULL); |
|
|
|
cdata->start_time = time(NULL); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ckp->connector_ready = true; |
|
|
|
|
|
|
|
LOGWARNING("%s connector ready", ckp->name); |
|
|
|
|
|
|
|
|
|
|
|
connector_loop(pi, cdata); |
|
|
|
connector_loop(pi, cdata); |
|
|
|
out: |
|
|
|
out: |
|
|
|
/* We should never get here unless there's a fatal error */ |
|
|
|
/* We should never get here unless there's a fatal error */ |
|
|
|