svn commit: r1178473 - in /trafficserver/traffic/branches/3.0.x: STATUS proxy/PluginVC.cc

[ji...@apache.org]

Author: jim
Date: Mon Oct  3 17:33:18 2011
New Revision: 1178473

URL: http://svn.apache.org/viewvc?rev=1178473&view=rev
Log:
Merge r1159376, r1159436 from trunk:

TS-867 moving to a different thread only if the pluginvc is invoked from a non regular thread

TS-867 fixed the typo in the previous checkin
Submitted by: vmamidi
Reviewed/backported by: jim

Modified:
    trafficserver/traffic/branches/3.0.x/STATUS
    trafficserver/traffic/branches/3.0.x/proxy/PluginVC.cc

Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1178473&r1=1178472&r2=1178473&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Mon Oct  3 17:33:18 2011
@@ -38,11 +38,6 @@ A list of all bugs open for the next v3.
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) API: PluginVC crashes with TSFetchURL
-   Trunk patches: http://svn.apache.org/viewvc?view=rev&revision=1159376
-                  http://svn.apache.org/viewvc?view=rev&revision=1159436
-   Jira: https://issues.apache.org/jira/browse/TS-867
-   +1: zwoop, zym, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: trafficserver/traffic/branches/3.0.x/proxy/PluginVC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/PluginVC.cc?rev=1178473&r1=1178472&r2=1178473&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/PluginVC.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/PluginVC.cc Mon Oct  3 17:33:18 2011
@@ -788,9 +788,23 @@ PluginVC::setup_event_cb(ink_hrtime in, 
     // We locked the pointer so we can now allocate an event
     //   to call us back
     if (in == 0) {
-      *e_ptr = eventProcessor.schedule_imm(this);
-    } else {
-      *e_ptr = eventProcessor.schedule_in(this, in);
+      if(this_ethread()->tt == REGULAR) {
+	 *e_ptr = this_ethread()->schedule_imm(this);
+      }
+      else
+      {
+         *e_ptr = eventProcessor.schedule_imm(this);
+      }
+    } 
+    else 
+    {
+      if(this_ethread()->tt == REGULAR) {
+        *e_ptr = this_ethread()->schedule_in(this,in);
+      }
+      else
+      {
+        *e_ptr = eventProcessor.schedule_in(this, in);
+      }
     }
   }
 }