You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/03/04 23:17:50 UTC
svn commit: r1078174 - in /trafficserver/traffic/trunk:
iocore/cache/CachePages.cc iocore/cache/CachePagesInternal.cc
iocore/net/UnixNetPages.cc proxy/InkAPI.cc proxy/InkAPIInternal.h
Author: zwoop
Date: Fri Mar 4 22:17:49 2011
New Revision: 1078174
URL: http://svn.apache.org/viewvc?rev=1078174&view=rev
Log:
TS-690 Schedule some callbacks on the ET_TASK threads
Modified:
trafficserver/traffic/trunk/iocore/cache/CachePages.cc
trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc
trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPIInternal.h
Modified: trafficserver/traffic/trunk/iocore/cache/CachePages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CachePages.cc?rev=1078174&r1=1078173&r2=1078174&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CachePages.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CachePages.cc Fri Mar 4 22:17:49 2011
@@ -26,6 +26,7 @@
#ifdef NON_MODULAR
#include "api/ts/ts.h"
#include "Show.h"
+#include "I_Tasks.h"
struct ShowCache: public ShowCont {
int part_index;
@@ -192,7 +193,7 @@ register_ShowCache(Continuation *c, HTTP
if (theshowcache->mutex->thread_holding)
CONT_SCHED_LOCK_RETRY(theshowcache);
else
- eventProcessor.schedule_imm(theshowcache, ET_NET);
+ eventProcessor.schedule_imm(theshowcache, ET_TASK);
return &theshowcache->action;
}
Modified: trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc?rev=1078174&r1=1078173&r2=1078174&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc Fri Mar 4 22:17:49 2011
@@ -25,6 +25,7 @@
#ifdef NON_MODULAR
#include "Show.h"
+#include "I_Tasks.h"
struct ShowCacheInternal: public ShowCont
{
@@ -98,7 +99,7 @@ register_ShowCacheInternal(Continuation
if (theshowcacheInternal->mutex->thread_holding)
CONT_SCHED_LOCK_RETRY(theshowcacheInternal);
else
- eventProcessor.schedule_imm(theshowcacheInternal, ET_NET);
+ eventProcessor.schedule_imm(theshowcacheInternal, ET_TASK);
return &theshowcacheInternal->action;
}
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc?rev=1078174&r1=1078173&r2=1078174&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc Fri Mar 4 22:17:49 2011
@@ -27,6 +27,7 @@
#include "P_Net.h"
#include "Show.h"
+#include "I_Tasks.h"
struct ShowNet;
typedef int (ShowNet::*ShowNetEventHandler) (int event, Event * data);
@@ -141,7 +142,7 @@ struct ShowNet: public ShowCont
"<th>Inactive Timeout</th>"
"<th>Active Timeout</th>" "<th>Shutdown</th>" "<th>Comments</th>" "</tr>\n"));
SET_HANDLER(&ShowNet::showConnectionsOnThread);
- eventProcessor.eventthread[ET_NET][0]->schedule_imm(this);
+ eventProcessor.eventthread[ET_NET][0]->schedule_imm(this); // This can not use ET_TASK.
return EVENT_CONT;
}
@@ -181,7 +182,7 @@ struct ShowNet: public ShowCont
{
CHECK_SHOW(begin("Net Threads"));
SET_HANDLER(&ShowNet::showSingleThread);
- eventProcessor.eventthread[ET_NET][0]->schedule_imm(this);
+ eventProcessor.eventthread[ET_NET][0]->schedule_imm(this); // This can not use ET_TASK
return EVENT_CONT;
}
int showSingleConnection(int event, Event * e)
@@ -209,6 +210,7 @@ register_ShowNet(Continuation * c, HTTPH
ShowNet *s = NEW(new ShowNet(c, h));
int path_len;
const char *path = h->url_get()->path_get(&path_len);
+
SET_CONTINUATION_HANDLER(s, &ShowNet::showMain);
if (STREQ_PREFIX(path, path_len, "connections")) {
SET_CONTINUATION_HANDLER(s, &ShowNet::showConnections);
@@ -235,7 +237,7 @@ register_ShowNet(Continuation * c, HTTPH
s->port = atoi(gn + 1);
SET_CONTINUATION_HANDLER(s, &ShowNet::showConnections);
}
- eventProcessor.schedule_imm(s, ET_NET);
+ eventProcessor.schedule_imm(s, ET_TASK);
return &s->action;
}
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1078174&r1=1078173&r2=1078174&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Fri Mar 4 22:17:49 2011
@@ -1341,7 +1341,7 @@ ConfigUpdateCbTable::invoke(const char *
void
ConfigUpdateCbTable::invoke(INKContInternal *contp)
{
- eventProcessor.schedule_imm(NEW(new ConfigUpdateCallback(contp)), ET_NET);
+ eventProcessor.schedule_imm(NEW(new ConfigUpdateCallback(contp)), ET_TASK);
}
////////////////////////////////////////////////////////////////////
Modified: trafficserver/traffic/trunk/proxy/InkAPIInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPIInternal.h?rev=1078174&r1=1078173&r2=1078174&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPIInternal.h (original)
+++ trafficserver/traffic/trunk/proxy/InkAPIInternal.h Fri Mar 4 22:17:49 2011
@@ -35,6 +35,7 @@
#include "List.h"
#include "ProxyConfig.h"
#include "P_Cache.h"
+#include "I_Tasks.h"
/* ****** Cache Structure ********* */
@@ -161,7 +162,7 @@ class ConfigUpdateCallback:public Contin
{
public:
ConfigUpdateCallback(INKContInternal * contp)
- :Continuation(contp->mutex), m_cont(contp)
+ : Continuation(contp->mutex), m_cont(contp)
{
SET_HANDLER(&ConfigUpdateCallback::event_handler);
}
@@ -171,7 +172,7 @@ public:
if (m_cont->mutex != NULL) {
MUTEX_TRY_LOCK(trylock, m_cont->mutex, this_ethread());
if (!trylock) {
- eventProcessor.schedule_in(this, HRTIME_MSECONDS(10), ET_NET);
+ eventProcessor.schedule_in(this, HRTIME_MSECONDS(10), ET_TASK);
} else {
m_cont->handleEvent(TS_EVENT_MGMT_UPDATE, NULL);
delete this;
@@ -185,7 +186,7 @@ public:
}
private:
- INKContInternal * m_cont;
+ INKContInternal *m_cont;
};
class ConfigUpdateCbTable