Changeset 565a43c

Timestamp:

Aug 5, 2017, 11:21:53 PM (7 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Branches:

master

Children:

4511ac3

Parents:

89e4294

git-author:

Jason Gross <jgross@mit.edu> (08/05/17 21:44:56)

git-committer:

Jason Gross <jasongross9@gmail.com> (08/05/17 23:21:53)

Message:

Print a message about how many logs are flushed

File:

• logging.c (modified) (4 diffs)

logging.c

@@ -158 +158 @@
 }
 
+static void owl_log_makemsg_main_thread(gpointer data)
+{
+  owl_function_makemsg((const char*)data);
+}
+
 static void G_GNUC_PRINTF(1, 2) owl_log_error(const char *fmt, ...)
 {
@@ -181 +186 @@
 
   owl_select_post_task(owl_log_adminmsg_main_thread,
+                       data, g_free, g_main_context_default());
+}
+
+static void G_GNUC_PRINTF(1, 2) owl_log_makemsg(const char *fmt, ...)
+{
+  va_list ap;
+  char *data;
+
+  va_start(ap, fmt);
+  data = g_strdup_vprintf(fmt, ap);
+  va_end(ap);
+
+  owl_select_post_task(owl_log_makemsg_main_thread,
                        data, g_free, g_main_context_default());
 }
@@ -289 +307 @@
   bool all_succeeded = true;
 
+  if (g_queue_is_empty(deferred_entry_queue)) {
+    owl_log_makemsg("There are no logs to flush.");
+  } else {
+    owl_log_makemsg("Attempting to flush %u logs...",
+                     g_queue_get_length(deferred_entry_queue));
+  }
+
   defer_logs = false;
   while (!g_queue_is_empty(deferred_entry_queue) && !defer_logs) {
@@ -308 +333 @@
     owl_log_entry_free(entry);
   }
-  if (all_succeeded && logged_message_count > 0 && !defer_logs) {
-    owl_log_adminmsg("Logs have been flushed and logging has resumed.");
-  } else if (!all_succeeded && logged_message_count > 0 && !defer_logs) {
-    owl_log_adminmsg("Logs have been flushed or dropped and logging has resumed.");
-  } else if (logged_message_count > 0 && defer_logs) {
-    owl_log_error("Attempted to flush %d logs; %u deferred logs remain.",
-                  logged_message_count, g_queue_get_length(deferred_entry_queue));
+  if (logged_message_count > 0) {
+    /* first clear the "attempting to flush" message from the status bar */
+    owl_log_makemsg("");
+    if (!defer_logs) {
+      if (all_succeeded) {
+        owl_log_adminmsg("Flushed %d logs and resumed logging.",
+                         logged_message_count);
+      } else {
+        owl_log_adminmsg("Flushed or dropped %d logs and resumed logging.",
+                         logged_message_count);
+      }
+    } else {
+      owl_log_error("Attempted to flush %d logs; %u deferred logs remain.",
+                    logged_message_count, g_queue_get_length(deferred_entry_queue));
+    }
   }
 }