loic/ina260-zmq-publisher
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/ina260-zmq-publisher.git synced 2025-04-06 03:46:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes

Browse source
This commit is contained in:
Loic Guegan 2023-07-17 20:29:37 +02:00
parent a32c39d8a5
commit 29ff963194
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -17,7 +17,7 @@ subscriber: src/subscriber.c src/utils.c config.mk
$(CC) -lzmq $(filter-out config.mk,$^) -o $@ $(MACROS) $(CC) -lzmq $(filter-out config.mk,$^) -o $@ $(MACROS)
logger: src/logger.c src/utils.c config.mk logger: src/logger.c src/utils.c config.mk
$(CC) -lzmq $(filter-out config.mk,$^) -o $@ $(MACROS) $(CC) -lzmq -lpthread $(filter-out config.mk,$^) -o $@ $(MACROS)
publish: publisher logger publish: publisher logger
for client in $$(basename -a /sys/kernel/ina260/*); \ for client in $$(basename -a /sys/kernel/ina260/*); \

32
src/logger.c
View file

@ -5,6 +5,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <signal.h> #include <signal.h>
#include <pthread.h>
#include "utils.h" #include "utils.h"
#ifndef LOGGERS_DELAY #ifndef LOGGERS_DELAY
@ -28,7 +29,7 @@ void sighandler(int signo){
} }
} }
void publish(int queue_id, void* publisher); void *publish(void *publisher);
typedef struct queue { typedef struct queue {
int size; int size;
@ -87,6 +88,7 @@ int main (int argc, char *argv [])
//----- Start logging //----- Start logging
pthread_t zmq_thread;
printf("Logger started [client=%s,interval=%ds]\n",__client,__loginterval); printf("Logger started [client=%s,interval=%ds]\n",__client,__loginterval);
FILE *regptr,*logptr; FILE *regptr,*logptr;
@ -102,6 +104,7 @@ int main (int argc, char *argv [])
for(int i=0;i<MAX_QUEUES;i++){ for(int i=0;i<MAX_QUEUES;i++){
queues[queue_id].issending=0; queues[queue_id].issending=0;
} }
pthread_create(&zmq_thread, NULL, publish, publisher);
while(!__stop){ while(!__stop){
interval=INTERVAL(__loginterval); interval=INTERVAL(__loginterval);
@ -137,20 +140,33 @@ int main (int argc, char *argv [])
//printf("Tick\n"); fflush(stdout); //printf("Tick\n"); fflush(stdout);
} }
queues[queue_id].issending=1; queues[queue_id].issending=1;
publish(queue_id,publisher);
} }
fclose(regptr); fclose(regptr);
pthread_join(zmq_thread, NULL);
zmq_close (publisher); zmq_close (publisher);
zmq_ctx_destroy (context); zmq_ctx_destroy (context);
return 0; return 0;
} }
void publish(int queue_id, void* publisher){ void *publish(void *publisher){
printf("Publishing..."); int queue_id=0;
zmq_send(publisher,queues[queue_id].msg,queues[queue_id].size,0); while(!__stop){
queues[queue_id].issending=0; if(queues[queue_id].issending){
printf("done\n"); printf("Publishing...");
zmq_send(publisher,queues[queue_id].msg,queues[queue_id].size,0);
queues[queue_id].issending=0;
printf("done\n");
} else {
#if LOGGERS_DELAY > 0
usleep(LOGGERS_DELAY*1000);
#endif
continue;
}
queue_id++;
if(queue_id>=MAX_QUEUES)
queue_id=0;
}
pthread_exit(EXIT_SUCCESS);
} }