Debugging and memory checking

diff --git a/src/.vimrc b/src/.vimrc
index 5de2904a55b096a11e7428616a7a16ba2cea2375..b071c5531d72137fe86c067ac7678ae5d345bd3f 100644 (file)
--- a/src/.vimrc
+++ b/src/.vimrc
@@ -1,2 +1,4 @@
 set makeprg=make\ test
 set tw=100
 set makeprg=make\ test
 set tw=100

+au FileType valgrind syn match gisFile "\v<(gis-\w+|elev|env|map|sat|test)\.c>" containedin=valgrindSrc
+au FileType valgrind hi link gisFile Error

diff --git a/src/data/gis-http.c b/src/data/gis-http.c
index 0b29c4dd9f55208a7aad64559ac5c5853db09d46..e89d2526ecaa6a20bc246da352774f26462a275e 100644 (file)
--- a/src/data/gis-http.c
+++ b/src/data/gis-http.c
@@ -24,6 +24,7 @@
 
 GisHttp *gis_http_new(const gchar *prefix)
 {
 
 GisHttp *gis_http_new(const gchar *prefix)
 {

+       g_debug("GisHttp: new - %s", prefix);

        GisHttp *self = g_new0(GisHttp, 1);
        self->soup = soup_session_sync_new();
        self->prefix = g_strdup(prefix);
        GisHttp *self = g_new0(GisHttp, 1);
        self->soup = soup_session_sync_new();
        self->prefix = g_strdup(prefix);


@@ -33,6 +34,8 @@ GisHttp *gis_http_new(const gchar *prefix)
 
 void gis_http_free(GisHttp *self)
 {
 
 void gis_http_free(GisHttp *self)
 {

+       g_debug("GisHttp: free - %s", self->prefix);
+       soup_session_abort(self->soup);

        g_object_unref(self->soup);
        g_free(self->prefix);
        g_free(self);
        g_object_unref(self->soup);
        g_free(self->prefix);
        g_free(self);


@@ -75,7 +78,8 @@ static void _chunk_cb(SoupMessage *message, SoupBuffer *chunk, gpointer _info)
 gchar *gis_http_fetch(GisHttp *self, const gchar *uri, const char *local,
                GisCacheType mode, GisChunkCallback callback, gpointer user_data)
 {
 gchar *gis_http_fetch(GisHttp *self, const gchar *uri, const char *local,
                GisCacheType mode, GisChunkCallback callback, gpointer user_data)
 {

-       g_debug("GisHttp: fetch - %s >> %s  mode=%d", uri, self->prefix, mode);
+       g_debug("GisHttp: fetch - %.20s... >> %s/%s  mode=%d",
+                       uri, self->prefix, local, mode);

 
        gchar *path = g_build_filename(g_get_user_cache_dir(), PACKAGE,
                        self->prefix, local, NULL);
 
        gchar *path = g_build_filename(g_get_user_cache_dir(), PACKAGE,
                        self->prefix, local, NULL);

diff --git a/src/data/gis-wms.c b/src/data/gis-wms.c
index 23bc3f74e43c43e802c815ad066d14289e1db560..509a18ebb03ab8b0e770831071757b9a6e34b0f7 100644 (file)
--- a/src/data/gis-wms.c
+++ b/src/data/gis-wms.c
@@ -109,6 +109,7 @@ GisWms *gis_wms_new(
        const gchar *uri_format, const gchar *prefix,
        const gchar *extension, gint width, gint height)
 {
        const gchar *uri_format, const gchar *prefix,
        const gchar *extension, gint width, gint height)
 {

+       g_debug("GisWms: new - %s", uri_prefix);

        GisWms *self = g_new0(GisWms, 1);
        self->http         = gis_http_new(prefix);
        self->uri_prefix   = g_strdup(uri_prefix);
        GisWms *self = g_new0(GisWms, 1);
        self->http         = gis_http_new(prefix);
        self->uri_prefix   = g_strdup(uri_prefix);


@@ -122,6 +123,7 @@ GisWms *gis_wms_new(
 
 void gis_wms_free(GisWms *self)
 {
 
 void gis_wms_free(GisWms *self)
 {

+       g_debug("GisWms: free - %s", self->uri_prefix);

        gis_http_free(self->http);
        g_free(self->uri_prefix);
        g_free(self->uri_layer);
        gis_http_free(self->http);
        g_free(self->uri_prefix);
        g_free(self->uri_layer);

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 420e21332fb968ffd16761cde456c96a012e6ec4..d85b70bfe05a3c05b91306490563e1eb8cf2d5ce 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -296,7 +296,6 @@ static void _unload_object(GisOpenGL *self, GisObject *object)
        g_debug("GisOpenGL: unload_object");
        if (GIS_IS_MARKER(object)) {
                GisMarker *marker = GIS_MARKER(object);
        g_debug("GisOpenGL: unload_object");
        if (GIS_IS_MARKER(object)) {
                GisMarker *marker = GIS_MARKER(object);

-               g_debug("delete_texture: %d", marker->tex);

                glDeleteTextures(1, &marker->tex);
        }
 }
                glDeleteTextures(1, &marker->tex);
        }
 }


@@ -444,7 +443,8 @@ static void on_view_changed(GisOpenGL *self,
        gdk_threads_enter();
        _set_visuals(self);
 #ifndef ROAM_DEBUG
        gdk_threads_enter();
        _set_visuals(self);
 #ifndef ROAM_DEBUG

-       g_idle_add_full(G_PRIORITY_HIGH_IDLE+30, _update_errors_cb, self->sphere, NULL);
+       self->ue_source = g_idle_add_full(G_PRIORITY_HIGH_IDLE+30,
+                       _update_errors_cb, self->sphere, NULL);

        //roam_sphere_update_errors(self->sphere);
 #endif
        gdk_threads_leave();
        //roam_sphere_update_errors(self->sphere);
 #endif
        gdk_threads_leave();


@@ -651,6 +651,10 @@ static void gis_opengl_dispose(GObject *_self)
                g_source_remove(self->sm_source[1]);
                self->sm_source[1] = 0;
        }
                g_source_remove(self->sm_source[1]);
                self->sm_source[1] = 0;
        }

+       if (self->ue_source) {
+               g_source_remove(self->ue_source);
+               self->ue_source = 0;
+       }

        G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_self);
 }
 static void gis_opengl_finalize(GObject *_self)
        G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_self);
 }
 static void gis_opengl_finalize(GObject *_self)

diff --git a/src/gis-opengl.h b/src/gis-opengl.h
index df40002fa84a9765eb5c3554be1bed553e16a418..80e866ee8fb3920b2bd718d7cc50a81f254b5270 100644 (file)
--- a/src/gis-opengl.h
+++ b/src/gis-opengl.h
@@ -42,6 +42,7 @@ struct _GisOpenGL {
        RoamSphere *sphere;
        GMutex     *sphere_lock;
        guint       sm_source[2];
        RoamSphere *sphere;
        GMutex     *sphere_lock;
        guint       sm_source[2];

+       guint       ue_source;

 
        /* for testing */
        gboolean    wireframe;
 
        /* for testing */
        gboolean    wireframe;

diff --git a/src/gis-test.c b/src/gis-test.c
index 3364a6876e405ae998994fe4f7a2ae93bec0cbff..7e973c19ad45e73b7725bd44dc7ae4e544749653 100644 (file)
--- a/src/gis-test.c
+++ b/src/gis-test.c
@@ -21,21 +21,34 @@
 
 #include "gis.h"
 
 
 #include "gis.h"
 

+GisPrefs   *prefs   = NULL;
+GisPlugins *plugins = NULL;
+GisViewer  *viewer  = NULL;
+

 /*************
  * Callbacks *
  *************/
 /*************
  * Callbacks *
  *************/

-static gboolean on_delete(GtkWidget *widget, GdkEvent *event, gpointer data)
+static gboolean gis_shutdown(GtkWidget *window)

 {
 {

+       gis_plugins_free(plugins);
+       g_object_unref(prefs);
+       gtk_widget_destroy(window);
+
+       while (gtk_events_pending())
+                 gtk_main_iteration();
+

        gtk_main_quit();
        return TRUE;
 }
        gtk_main_quit();
        return TRUE;
 }

+static gboolean on_delete(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+       return gis_shutdown(widget);
+}

 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
                gpointer window)
 {
 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
                gpointer window)
 {

-       if (event->keyval == GDK_q) {
-               gtk_main_quit();
-               return TRUE;
-       }
+       if (event->keyval == GDK_q)
+               return gis_shutdown(widget);

        return FALSE;
 }
 
        return FALSE;
 }
 


@@ -48,25 +61,26 @@ int main(int argc, char **argv)
        gdk_threads_init();
        gtk_init(&argc, &argv);
 
        gdk_threads_init();
        gtk_init(&argc, &argv);
 

-       GisPrefs   *prefs   = gis_prefs_new(NULL, NULL);
-       GisPlugins *plugins = gis_plugins_new(g_getenv("GIS_PLUGIN_PATH"), prefs);
-       GisViewer  *viewer  = gis_opengl_new(plugins, prefs);
+       prefs   = gis_prefs_new(NULL, NULL);
+       plugins = gis_plugins_new(g_getenv("GIS_PLUGIN_PATH"), prefs);
+       viewer  = gis_opengl_new(plugins, prefs);

 
        gdk_threads_enter();
 
        gdk_threads_enter();

-       GtkWidget  *window  = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

        g_signal_connect(window, "delete-event",    G_CALLBACK(on_delete),    NULL);
        g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), NULL);
        gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(viewer));
        gtk_widget_show_all(window);
 
        g_signal_connect(window, "delete-event",    G_CALLBACK(on_delete),    NULL);
        g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), NULL);
        gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(viewer));
        gtk_widget_show_all(window);
 

-       gis_plugins_load(plugins, "test", viewer, prefs);
-       gis_plugins_load(plugins, "env",  viewer, prefs);

 
 

-       gtk_main();
+       /* elev env map sat test */
+       gis_plugins_load(plugins, "elev",  viewer, prefs);
+       gis_plugins_load(plugins, "env",   viewer, prefs);
+       gis_plugins_load(plugins, "map",   viewer, prefs);
+       gis_plugins_load(plugins, "sat",   viewer, prefs);
+       gis_plugins_load(plugins, "test",  viewer, prefs);

 
 

-       gis_plugins_free(plugins);
-       g_object_unref(prefs);
-       gtk_widget_destroy(window);
+       gtk_main();

 
        gdk_threads_leave();
        return 0;
 
        gdk_threads_leave();
        return 0;

diff --git a/src/objects/gis-tile.c b/src/objects/gis-tile.c
index b2f96d377eaf6a6476f32359878dff208415c09b..2fe720285fa3b2ed76356b98399c73c5ced05bfe 100644 (file)
--- a/src/objects/gis-tile.c
+++ b/src/objects/gis-tile.c
@@ -47,8 +47,8 @@ gchar *gis_tile_get_path(GisTile *child)
                        if (parent->children[x][y] == child)
                                parts = g_list_prepend(parts, gis_tile_path_table[x][y]);
        GString *path = g_string_new("");
                        if (parent->children[x][y] == child)
                                parts = g_list_prepend(parts, gis_tile_path_table[x][y]);
        GString *path = g_string_new("");

-       for (; parts; parts = parts->next)
-               g_string_append(path, parts->data);
+       for (GList *cur = parts; cur; cur = cur->next)
+               g_string_append(path, cur->data);

        g_list_free(parts);
        return g_string_free(path, FALSE);
 }
        g_list_free(parts);
        return g_string_free(path, FALSE);
 }

diff --git a/src/roam.c b/src/roam.c
index e4848fa3b04c0df426bc04d47a79be62d0358c00..a3bc847f40a01dbabe957039f737def9f10c4741 100644 (file)
--- a/src/roam.c
+++ b/src/roam.c
@@ -101,7 +101,7 @@ void roam_point_update_projection(RoamPoint *self, RoamSphere *sphere)
        static int count   = 0;
        static int version = 0;
        if (version != sphere->view->version) {
        static int count   = 0;
        static int version = 0;
        if (version != sphere->view->version) {

-               g_debug("Projected %d points", count);
+               g_debug("RoamPoint: Projected %d points", count);

                count   = 0;
                version = sphere->view->version;
        }
                count   = 0;
                version = sphere->view->version;
        }


@@ -675,6 +675,7 @@ void roam_sphere_free_tri(RoamTriangle *tri)
 }
 void roam_sphere_free(RoamSphere *self)
 {
 }
 void roam_sphere_free(RoamSphere *self)
 {

+       g_debug("RoamSphere: free");

        /* Slow method, but it should work */
        while (self->polys > 8)
                roam_sphere_merge_one(self);
        /* Slow method, but it should work */
        while (self->polys > 8)
                roam_sphere_merge_one(self);