dpoke: comparison dpoke.c

equal deleted inserted replaced

-:a22a319f5129
+:3e9290bf7249
 DPOKE_FILE,
 DPOKE_FUNCTION,
 };
 typedef enum DPokeSourceType_en DPokeSourceType;
-#define DPOKE_BUFFER 32
+#define DPOKE_BUFFER 128
 struct DPokeSource_st {
 DPokeSourceType type;
 char *path;
 int arg;
 typedef struct DPokeSource_st DPokeSource;
 #define LENGTH(X)               (sizeof X / sizeof X[0])
-char* smprintf(char *fmt, ...) {
+char *
-va_list fmtargs;
+smprintf(char *fmt, ...)
-char *ret;
+{
-int len;
+va_list fmtargs;
+char *ret;
-va_start(fmtargs, fmt);
+int len;
-len = vsnprintf(NULL, 0, fmt, fmtargs);
-va_end(fmtargs);
+va_start(fmtargs, fmt);
+len = vsnprintf(NULL, 0, fmt, fmtargs);
-ret = malloc(++len);
+va_end(fmtargs);
-if (ret == NULL) {
-perror("malloc");
+ret = malloc(++len);
-exit(1);
+if (ret == NULL) {
-}
+perror("malloc");
+exit(1);
-va_start(fmtargs, fmt);
+}
-vsnprintf(ret, len, fmt, fmtargs);
-va_end(fmtargs);
+va_start(fmtargs, fmt);
+vsnprintf(ret, len, fmt, fmtargs);
-return ret;
+va_end(fmtargs);
-}
+return ret;
+}
-void display();
+void display(char *v[], size_t vc);
+void setup(void);
+void cleanup(int exitcode);
 extern char* v[];
 #include "config.h"
 #ifdef DEBUG
-#define errprintf(...) fprintf(stderr,...)
+#define errprintf(...) fprintf(stderr,__VA_ARGS__)
 #else
 #define errprintf(...)
 #endif
 char* v[LENGTH(sources)];
 static struct pollfd source_fds[LENGTH(sources)];
+void die(int exitcode) {
+fprintf(stderr, "Dying with exit code %d\n", exitcode);
+cleanup(exitcode);
+exit(exitcode);
+}
 void source_open(int source_id) {
 DPokeSource *src = &sources[source_id];
 //FILE* stream;
 int p_stdout[2];
 switch (src->type) {
 case DPOKE_PROGRAM:
 //stream = popen(src->path, "r");
 if (pipe(p_stdout)!=0) {
 perror("pipe");
-exit(7);
+die(7);
 }
 pid_t pid = fork();
 if (pid < 0) {
 perror("fork");
-exit(7);
+die(7);
 } else if (pid == 0) {
 dup2(open("/dev/null",O_RDONLY),0);
 close(p_stdout[0]);
 dup2(p_stdout[1],1);
 execl("/bin/sh", "sh", "-c", src->path, NULL);
 src->fd = p_stdout[0];
 src->pid = pid;
 break;
 default:
 errprintf("Don't know how to handle source type %d.\n",src->type);
-exit(2);
+die(2);
 }
 //src->stream = stream;
 //src->fd = fileno(stream);
 src->buffer_usage = 0;
 src->status = DPOKE_STARTED;
 sources[i].status = DPOKE_FAIL; break;
 case DPOKE_RUNNING:
 sources[i].status = DPOKE_DIED; break;
 default:
 errprintf("#%d died in state %d. Whaddafuck?!\n",i,sources[i].status);
-exit(8);
+die(8);
 }
 }
 }
 }
 double dpoke_time() {
 struct timespec tp;
 if (clock_gettime(CLOCK_MONOTONIC,&tp)) {
 perror("clock_gettime");
-exit(5);
+die(5);
 }
 return tp.tv_sec + tp.tv_nsec*1E-9;
 }
 int main(int argc, char* argv[]) {
+setup();
 struct sigaction act;
 memset (&act, 0, sizeof(act));
 act.sa_handler = sigchld_hdl;
 if (sigaction(SIGCHLD, &act, 0)) {
 perror ("sigaction");
-exit(6);
+die(6);
 }
 for (int i = 0; i < LENGTH(sources); i++ ) {
 source_open(i);
 v[i] = sources[i].current;
 continue;
 }
 for (int i = 0; i < LENGTH(sources); i++) {
 DPokeSource *src = sources+i;
 if (source_fds[i].revents & POLLIN) {
+errprintf("Event: %d\n", source_fds[i].revents);
 int data_read = read(src->fd,src->buffer+src->buffer_usage,DPOKE_BUFFER-src->buffer_usage);
 if (data_read>0) {
 src->buffer_usage += data_read;
-if (src->buffer_usage==DPOKE_BUFFER) {
+if (src->buffer_usage>=DPOKE_BUFFER) {
-errprintf("Buffer is full for #%d.\n",i);
+fprintf(stderr, "Buffer is full for #%d. Resetting.\n",i);
+src->buffer_usage = 0;
 }
 src->buffer[src->buffer_usage] = '\0';
 char* eolpos = strchr(src->buffer + src->buffer_usage - data_read,'\n');
 if (eolpos) {
 memcpy(src->current,src->buffer,eolpos-src->buffer);
 memmove(src->buffer,eolpos + 1,src->buffer_usage + 1);
 }
 if (src->status == DPOKE_STARTED)
 src->status = DPOKE_RUNNING;
 } else {
+fprintf(stderr, "Buffer usage: %d\n", src->buffer_usage);
 perror("read");
-exit(3);
+die(3);
 }
 } else if ((source_fds[i].revents & POLLHUP)||(src->status==DPOKE_DIED)) {
 errprintf("#%d HUP\n",i);
 source_close(i);
 if (src->status==DPOKE_STARTED)
 strcpy(src->current,FAILURE_MSG);
 }
 }
 double curtime = dpoke_time();
 if ((curtime-prevtime)>MINTIME) {
-display();
+display(v,LENGTH(sources));
 prevtime = curtime;
 sleeptime = 10000;
 } else {
 double sleepd = (prevtime+MINTIME - curtime)*1000;
 sleeptime = ceil(sleepd);
 errprintf("%f %f %f %f\n",prevtime,curtime,MINTIME,sleepd);
 }
 errprintf("Will sleep for %d\n",sleeptime);
 }
+cleanup(0);
 return 0;
 }
 /*
 ABCnDEF0
 01234567

changeset 1	3e9290bf7249
parent 0	a22a319f5129
child 19	bf780d158f3e