2005-12-07 Martin Hunt <hunt@redhat.com>

	* translate.cxx (mapvar::fini): Use _stp_pmap_del() on pmaps.
	(emit_global): For pmaps, use "PMAP" instead of "MAP".

diff --git a/ChangeLog b/ChangeLog
index dd809df7301dbfecfb5b06cd017e8d6a03edc93c..29de812abb63393beb371471c8c272cb858df399 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  Martin Hunt  <hunt@redhat.com>
+
+       * translate.cxx (mapvar::fini): Use _stp_pmap_del() on pmaps.
+       (emit_global): For pmaps, use "PMAP" instead of "MAP".
+
 2005-12-06  Frank Ch. Eigler  <fche@elastic.org>
 
        PR 1934.

diff --git a/translate.cxx b/translate.cxx
index e84f9373ff2daba294ad19e24efb5b4cfd42fc58..fe1de0a5305095895a1c50ce9720633d6e36f4d8 100644 (file)
--- a/translate.cxx
+++ b/translate.cxx
@@ -675,8 +675,11 @@ struct mapvar
 
   string fini () const
   {
-    return "_stp_map_del (" + qname() + ");";
-  }  
+    if (is_parallel())
+      return "_stp_pmap_del (" + qname() + ");";
+    else
+      return "_stp_map_del (" + qname() + ");";
+  }
 };
 
 
@@ -917,9 +920,16 @@ c_unparser::emit_global (vardecl *v)
                 << " "
                 << "global_" << c_varname (v->name)
                 << ";";
+  else if (v->type == pe_stats)
+    {
+      o->newline() << "static PMAP global_" 
+                  << c_varname(v->name) << ";";
+    }
   else
-    o->newline() << "static MAP global_" 
-                << c_varname(v->name) << ";";
+    {
+      o->newline() << "static MAP global_" 
+                  << c_varname(v->name) << ";";
+    }
   o->newline() << "static rwlock_t "
                << "global_" << c_varname (v->name) << "_lock;";
 }