diff options
| -rw-r--r-- | src/json.h | 3 | ||||
| -rw-r--r-- | src/ping903.c | 4 | ||||
| -rw-r--r-- | src/ping903.h | 2 | ||||
| -rw-r--r-- | src/pinger.c | 13 |
4 files changed, 6 insertions, 16 deletions
@@ -59,4 +59,3 @@ struct json_pair { -struct json_format -{ +struct json_format { size_t indent; diff --git a/src/ping903.c b/src/ping903.c index b4ea906..06597bb 100644 --- a/src/ping903.c +++ b/src/ping903.c @@ -1314,3 +1314,2 @@ ping903(void) struct sockaddr *server_addr; - void *p; struct sigaction act; @@ -1360,4 +1359,3 @@ ping903(void) MHD_stop_daemon(mhd); - pthread_create(&tid, NULL, p903_saver, NULL); - pthread_join(tid, &p); + p903_update_commit(); } diff --git a/src/ping903.h b/src/ping903.h index f0065f3..06cf629 100644 --- a/src/ping903.h +++ b/src/ping903.h @@ -178,2 +178,3 @@ int file_read_ip_list(FILE *fp, char const *fname); void p903_init(void); +void p903_update_commit(void); void *p903_sender(void *p); @@ -181,3 +182,2 @@ void *p903_receiver(void *p); void *p903_scheduler(void *p); -void *p903_saver(void *p); diff --git a/src/pinger.c b/src/pinger.c index c0276cd..8bb1090 100644 --- a/src/pinger.c +++ b/src/pinger.c @@ -867,4 +867,4 @@ hostlist_copy_stat(HOSTLIST *hl) -static void -update_commit(void) +void +p903_update_commit(void) { @@ -1480,3 +1480,3 @@ p903_scheduler(void *p) /* Commit updates */ - update_commit(); + p903_update_commit(); @@ -1494,8 +1494 @@ p903_scheduler(void *p) -void * -p903_saver(void *p) -{ - update_commit(); - return NULL; -} - |