loic/ina260-zmq-publisher
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/ina260-zmq-publisher.git synced 2025-04-10 08:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes

Browse source
This commit is contained in:
Loic Guegan 2023-07-16 10:46:52 +02:00
parent 9e021f564c
commit 19a77c6fd7
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/logger.c
View file

@ -15,8 +15,8 @@
// Global: // Global:
char *__client; char *__client;
char __logdir[255]; char __logdir[STATIC_LEN];
char __regpower[100]; char __regpower[STATIC_LEN];
int __loginterval; int __loginterval;
int main (int argc, char *argv []) int main (int argc, char *argv [])
@ -55,9 +55,9 @@ int main (int argc, char *argv [])
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;
char logfilepath[255]=""; char logfilepath[STATIC_LEN]="";
regptr=fopen("/home/loic/out.txt","r"); regptr=fopen("/home/loic/out.txt","r");
char buffer[255]; char buffer[STATIC_LEN];
int power; int power;
time_t interval; time_t interval;
struct timespec power_ts; struct timespec power_ts;
@ -69,7 +69,7 @@ int main (int argc, char *argv [])
fprintf(logptr,"timestamp,ns,power\n"); fprintf(logptr,"timestamp,ns,power\n");
// Log current interval // Log current interval
while((TIMESTAMP()-interval)<__loginterval){ while((TIMESTAMP()-interval)<__loginterval){
fgets(buffer,255,regptr); fgets(buffer,STATIC_LEN,regptr);
power=atoi(buffer); power=atoi(buffer);
clock_gettime(CLOCK_REALTIME,&power_ts); clock_gettime(CLOCK_REALTIME,&power_ts);
fprintf(logptr,"%d,%ld,%d\n",power_ts.tv_sec,power_ts.tv_nsec,power); fprintf(logptr,"%d,%ld,%d\n",power_ts.tv_sec,power_ts.tv_nsec,power);

6
src/publisher.c
View file

@ -32,7 +32,7 @@ int main (int argc, char *argv [])
//----- Prepare our context and publisher //----- Prepare our context and publisher
void *context = zmq_ctx_new (); void *context = zmq_ctx_new ();
void *publisher = zmq_socket (context, ZMQ_PUB); void *publisher = zmq_socket (context, ZMQ_PUB);
char bindto[30]; char bindto[STATIC_LEN];
sprintf(bindto,"tcp://%s:%d",__ip,__port); sprintf(bindto,"tcp://%s:%d",__ip,__port);
int rc = zmq_connect (publisher, bindto); int rc = zmq_connect (publisher, bindto);
if(rc!=0){ if(rc!=0){
@ -50,8 +50,8 @@ int main (int argc, char *argv [])
while ((de = readdir(dr)) != NULL){ while ((de = readdir(dr)) != NULL){
if(strcmp(de->d_name,".") && strcmp(de->d_name,"..")){ if(strcmp(de->d_name,".") && strcmp(de->d_name,"..")){
char *client=de->d_name; char *client=de->d_name;
char logfile[255]; char logfile[STATIC_LEN];
char logfile_next[255]; char logfile_next[STATIC_LEN];
sprintf(logfile,"%s/%s/%ld",__logdir,client,interval); sprintf(logfile,"%s/%s/%ld",__logdir,client,interval);
sprintf(logfile_next,"%s/%s/%ld",__logdir,client,interval_next); sprintf(logfile_next,"%s/%s/%ld",__logdir,client,interval_next);
// As long as next logfile is not available, we should wait // As long as next logfile is not available, we should wait

8
src/subscriber.c
View file

@ -22,7 +22,7 @@ int main (int argc, char *argv [])
//----- Init ZMQ //----- Init ZMQ
void *context = zmq_ctx_new (); void *context = zmq_ctx_new ();
void *subscriber = zmq_socket (context, ZMQ_SUB); void *subscriber = zmq_socket (context, ZMQ_SUB);
char bindto[30]; char bindto[STATIC_LEN];
sprintf(bindto,"tcp://*:%d",port); sprintf(bindto,"tcp://*:%d",port);
int rc = zmq_bind (subscriber, bindto); int rc = zmq_bind (subscriber, bindto);
if(rc!=0){ if(rc!=0){
@ -40,8 +40,8 @@ int main (int argc, char *argv [])
buffer[size < ZMQ_MSG_SIZE ? size : ZMQ_MSG_SIZE - 1] = '\0'; buffer[size < ZMQ_MSG_SIZE ? size : ZMQ_MSG_SIZE - 1] = '\0';
//----- Read buffer //----- Read buffer
char *token = strtok(buffer, "\n"); char *token = strtok(buffer, "\n");
char key[255]; char key[STATIC_LEN];
char client[255]; char client[STATIC_LEN];
long int interval; long int interval;
FILE *fptr; FILE *fptr;
int line=1; int line=1;
@ -55,7 +55,7 @@ int main (int argc, char *argv [])
if(line==4){ if(line==4){
printf("Data received with key=%s\n",key); printf("Data received with key=%s\n",key);
char path[255]=""; char path[STATIC_LEN]="";
sprintf(path,"%s/%s_%s_%ld",cdatadir,key,client,interval); sprintf(path,"%s/%s_%s_%ld",cdatadir,key,client,interval);
fptr=fopen(path,"a"); fptr=fopen(path,"a");
} }

1
src/utils.h
View file

@ -8,6 +8,7 @@
#define MIN_INTERVAL 30 #define MIN_INTERVAL 30
#define INA260_SYSFS "/sys/kernel/ina260" #define INA260_SYSFS "/sys/kernel/ina260"
#define INA260_POWER_REGISTER "registers/power" #define INA260_POWER_REGISTER "registers/power"
#define STATIC_LEN 255
#ifndef ZMQ_TOKEN #ifndef ZMQ_TOKEN
#define ZMQ_TOKEN "ina260-zmq-publisher" #define ZMQ_TOKEN "ina260-zmq-publisher"