main.c: Add missing endline to debug print

[log-plotter] / main.c

diff --git a/main.c b/main.c
index 4832e6a12063e85555091d4e37ee4a0d1b369246..f8272e665b84d71d700c9b859cf6adeaf9bac9ac 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,177 +1,57 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <string.h>
-#include <time.h>
-#include <sys/epoll.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
-#include "options.h"
+#include "config.h"
 #include "baud.h"
-#include "debug.h"
+#include "trace.h"
+#include "data.h"
+#include "event.h"
+#include "plotter_status.h"
 
-/**
- * Read data from a slow device
- *
- * return 1 when a complete NULL terminated line has been read
- *
- * return 0 when a partial line has been read and appended to the
- *              buffer at @offset
- *
- * return negative on error
- */
-static int read_log_line(int infd, char *buf, size_t bufsize, int *offset)
-{
-       int ret;
-       int i;
-
-       ret = read(infd, buf + *offset, bufsize - *offset - 1);
-       if (ret < 0) {
-               pr_err("read: %m\n");
-               return -1;
-       }
-
-       if (ret == 0) {
-               pr_err("Read EOF, stopping\n");
-               return -1;
-       }
-       buf[*offset + ret] = 0;
-
-       for (i = 0; i < ret; i++) {
-               if (buf[i + *offset] == '\n' ||
-                   buf[i + *offset] == '\r') {
-                       /*
-                        * Got a complete line when there is a newline
-                        * at the end. Remove the newline and possible
-                        * other junk, such as '\r'
-                        */
-                       buf[i + *offset] = 0;
-                       *offset = 0;
-
-                       return 1;
-               }
-
-               /*
-                * Fixme! Nothing guarantees that there isn't actually
-                * more data (a part of a new log entry perhaps) after
-                * the newline. So in rare cases (we are prevented
-                * from reading the serial line in very long time) we
-                * might lose data from the stream..
-                */
-       }
+struct log_plotter_status plotter_state;
 
-       *offset += ret;
-       return 0;
-}
-
-static int read_data(int infd, int outfd)
+int main(int argc, char *argv[])
 {
-       struct epoll_event ev;
-       time_t start_time = 0, cur_time;
-       int epoll_fd;
-       int ret;
-       char buf[256];
-       int offset = 0;
+       struct plotter_config cfg;
+       int fd, baud, ret = 0;
 
-       epoll_fd = epoll_create(1);
-       if (epoll_fd < 0) {
-               pr_err("Failed to create epoll socket: %m\n");
-               return -1;
-       }
+       bzero(&cfg, sizeof(cfg));
 
-       ev.events = EPOLLIN;
-       ev.data.fd = infd;
-       if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, infd, &ev) == -1) {
-               pr_err("epoll_ctl: %m\n");
+       if (read_args(argc, argv, &cfg))
                return 1;
-       }
-
-       while (1) {
-               char str[320];
-               int len;
-
-               ret = epoll_wait(epoll_fd, &ev, 1, -1);
-               if (ret == 0)
-                       continue;
-
-               if (ret < 0) {
-                       pr_err("epoll: %m\n");
-                       return -1;
-               }
-
-               ret = read_log_line(infd, buf, sizeof(buf), &offset);
-               if (ret < 0)
-                       return ret;
 
-               if (ret == 0)
-                       continue;
+       if (cfg.config_file_path)
+               populate_config_data_from_file(cfg.config_file_path, &cfg);
 
-               if (strlen(buf) < 5) {
-                       pr_debug("discarding truncated log entry\n");
-                       offset = 0;
-                       continue;
-               }
-
-               if (!start_time)
-                       start_time = time(NULL);
-
-               cur_time = time(NULL);
-
-               pr_info("%s\n", buf);
-
-               if (!outfd)
-                       continue;
-
-               len = snprintf(str, sizeof(str),
-                       "%ld;%s\n", cur_time - start_time, buf);
-
-               ret = write(outfd, str, len);
-               if (ret < 0) {
-                       pr_err("write: %m\n");
-                       break;
-               }
-       }
-
-       return 0;
-}
-
-int main(int argc, char *argv[])
-{
-       struct plotter_options options;
-       int fd, baud, ret = 0, out_fd = 0;
-
-       if (read_args(argc, argv, &options))
-               return 1;
-
-       baud = options.baud_rate;
-       fd = open_at_baud(options.device_path, &baud);
+       baud = cfg.baudrate;
+       fd = open_at_baud(cfg.device_path, &baud);
        if (fd < 0)
                return 1;
 
-       if (baud != options.baud_rate) {
+       if (baud != cfg.baudrate) {
                pr_err("Failed to set baudrate to %d, only got %d\n",
-                       options.baud_rate, baud);
+                       cfg.baudrate, baud);
                ret = 1;
                goto out;
        }
 
-       if (options.output_path) {
-               pr_debug("Opening %s for writing the log file\n",
-                       options.output_path);
+       init_data_parser(fd, &cfg);
+
+       while (plotter_state.system_status != SYSTEM_STATUS_NO_USB) {
+               poll_events(10000);
 
-               out_fd = open(options.output_path,
-                       O_CREAT | O_APPEND | O_WRONLY, 0664);
-               if (out_fd < 0) {
-                       pr_err("Failed to open file %s for writing: %m\n",
-                               options.output_path);
-                       ret = 1;
-                       goto out;
+               if (plotter_state.old_system_status !=
+                       plotter_state.system_status) {
+                       pr_debug("Status changing from %s to %s\n",
+                               state_to_str(plotter_state.old_system_status),
+                               state_to_str(plotter_state.system_status));
+
+                       plotter_state.old_system_status =
+                               plotter_state.system_status;
                }
        }
 
-       read_data(fd, out_fd);
-
 out:
        close(fd);
        return ret;