Merge lp:~arthurborsboom/xpad/xpad-4.2 into lp:xpad

[Arthur Borsboom]

Performance fix: Busy harddisk while typing or moving pad

[Arthur Borsboom (arthurborsboom)]

review: Approve

[lp:~arthurborsboom/xpad/xpad-4.2]

649. By Arthur Borsboom on 2013-10-09

performance fix: busy harddisk while typing or moving pad

=== modified file 'src/xpad-app.c'
--- src/xpad-app.c	2009-05-11 12:29:11 +0000
+++ src/xpad-app.c	2013-10-09 14:52:00 +0000
@@ -40,6 +40,7 @@
 #include "xpad-app.h"
 #include "xpad-pad.h"
 #include "xpad-pad-group.h"
+#include "xpad-periodic.h"
 #include "xpad-session-manager.h"
 #include "xpad-tray.h"
 
@@ -168,6 +169,11 @@
 	
 	xpad_tray_open ();
 	xpad_session_manager_init ();
+
+	/* Initialize Xpad-periodic module */
+	Xpad_periodic_init();
+	Xpad_periodic_set_callback("save-content", (XpadPeriodicFunc) xpad_pad_save_content);
+	Xpad_periodic_set_callback("save-info", (XpadPeriodicFunc) xpad_pad_save_info);
 	
 	/* load all pads */
 	pads_loaded_on_start = xpad_app_load_pads ();
@@ -244,6 +250,13 @@
 	return pad_group;
 }
 
+void
+xpad_app_quit (void)
+{
+	xpad_pad_group_save_unsaved_all(xpad_app_get_pad_group());
+	gtk_main_quit();
+}
+
 gboolean
 xpad_app_get_translucent (void)
 {
@@ -393,7 +406,7 @@
 		if (num_pads == 0)
 		{
 			if (gtk_main_level () > 0)
-				gtk_main_quit ();
+				xpad_app_quit ();
 			else
 				exit (0);
 		}
@@ -420,7 +433,7 @@
 		else
 		{
 			if (gtk_main_level () > 0)
-				gtk_main_quit ();
+				xpad_app_quit ();
 			else
 				exit (0);
 		}
@@ -876,7 +889,7 @@
 		if (option_quit)
 		{
 			if (have_gtk && gtk_main_level () > 0)
-				gtk_main_quit ();
+				xpad_app_quit ();
 			else
 				exit (0);
 		}

=== modified file 'src/xpad-app.h'
--- src/xpad-app.h	2008-09-21 00:03:40 +0000
+++ src/xpad-app.h	2013-10-09 14:52:00 +0000
@@ -31,6 +31,7 @@
 G_CONST_RETURN gchar *xpad_app_get_program_path (void);
 XpadPadGroup         *xpad_app_get_pad_group (void);
 gboolean              xpad_app_get_translucent (void);
+void                  xpad_app_quit (void);
 
 G_END_DECLS
 

=== modified file 'src/xpad-pad-group.c'
--- src/xpad-pad-group.c	2009-05-11 12:29:11 +0000
+++ src/xpad-pad-group.c	2013-10-09 14:52:00 +0000
@@ -168,6 +168,12 @@
 		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_close, NULL);
 }
 
+void
+xpad_pad_group_save_unsaved_all (XpadPadGroup *group)
+{
+	if (group)
+		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_save_unsaved, NULL);
+}
 
 void
 xpad_pad_group_show_all (XpadPadGroup *group)

=== modified file 'src/xpad-pad-group.h'
--- src/xpad-pad-group.h	2008-09-21 00:03:40 +0000
+++ src/xpad-pad-group.h	2013-10-09 14:52:00 +0000
@@ -63,6 +63,7 @@
 void     xpad_pad_group_toggle_hide      (XpadPadGroup *group);
 GSList * xpad_pad_group_get_pads         (XpadPadGroup *group);
 gint     xpad_pad_group_num_visible_pads (XpadPadGroup *group);
+void     xpad_pad_group_save_unsaved_all (XpadPadGroup *group);
 
 G_END_DECLS
 

=== modified file 'src/xpad-pad.c'
--- src/xpad-pad.c	2011-11-16 18:10:04 +0000
+++ src/xpad-pad.c	2013-10-09 14:52:00 +0000
@@ -31,6 +31,7 @@
 #include "xpad-app.h"
 #include "xpad-pad.h"
 #include "xpad-pad-properties.h"
+#include "xpad-periodic.h"
 #include "xpad-preferences.h"
 #include "xpad-settings.h"
 #include "xpad-text-buffer.h"
@@ -67,6 +68,9 @@
 	/* menus */
 	GtkWidget *menu;
 	GtkWidget *highlight_menu;
+
+	gboolean unsaved_content;
+	gboolean unsaved_info;
 	
 	XpadPadGroup *group;
 };
@@ -242,6 +246,8 @@
 	pad->priv->toolbar_expanded = FALSE;
 	pad->priv->toolbar_pad_resized = TRUE;
 	pad->priv->properties = NULL;
+	pad->priv->unsaved_content = TRUE;
+	pad->priv->unsaved_info = TRUE;
 	pad->priv->group = NULL;
 
 	XpadTextView *text_view = g_object_new (XPAD_TYPE_TEXT_VIEW,
@@ -785,7 +791,7 @@
 			pango_font_description_free (fontdesc);
 	}
 	
-	xpad_pad_save_info (pad);
+	xpad_save_info_delayed (pad);
 }
 
 static void
@@ -801,7 +807,7 @@
 		gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop));
 	}
 	
-	xpad_pad_save_info (pad);
+	xpad_save_info_delayed (pad);
 }
 
 static void
@@ -811,7 +817,7 @@
 	
 	gtk_widget_modify_text (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_text_color (prop));
 	
-	xpad_pad_save_info (pad);
+	xpad_save_info_delayed (pad);
 }
 
 static void
@@ -821,7 +827,7 @@
 	
 	gtk_widget_modify_base (pad->priv->textview, GTK_STATE_NORMAL, xpad_pad_properties_get_back_color (prop));
 	
-	xpad_pad_save_info (pad);
+	xpad_save_info_delayed (pad);
 }
 
 static void
@@ -837,7 +843,7 @@
 	if (fontdesc)
 		pango_font_description_free (fontdesc);
 	
-	xpad_pad_save_info (pad);
+	xpad_save_info_delayed (pad);
 }
 
 static void
@@ -891,7 +897,7 @@
 static void
 xpad_pad_quit (XpadPad *pad)
 {
-	gtk_main_quit ();
+	xpad_app_quit ();
 }
 
 static void
@@ -901,7 +907,7 @@
 	xpad_pad_sync_title (pad);
 	
 	/* record change */
-	xpad_pad_save_content (pad);
+	xpad_save_content_delayed(pad);
 }
 
 static gboolean
@@ -926,7 +932,7 @@
 	pad->priv->height = event->height;
 	pad->priv->location_valid = TRUE;
 	
-	xpad_pad_save_info (pad);
+	xpad_save_content_delayed(pad);
 	
 	/* Sometimes when moving, if the toolbar tries to hide itself,
 		the window manager will not resize it correctly.  So, we make
@@ -1138,6 +1144,7 @@
 	xpad_text_buffer_thaw_undo (XPAD_TEXT_BUFFER (buffer));
 
 	xpad_pad_text_changed(pad, buffer);
+	pad->priv->unsaved_content = FALSE;
 }
 
 void
@@ -1160,7 +1167,8 @@
 	content = xpad_text_buffer_get_text_with_tags (XPAD_TEXT_BUFFER (buffer));
 	
 	fio_set_file (pad->priv->contentname, content);
-	
+
+	pad->priv->unsaved_content = FALSE;
 	g_free (content);
 }
 
@@ -1195,6 +1203,8 @@
 		"s|content", &pad->priv->contentname,
 		NULL))
 		return;
+
+	pad->priv->unsaved_info = FALSE;
 	
 	pad->priv->location_valid = TRUE;
 	if (xpad_settings_get_has_toolbar (xpad_settings ()) &&
@@ -1302,7 +1312,8 @@
 		"s|fontname", fontname,
 		"s|content", pad->priv->contentname,
 		NULL);
-	
+
+	pad->priv->unsaved_info = FALSE;
 	g_free (fontname);
 }
 
@@ -1476,7 +1487,7 @@
 	XpadTextBuffer *buffer = NULL;
 	buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)));
 	xpad_text_buffer_toggle_tag (buffer, name);
-	xpad_pad_save_content (pad);
+	xpad_save_content_delayed(pad);
 }
 
 static void
@@ -1877,3 +1888,28 @@
 	else
 		gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
 }
+
+/* These functions below are used to reduce the amounts of writes, hence improve the performance. */
+void xpad2_save_content (void * vptr)
+{
+   xpad_pad_save_content(vptr);
+}
+void xpad_save_content_delayed (XpadPad *pad)
+{
+   pad->priv->unsaved_content = TRUE;
+   Xpad_periodic_save_content_delayed(pad);
+}
+void xpad_save_info_delayed (XpadPad *pad)
+{
+   pad->priv->unsaved_info = TRUE;
+   Xpad_periodic_save_info_delayed(pad);
+}
+void xpad_pad_save_unsaved (XpadPad *pad)
+{
+   if(pad->priv->unsaved_content == TRUE) {
+      xpad_pad_save_content(pad);
+   }
+   if(pad->priv->unsaved_info == TRUE) {
+      xpad_pad_save_info(pad);
+   }
+}

=== modified file 'src/xpad-pad.h'
--- src/xpad-pad.h	2011-11-16 18:10:04 +0000
+++ src/xpad-pad.h	2013-10-09 14:52:00 +0000
@@ -64,6 +64,9 @@
 
 void xpad_pad_load_content (XpadPad *pad);
 void xpad_pad_save_content (XpadPad *pad);
+void xpad_pad_save_unsaved (XpadPad *pad);
+void xpad_save_content_delayed (XpadPad *pad);
+void xpad_save_info_delayed (XpadPad *pad);
 
 void xpad_pad_notify_has_selection (XpadPad *pad);
 void xpad_pad_notify_clipboard_owner_changed (XpadPad *pad);

=== added file 'src/xpad-periodic.c'
--- src/xpad-periodic.c	1970-01-01 00:00:00 +0000
+++ src/xpad-periodic.c	2013-10-09 14:52:00 +0000
@@ -0,0 +1,268 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include "xpad-periodic.h"
+
+#ifdef SHOW_DEBUG
+#   define G_PRINT_DBG g_print
+#else
+#   define G_PRINT_DBG gprint_ignore
+#endif
+
+#define TIMEOUT_SECONDS     4
+
+struct sigref_ {
+    const char *        signame;
+    XpadPeriodicFunc    func_ptr;
+    gpointer            data;
+};
+
+typedef struct sigref_ Xpadsigref;
+
+typedef struct {
+    /************************
+    count = a clock tick count
+    after_id = the timeout id
+    ************************/
+    int                 count;
+    int                 after_id;
+
+    /************************
+    template = a list of signal names and function pointers
+    template_len = the length of 'template'
+    sigs = a list of signal names, function pointers and data
+    sigs_len = the length of 'sigs'
+    ************************/
+    Xpadsigref *        template;
+    int                 template_len;
+    Xpadsigref *        sigs;
+    int                 sigs_len;
+} XpadPeriodic;
+
+
+/* prototypes */
+static gint xppd_intercept (gpointer);
+static gint gprint_ignore(const char *, ...);
+
+static void xpad_sigref_dump2 (gint);
+static gboolean str_equal (const char *, const char *);
+
+/* global variables */
+static XpadPeriodic xpptr [1];
+
+/* Functions start here */
+
+gboolean Xpad_periodic_init (void)
+{
+    memset(xpptr, 0, sizeof(*xpptr));
+    xpptr->after_id =
+    g_timeout_add_seconds(TIMEOUT_SECONDS, xppd_intercept, xpptr);
+
+    /* Allocate space for the signal references. */
+    int tlen = xpptr->template_len = 5;
+    int slen = xpptr->sigs_len = 20;
+    xpptr->template = g_malloc0(tlen * sizeof(Xpadsigref));
+    xpptr->sigs = g_malloc0(slen * sizeof(Xpadsigref));
+
+    return TRUE;
+}
+
+void    Xpad_periodic_close (void)
+{
+    if (xpptr->after_id) { g_source_remove(xpptr->after_id); }
+    /* Free the signal references memory. */
+    g_free(xpptr->template);
+    g_free(xpptr->sigs);
+    /* Signal that this structure is now cleared. */
+    memset(xpptr, 0, sizeof(*xpptr));
+}
+
+/************************
+xppd_intercept - intercepts a timer tick
+
+    This function intercepts a timer tick and iterates
+    over the signal references. Any signal references that
+    are fully stocked with signal names, function pointers
+    and data pointers are invoked.
+
+    IOW (In other words), the function pointer is called with the
+    right data pointer.
+************************/
+gint xppd_intercept (gpointer cdata)
+{
+    int cnt=0;
+    XpadPeriodicFunc fnptr=0;
+    xpptr->count++; /* increment tick count */
+
+    G_PRINT_DBG("xppd tick: %4d\n", xpptr->count);
+
+    for (cnt = 0; cnt < xpptr->sigs_len; ++cnt) {
+        Xpadsigref * sig_item = xpptr->sigs + cnt;
+        if (sig_item->signame && sig_item->func_ptr && sig_item->data) {
+            fnptr = sig_item->func_ptr;
+            (*fnptr)(sig_item->data);
+            G_PRINT_DBG("invoked %s : %p : %p\n", sig_item->signame,
+                sig_item->func_ptr, sig_item->data);
+            memset(sig_item, 0, sizeof(*sig_item));
+        }
+    }
+
+    return TRUE;
+}
+
+/************************
+    Xpad_periodic_set_callback():
+    This function prepares a callback function to be invoked
+    for an event name such as "save-content" or "save-info".
+
+    cbname :        event name (or callback function name)
+    func :          function address
+
+    Returns true if a callback was registered.
+************************/
+gboolean    Xpad_periodic_set_callback (
+    const char * cbname,
+    XpadPeriodicFunc func)
+{
+    int index = 0;
+    gboolean isdone=FALSE;
+    if (0 == func) { return FALSE; }
+    if (0 == cbname || 0==*cbname) { return FALSE; }
+
+    /* Find an open slot for signal (callback) references and
+    insert this one. */
+    for (index = 0; index < xpptr->template_len; ++index) {
+        /* Store a pointer to the current signal item. */
+        Xpadsigref * sig_item = xpptr->template + index;
+
+        /* If it's empty, set it. */
+        if (0 == sig_item->signame) {
+            sig_item->signame = cbname;
+            sig_item->func_ptr = func;
+            isdone = TRUE;
+            break;
+        }
+    }
+
+    if (! isdone) {
+        printf("Failed to install signal callback: %s\n", cbname);
+        exit(1);
+    }
+
+    return isdone;
+}
+
+void Xpad_periodic_save_info_delayed (void * xpad_pad)
+{
+    Xpad_periodic_signal("save-info", xpad_pad);
+}
+
+void Xpad_periodic_save_content_delayed (void * xpad_pad)
+{
+    Xpad_periodic_signal("save-content", xpad_pad);
+}
+
+void Xpad_periodic_signal (const char * cbname, void * xpad_pad)
+{
+    int isdone = 0;
+    int tnx=0, snx=0;
+    XpadPeriodicFunc func_ptr = 0;
+    Xpadsigref * sig_item = 0;
+
+    if (0 == cbname || 0==*cbname) { return; }
+    if (0 == xpad_pad) { return; }
+
+    /* Get the callback function address */
+    for (tnx = 0; tnx < xpptr->template_len; ++tnx) {
+        if (str_equal(xpptr->template[tnx].signame, cbname)) {
+            func_ptr = xpptr->template[tnx].func_ptr;
+            break;
+        }
+    }
+
+    /* If there is no callback address, we can't continue. */
+    if (! func_ptr) {
+        Xpad_periodic_error_exit("Can't find signal function address: %s\n", cbname);
+    }
+
+    /* Check that this event is not already present. 
+    If it is present, don't do anything more. */
+    for (snx = 0; snx < xpptr->sigs_len; ++snx) {
+        sig_item = xpptr->sigs + snx;
+        if (str_equal(sig_item->signame,cbname) &&
+            (xpad_pad == sig_item->data)) {
+            G_PRINT_DBG("Already got signal: %s\n", cbname);
+            return;
+        }
+    }
+
+    /* Find a suitable slot for the signal reference and set it. */
+    for (snx = 0; snx < xpptr->sigs_len; ++snx) {
+        gint doadd = 0;
+        sig_item = xpptr->sigs + snx;
+
+        doadd += (str_equal(sig_item->signame, cbname));
+        doadd += (0 == sig_item->signame);
+
+        if (doadd) {
+            sig_item->signame = cbname;
+            sig_item->func_ptr = func_ptr;
+            sig_item->data = xpad_pad;
+            isdone = TRUE;
+            break;
+        }
+    }
+
+    if (! isdone) {
+        Xpad_periodic_error_exit("Could not schedule event: %s\n", cbname);
+    }
+}
+
+gboolean str_equal (const char * s1, const char * s2) {
+    if (0 == s1 || 0==s2) { return FALSE; }
+    if (s1 == s2) { return TRUE; }
+    return (0 == strcmp(s1, s2));
+}
+
+gint gprint_ignore (const char * fmt, ...)
+{
+    return 0;
+}
+
+void xpad_sigref_dump2 (gint twhich)
+{
+    int tlen = 0, cnt = 0;
+    Xpadsigref * xlist = 0;
+    if (0 == twhich) { xlist = xpptr->template; }
+    if (1 == twhich) { xlist = xpptr->sigs; }
+    if (0 == twhich) { tlen = xpptr->template_len; }
+    if (1 == twhich) { tlen = xpptr->sigs_len; }
+
+    for (cnt = 0; cnt < tlen; ++cnt) {
+        Xpadsigref * xitem = xlist + cnt;
+        if (0 == xitem->signame) { continue; }
+        printf("%3d: %s : %p : %p\n", cnt, xitem->signame,
+            xitem->func_ptr, xitem->data);
+    }
+}
+
+void Xpad_periodic_error_exit (const char * fmt, ...)
+{
+    va_list app;
+    va_start(app, fmt);
+    vprintf(fmt, app);
+    va_end(app);
+    exit(1);
+}
+
+void Xpad_periodic_test (void)
+{
+    puts("Template:");
+    xpad_sigref_dump2(0);
+    exit(0);
+}
+
+
+/* vim: set ts=4 sw=4 :vim */

=== added file 'src/xpad-periodic.h'
--- src/xpad-periodic.h	1970-01-01 00:00:00 +0000
+++ src/xpad-periodic.h	2013-10-09 14:52:00 +0000
@@ -0,0 +1,42 @@
+
+#ifndef XPAD_PERIODIC_H
+#define XPAD_PERIODIC_H
+
+#include <gtk/gtk.h>
+
+typedef void (*XpadPeriodicFunc)(void *);
+
+/* Callback function codes: save-content, save-info */
+
+/************************
+	Xpad_periodic_init():	initializes this module
+	Xpad_periodic_close():	frees resources of this module
+************************/
+gboolean	Xpad_periodic_init(void);
+void		Xpad_periodic_close(void);
+
+/************************
+	Xpad_periodic_set_callback():
+	Sets up a callback function for a signal name.
+	The signal names are "save-info" and "save-content"
+************************/
+gboolean	Xpad_periodic_set_callback (const char *, XpadPeriodicFunc);
+
+/************************
+	Xpad_periodic_save_content_delayed:
+	Xpad_periodic_save_info_delayed:
+	These functions prepare either the pad's content
+	or info to be saved later.
+************************/
+void	Xpad_periodic_save_content_delayed (void * xpad_pad);
+void	Xpad_periodic_save_info_delayed (void * xpad_pad);
+void	Xpad_periodic_signal (const char * cbname, void * xpad_pad);
+
+void	Xpad_periodic_test (); /* aborts program */
+void	Xpad_periodic_error_exit (const char *, ...); /* ditto */
+
+#endif /* XPAD_PERIODIC_H */
+
+/************************
+************************/
+/* vim: set ts=4 sw=4 :vim */

=== modified file 'src/xpad-tray.c'
--- src/xpad-tray.c	2012-08-15 13:30:31 +0000
+++ src/xpad-tray.c	2013-10-09 14:52:00 +0000
@@ -188,7 +188,7 @@
 	gtk_widget_show (item);
 	
 	item = gtk_image_menu_item_new_from_stock (GTK_STOCK_QUIT, NULL);
-	g_signal_connect (item, "activate", G_CALLBACK (gtk_main_quit), NULL);
+	g_signal_connect (item, "activate", G_CALLBACK (xpad_app_quit), NULL);
 	gtk_container_add (GTK_CONTAINER (menu), item);
 	gtk_widget_show (item);