Changeset 6674 for trunk

Timestamp:

31/05/10 15:36:42 (21 months ago)

Author:

westram

Message:

• valgrind2grep: - ignore some leaked motif memory (wont fix that (now))
• added aw_uninstall_xkeys() and AW_root::exit_root() to stuff some memleaks

Location:

trunk

Files:

• SOURCE_TOOLS/valgrind2grep (modified) (1 diff)
• WINDOW/AW_window.cxx (modified) (3 diffs)
• WINDOW/AW_xkey.cxx (modified) (3 diffs)
• WINDOW/aw_root.hxx (modified) (1 diff)
• WINDOW/aw_xkey.hxx (modified) (1 diff)

trunk/SOURCE_TOOLS/valgrind2grep

@@ -33 +33 @@
       # Xtoolkit leaks:
       if ($text =~ /\b(XtAppMainLoop)\b.*libXt/) { $$ignore_r = $&; return; } # 15/06/2009
+
+      if ($reason =~ 'still reachable') { # reachable memory leaks
+        if ($text =~ /\b(XLoadQueryFont)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+        if ($text =~ /\b(XRebindKeysym)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+        if ($text =~ /\b(XmGetPixmap)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+        if ($text =~ /\b(XtOpenApplication)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+        if ($text =~ /\b(XtRealizeWidget)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+        if ($text =~ /\b(XtVaCreateManagedWidget)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+        if ($text =~ /\b(XtVaCreatePopupShell)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+        if ($text =~ /\b(XtVaSetValues)\b.*libXt/) { $$ignore_r = $&; return; } # 29/05/2010
+      }
     }
     else { # illegal memory access

trunk/WINDOW/AW_window.cxx

@@ -255 +255 @@
 
 static void destroy_AW_root() {
-    delete AW_root::SINGLETON;
+    delete AW_root::SINGLETON; AW_root::SINGLETON = NULL;
 }
 
@@ -273 +273 @@
 
 AW_root::~AW_root() {
+    exit_root();
     exit_variables();
     aw_assert(this == AW_root::SINGLETON);
@@ -1488 +1489 @@
     aw_install_xkeys(XtDisplay(p_r->toplevel_widget));
 
+}
+
+void AW_root::exit_root() {
+    aw_uninstall_xkeys();
 }
 

trunk/WINDOW/AW_xkey.cxx

@@ -105 +105 @@
 static GB_HASH    *awxkeymap_string_2_key_hash;
 static GB_NUMHASH *awxkeymap_xkey_2_key_hash;
+static int         generatedKeymaps_count = -1;
+static awXKeymap  *generatedKeymaps       = 0;
+
 
 const int MAPPED_KEYS = MODFREE*MODS+FIXEDMOD;
@@ -144 +147 @@
 
     int modfree = i;
-    int gensize = modfree*MODS;
-
-    static awXKeymap *generated = 0;
-
-    aw_assert(generated == 0);  // oops - called twice
-    generated = (awXKeymap*)GB_calloc(gensize, sizeof(*generated)); // never freed (cause hashes refers to it)
+
+    aw_assert(generatedKeymaps == 0);               // oops - called twice
+    
+    generatedKeymaps_count = modfree*MODS;
+    generatedKeymaps       = (awXKeymap*)GB_calloc(generatedKeymaps_count, sizeof(*generatedKeymaps));
 
     for (i=0; i<modfree; ++i) {
         const awXKeymap_modfree *mf = awxkeymap_modfree+i;
         for (int j = 0; j<MODS; ++j) {
-            awXKeymap *km = generated+i*MODS+j;
+            awXKeymap *km = generatedKeymaps+i*MODS+j;
             awModDef  *md = moddef+j;
 
@@ -177 +179 @@
 }
 
+void aw_uninstall_xkeys() {
+    for (int i = 0; i<generatedKeymaps_count; ++i) {
+        awXKeymap& km = generatedKeymaps[i];
+        int        j  = i%MODS;
+        awModDef&  md = moddef[j];
+
+        if (md.xstr_prefix) free((char*)km.xstr);
+    }
+    free(generatedKeymaps); generatedKeymaps = NULL;
+
+    GBS_free_numhash(awxkeymap_xkey_2_key_hash); awxkeymap_xkey_2_key_hash  = NULL;
+    GBS_free_hash(awxkeymap_string_2_key_hash); awxkeymap_string_2_key_hash = NULL;
+}
+
 #if defined(DEBUG)
 // #define DUMP_KEYEVENTS

trunk/WINDOW/aw_root.hxx

@@ -183 +183 @@
 
     void init_root(const char *programname, bool no_exit);
+    void exit_root();
     AW_default load_properties(const char *default_name);
 

trunk/WINDOW/aw_xkey.hxx

@@ -22 +22 @@
 
 void aw_install_xkeys(Display *display);
+void aw_uninstall_xkeys();
 const awXKeymap* aw_xkey_2_awkey(XKeyEvent *xkeyevent);