Changeset d12a8c7

Timestamp:

Jul 16, 2010, 7:43:42 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

50522b5

Parents:

c5873be

git-author:

Nelson Elhage <nelhage@mit.edu> (07/15/10 23:35:12)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/16/10 19:43:42)

Message:

Keep the debug file open persistently.

Files:

• functions.c (modified) (2 diffs)
• global.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)

functions.c

@@ -1204 +1204 @@
     return;
 
-  file = fopen(owl_global_get_debug_file(&g), "a");
+  file = owl_global_get_debug_file_handle(&g);
   if (!file) /* XXX should report this */
     return;
@@ -1214 +1214 @@
   vfprintf(file, fmt, ap);
   putc('\n', file);
-  fclose(file);
+  fflush(file);
 
   va_end(ap);

global.c

@@ -1075 +1075 @@
                                                        filters[i].desc));
 }
+
+FILE *owl_global_get_debug_file_handle(owl_global *g) {
+  static char *open_file = NULL;
+  const char *filename = owl_global_get_debug_file(g);
+  if (g->debug_file == NULL ||
+      (open_file && strcmp(filename, open_file) != 0)) {
+    if (g->debug_file)
+      fclose(g->debug_file);
+    g->debug_file = fopen(filename, "a");
+
+    owl_free(open_file);
+    open_file = owl_strdup(filename);
+  }
+  return g->debug_file;
+}

owl.c

@@ -476 +476 @@
   g.load_initial_subs = opts.load_initial_subs;
 
-  owl_function_debugmsg("startup: Finished parsing arguments");
-
   owl_register_signal_handlers();
   owl_start_curses();

owl.h

@@ -630 +630 @@
   int load_initial_subs;
   volatile sig_atomic_t interrupted;
+  FILE *debug_file;
 } owl_global;