trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject [15/17] git commit: TS-2253: PluginVC::process_close Segmentation fault
Date Wed, 18 Jun 2014 23:51:41 GMT
TS-2253: PluginVC::process_close Segmentation fault


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/29f945ee
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/29f945ee
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/29f945ee

Branch: refs/heads/4.2.x
Commit: 29f945ee926650b60e517f960a8e7ae48e885c0a
Parents: 6e6132a
Author: bettydramit <b13621367396@gmail.com>
Authored: Tue May 20 15:08:40 2014 -0700
Committer: Brian Geffon <briang@apache.org>
Committed: Tue Jun 10 16:23:37 2014 -0700

----------------------------------------------------------------------
 proxy/PluginVC.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/29f945ee/proxy/PluginVC.cc
----------------------------------------------------------------------
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index 66a4a7b..9b0727e 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -127,7 +127,8 @@ PluginVC::main_handler(int event, void *data)
     read_mutex_held = MUTEX_TAKE_TRY_LOCK(read_side_mutex, my_ethread);
 
     if (!read_mutex_held) {
-      call_event->schedule_in(PVC_LOCK_RETRY_TIME);
+      if (call_event != inactive_event)
+        call_event->schedule_in(PVC_LOCK_RETRY_TIME);
       return 0;
     }
 
@@ -135,7 +136,8 @@ PluginVC::main_handler(int event, void *data)
       // It's possible some swapped the mutex on us before
       //  we were able to grab it
       Mutex_unlock(read_side_mutex, my_ethread);
-      call_event->schedule_in(PVC_LOCK_RETRY_TIME);
+      if (call_event != inactive_event)
+        call_event->schedule_in(PVC_LOCK_RETRY_TIME);
       return 0;
     }
   }
@@ -147,7 +149,8 @@ PluginVC::main_handler(int event, void *data)
       if (read_mutex_held) {
         Mutex_unlock(read_side_mutex, my_ethread);
       }
-      call_event->schedule_in(PVC_LOCK_RETRY_TIME);
+      if (call_event != inactive_event)
+        call_event->schedule_in(PVC_LOCK_RETRY_TIME);
       return 0;
     }
 
@@ -158,7 +161,8 @@ PluginVC::main_handler(int event, void *data)
       if (read_mutex_held) {
         Mutex_unlock(read_side_mutex, my_ethread);
       }
-      call_event->schedule_in(PVC_LOCK_RETRY_TIME);
+      if (call_event != inactive_event)
+        call_event->schedule_in(PVC_LOCK_RETRY_TIME);
       return 0;
     }
   }


Mime
View raw message