Changeset 409

Timestamp:

Aug 27, 2012, 9:08:06 PM (12 years ago)

Author:

katerina

Message:

Improved fix for ticket #311 (thread safety of --enable-ptrace).

Location:

trunk

Files:

• include/sh_unix.h (modified) (3 diffs)
• src/sh_unix.c (modified) (6 diffs)

trunk/include/sh_unix.h

@@ -375 +375 @@
 #endif
 void sh_set_save_tv();
+void sh_set_untraced(int val);
+int  sh_get_untraced();
 #endif
 
@@ -394 +396 @@
 int sh_derr(void)
 {
-  sh_not_traced = 0;
+  sh_set_untraced(0);
 
 #ifdef HAVE_GETTIMEOFDAY
@@ -404 +406 @@
   raise(SIGTRAP);
   
-  if (sh_not_traced == 0)
+  if (sh_get_untraced() == 0)
     _exit(5);
 
-  sh_not_traced = 0;
+  sh_set_untraced(0);
   return (0);
 }

trunk/src/sh_unix.c

@@ -5398 +5398 @@
  */
 #if defined(SCREW_IT_UP)
-volatile int sh_not_traced = 0;
-
+struct screw_it_up {
+  int not_traced;
 #ifdef HAVE_GETTIMEOFDAY
+  struct timeval save_tv;
+#endif
+};
 
 #if defined(HAVE_PTHREAD)
@@ -5412 +5415 @@
 }
 
-static inline struct timeval * sh_get_save_tv()
+static inline struct screw_it_up * sh_get_screw_it_up()
 {
   void * ptr;
-  struct timeval * save_tv;
+  struct screw_it_up * screw;
 
   (void) pthread_once(&gSaveTv_key_once, make_gSaveTv_key);
@@ -5421 +5424 @@
   if ((ptr = pthread_getspecific(gSaveTv_key)) == NULL) 
     {
-      ptr = malloc(sizeof(struct timeval));
+      ptr = malloc(sizeof(struct screw_it_up));
       if (ptr)
         {
-          save_tv  = (struct timeval*) ptr;
+          screw = (struct screw_it_up *) ptr;
           (void) pthread_setspecific(gSaveTv_key, ptr);
         }
@@ -5434 +5437 @@
   else 
     {
-      save_tv  = (struct timeval*) ptr;
-    }
-  return save_tv;
-}
-
+      screw = (struct screw_it_up *) ptr;
+    }
+  return screw;
+}
+
+#ifdef HAVE_GETTIMEOFDAY
 void sh_set_save_tv()
 {
-  struct timeval * save_tv = sh_get_save_tv();
+  struct screw_it_up * screw = sh_get_screw_it_up();
+  struct timeval * save_tv = &(screw->save_tv);
   if (save_tv)
     gettimeofday(save_tv, NULL);
   return;
 }
+struct timeval * sh_get_save_tv()
+{
+  struct screw_it_up * screw = sh_get_screw_it_up();
+  struct timeval * save_tv = &(screw->save_tv);
+  return save_tv;
+}
+/* #ifdef HAVE_GETTIMEOFDAY */
+#endif
+
+void sh_set_untraced(int val)
+{
+  struct screw_it_up * screw = sh_get_screw_it_up();
+
+  screw->not_traced = val;
+  return;
+}
+int sh_get_untraced()
+{
+  struct screw_it_up * screw = sh_get_screw_it_up();
+
+  return screw->not_traced;
+}
 
 /* !defined(HAVE_PTHREAD) */
 #else
 
+#ifdef HAVE_GETTIMEOFDAY
 static struct timeval * sSaveTv = NULL;
-
 static inline struct timeval * sh_get_save_tv()
 {
@@ -5460 +5487 @@
   gettimeofday(sSaveTv, NULL);
 }
-#endif
-
 /* #ifdef HAVE_GETTIMEOFDAY */
 #endif
+
+volatile int sh_not_traced = 0;
+void sh_set_untraced(int val)
+{
+  sh_not_traced = val;
+  return;
+}
+int sh_get_untraced()
+{
+  return sh_not_traced;
+}
+
+#endif
+
 
 void sh_sigtrap_handler (int signum)
@@ -5479 +5518 @@
     raise(SIGKILL);
 #endif
-  sh_not_traced += signum;
+  sh_set_untraced(signum);
   return;
 }