Compile with optimizations

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index 540db8e7c21c024ab0dabde05d6e5236eaa16c20..798cddc7facf522253f042b8aacc6fc7140aa914 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -1,10 +1,28 @@
+// For vasprintf
+#define _GNU_SOURCE
+

 #include "chart.h"
 #include <ctype.h>
 #include <errno.h>
 #include "chart.h"
 #include <ctype.h>
 #include <errno.h>

+#include <glob.h>

 #include <gtk/gtk.h>
 #include <math.h>
 #include <gtk/gtk.h>
 #include <math.h>

+#include <stdarg.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>
+
+char *sasprintf(const char *fmt, ...) {
+  char *result;
+  va_list args;
+  va_start(args, fmt);
+  if (vasprintf(&result, fmt, args) == -1) {
+    fprintf(stderr, "Can't allocate memory!?\n");
+    abort();
+  }
+  va_end(args);
+  return result;
+}

 
 struct State {
   char *voltage_filename;
 
 struct State {
   char *voltage_filename;


@@ -42,8 +60,17 @@ static float fatof(const char *filename) {
 }
 
 static gboolean collect_data(struct State *state) {
 }
 
 static gboolean collect_data(struct State *state) {

-  fprintf(stderr, "Voltage: %f, current: %f\n", fatof(state->voltage_filename),
-          fatof(state->current_filename));
+  float now = g_get_monotonic_time() / 1e6;
+  float voltage = fatof(state->voltage_filename);
+  float current = fatof(state->current_filename);
+  if (!isnan(voltage)) {
+    bv_chart_add_point(state->voltage, now, voltage);
+    gtk_widget_queue_draw(GTK_WIDGET(state->voltage));
+  }
+  if (!isnan(current)) {
+    bv_chart_add_point(state->current, now, current);
+    gtk_widget_queue_draw(GTK_WIDGET(state->current));
+  }

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -58,9 +85,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
 
   struct State *state = (struct State *)user_data;
   state->voltage = BV_CHART(bv_chart_new());
 
   struct State *state = (struct State *)user_data;
   state->voltage = BV_CHART(bv_chart_new());

-  bv_chart_add_point(state->voltage, 0.0, 0.0);
-  bv_chart_add_point(state->voltage, 1.0, 1.0);
-  bv_chart_add_point(state->voltage, 3.0, 2.0);

   gboolean expand = TRUE;
   gboolean fill = TRUE;
   guint padding = 0;
   gboolean expand = TRUE;
   gboolean fill = TRUE;
   guint padding = 0;


@@ -68,8 +92,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
                      padding);
 
   state->current = BV_CHART(bv_chart_new());
                      padding);
 
   state->current = BV_CHART(bv_chart_new());

-  bv_chart_add_point(state->current, 0.0, 1.0);
-  bv_chart_add_point(state->current, 1.0, 0.0);

   gtk_box_pack_end(GTK_BOX(box), GTK_WIDGET(state->current), expand, fill,
                    padding);
 
   gtk_box_pack_end(GTK_BOX(box), GTK_WIDGET(state->current), expand, fill,
                    padding);
 


@@ -78,10 +100,29 @@ static void activate(GtkApplication *app, gpointer user_data) {
   g_timeout_add_seconds(1, (GSourceFunc)collect_data, user_data);
 }
 
   g_timeout_add_seconds(1, (GSourceFunc)collect_data, user_data);
 }
 

+char *find_battery_dir() {
+  glob_t globbuf = {.gl_offs = 0};
+  char pattern[] = "/sys/class/power_supply/*[Bb][Aa][Tt]*";
+  if (glob(pattern, GLOB_ERR, NULL, &globbuf) != 0 || globbuf.gl_pathc == 0) {
+    fprintf(stderr, "Could not find battery dir %s\n", pattern);
+    exit(1);
+  }
+  if (globbuf.gl_pathc != 1) {
+    // TODO: Filter for directories that have {voltage,current}_now files.
+    // TODO: Support multiple batteries
+    fprintf(stderr, "Multiple batteries found. Arbitrarily choosing %s\n",
+            globbuf.gl_pathv[0]);
+  }
+  char *dir = strdup(globbuf.gl_pathv[0]);
+  globfree(&globbuf);
+  return dir;
+}
+

 int main(int argc, char **argv) {
 int main(int argc, char **argv) {

+  char *battery_dir = find_battery_dir();

   struct State state = {
   struct State state = {

-      .voltage_filename = "/sys/class/power_supply/BAT0/voltage_now",
-      .current_filename = "/sys/class/power_supply/BAT0/current_now",
+      .voltage_filename = sasprintf("%s/voltage_now", battery_dir),
+      .current_filename = sasprintf("%s/current_now", battery_dir),

   };
 
   GtkApplication *app = gtk_application_new("com.scottworley.batteryviewer",
   };
 
   GtkApplication *app = gtk_application_new("com.scottworley.batteryviewer",