You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/02/11 01:55:23 UTC

[3/4] git commit: backport r1228526/7c1a0a3f5ab1c330384332177522eda08c6710f8

backport  r1228526/7c1a0a3f5ab1c330384332177522eda08c6710f8

TS-1074 PluginVC should schedule to the local queue instead of the
external queue. Author: Brian Geffon
Review: briang, zwoop, manjesh
Backport: igalic


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

Branch: refs/heads/3.0.x
Commit: 6fd0aca0fe470456348337f143be841752720810
Parents: 4dc0aa3
Author: Igor Galić <ig...@apache.org>
Authored: Sat Feb 11 01:39:50 2012 +0100
Committer: Igor Galić <ig...@apache.org>
Committed: Sat Feb 11 01:39:50 2012 +0100

----------------------------------------------------------------------
 CHANGES           |    3 +++
 STATUS            |    5 -----
 proxy/PluginVC.cc |    4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6fd0aca0/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index cd6195a..b8b3419 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ Changes with Apache Traffic Server 3.0.3
   *) [TS-1055]: Wrong implementation of TSHttpSsnArgGet().
     Author: Yakov Kopel
 
+  *) [TS-1074] PluginVC should schedule to the local queue instead of the
+  external queue. Author: Brian Geffon
+
   *) [TS-1066] TSHttpTxnServerReqHdrBytesGet in InkAPI.cc has an extra
    parameter (int *bytes) from the prototype in <ts/ts.h>.
    Author: Alistair Stevenson

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6fd0aca0/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 5d2d88d..221b97e 100644
--- a/STATUS
+++ b/STATUS
@@ -40,11 +40,6 @@ A list of all bugs open for the next v3.0.2 release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) PluginVC should schedule to the local queue instead of the external queue.
-   Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1228526
-   Jira: https://issues.apache.org/jira/browse/TS-1074
-   +1: briang, zwoop, manjesh
-
   *) Transformation plugins cause connection close when content length is not known ahead
    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1197133
    Jira: https://issues.apache.org/jira/browse/TS-1004

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6fd0aca0/proxy/PluginVC.cc
----------------------------------------------------------------------
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index 78de9b1..35d9f48 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -789,7 +789,7 @@ PluginVC::setup_event_cb(ink_hrtime in, Event ** e_ptr)
     //   to call us back
     if (in == 0) {
       if(this_ethread()->tt == REGULAR) {
-	 *e_ptr = this_ethread()->schedule_imm(this);
+	 *e_ptr = this_ethread()->schedule_imm_local(this);
       }
       else
       {
@@ -799,7 +799,7 @@ PluginVC::setup_event_cb(ink_hrtime in, Event ** e_ptr)
     else 
     {
       if(this_ethread()->tt == REGULAR) {
-        *e_ptr = this_ethread()->schedule_in(this,in);
+        *e_ptr = this_ethread()->schedule_in_local(this,in);
       }
       else
       {