Changeset 26997 for gs2-extensions/tdb-edit

Timestamp:

2013-03-05T11:04:38+13:00 (11 years ago)

Author:

jmt12

Message:

Attempting to make thread joining code compatiable between core perl and MCPAN perl with the slightly different threads module

File:

• gs2-extensions/tdb-edit/trunk/src/perllib/SocketsSwimmingThreadPoolServer.pm (modified) (1 diff)

gs2-extensions/tdb-edit/trunk/src/perllib/SocketsSwimmingThreadPoolServer.pm

@@ -163 +163 @@
   }
   # Properly rejoin thread
-  my $thread = threads->self();
-  if (!$thread->is_detached())
-  {
-    $thread->join();
+  # Newer versions of module thread
+  if (defined $self->can('is_joinable'))
+  {
+    print "[debug] using newer thread->is_joinable... ";
+    if ($self->is_joinable())
+    {
+      $self->join();
+      print "joined\n";
+    }
+    else
+    {
+      print "not joinable\n";
+    }
+  }
+  else
+  {
+    print "[debug] using newer thread::is_detached... ";
+    my $thread = threads->self();
+    if (!$thread->is_detached())
+    {
+      $thread->join();
+      print "joined\n";
+    }
+    else
+    {
+      print "not detached\n";
+    }
   }
 }