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 2010/08/04 01:21:50 UTC
svn commit: r982070 - in /trafficserver/traffic/trunk: iocore/dns/
iocore/eventsystem/ iocore/hostdb/ iocore/net/ libinktomi++/
Author: zwoop
Date: Tue Aug 3 23:21:49 2010
New Revision: 982070
URL: http://svn.apache.org/viewvc?rev=982070&view=rev
Log:
TS-400 Checkpoint 4 in cleanup.
This is 'stable', and fixes problem from last night.
Modified:
trafficserver/traffic/trunk/iocore/dns/DNS.cc
trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h
trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc
trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
trafficserver/traffic/trunk/iocore/net/Socks.cc
trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
trafficserver/traffic/trunk/libinktomi++/mkdfa.c
Modified: trafficserver/traffic/trunk/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNS.cc?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNS.cc Tue Aug 3 23:21:49 2010
@@ -381,6 +381,7 @@ DNSHandler::open_con(unsigned int aip, i
int
DNSHandler::startEvent(int event, Event * e)
{
+ NOWARN_UNUSED(event);
//
// If this is for the default server, get it
//
@@ -439,6 +440,7 @@ DNSHandler::startEvent(int event, Event
int
DNSHandler::startEvent_sdns(int event, Event * e)
{
+ NOWARN_UNUSED(event);
//
// If this is for the default server, get it
//
@@ -654,6 +656,7 @@ good_rcode(char *buf)
void
DNSHandler::recv_dns(int event, Event * e)
{
+ NOWARN_UNUSED(event);
NetHandler *nh = get_NetHandler(e->ethread); //added by YTS Team, yamsat
DNSConnection *dnsc = NULL; //added by YTS Team, yamsat
@@ -1131,6 +1134,7 @@ Lretry:
int
DNSEntry::post(DNSHandler * h, HostEnt * ent, bool freeable)
{
+ NOWARN_UNUSED(freeable);
if (timeout) {
timeout->cancel(this);
timeout = NULL;
@@ -1168,6 +1172,8 @@ DNSEntry::post(DNSHandler * h, HostEnt *
int
DNSEntry::postEvent(int event, Event * e)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(e);
if (!action.cancelled) {
Debug("dns", "called back continuation for %s", qname);
action.continuation->handleEvent(DNS_EVENT_LOOKUP, result_ent);
@@ -1563,7 +1569,7 @@ ink_dns_init(ModuleVersion v)
struct DNSRegressionContinuation;
typedef int (DNSRegressionContinuation::*DNSRegContHandler) (int, void *);
-struct DNSRegressionContinuation:Continuation
+struct DNSRegressionContinuation: public Continuation
{
int hosts;
const char **hostnames;
Modified: trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/I_DNSProcessor.h Tue Aug 3 23:21:49 2010
@@ -71,7 +71,7 @@ const EventType ET_DNS = ET_CALL;
struct DNSHandler;
-struct DNSProcessor:Processor
+struct DNSProcessor: public Processor
{
//
// Public Interface
Modified: trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/dns/P_DNSProcessor.h Tue Aug 3 23:21:49 2010
@@ -148,7 +148,7 @@ extern RecRawStatBlock *dns_rsb;
information about the request and its status.
*/
-struct DNSEntry:Continuation
+struct DNSEntry: public Continuation
{
int id[MAX_DNS_RETRIES];
int qtype;
@@ -223,7 +223,7 @@ struct DNSEntry;
UDP port.
*/
-struct DNSHandler:Continuation
+struct DNSHandler: public Continuation
{
unsigned int ip;
int port;
Modified: trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/UnixEThread.cc Tue Aug 3 23:21:49 2010
@@ -29,7 +29,9 @@
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
#include "P_EventSystem.h"
-extern "C" int eventfd(unsigned int initval, int flags);
+#if ATS_HAS_EVENTFD
+#include <sys/eventfd.h>
+#endif
struct AIOCallback;
Modified: trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h Tue Aug 3 23:21:49 2010
@@ -413,7 +413,7 @@ typedef void (Continuation::*process_srv
/** The Host Databse access interface. */
-struct HostDBProcessor:Processor
+struct HostDBProcessor: public Processor
{
// Public Interface
Modified: trafficserver/traffic/trunk/iocore/net/Socks.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Socks.cc?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Socks.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/Socks.cc Tue Aug 3 23:21:49 2010
@@ -231,7 +231,6 @@ SocksEntry::mainEvent(int event, void *d
case NET_EVENT_OPEN:
buf->reset();
unsigned short ts;
- unsigned long tl;
p = (unsigned char *) buf->start();
ink_debug_assert(netVConnection);
@@ -244,7 +243,6 @@ SocksEntry::mainEvent(int event, void *d
p[n_bytes++] = version;
p[n_bytes++] = (socks_cmd == NORMAL_SOCKS) ? SOCKS_CONNECT : socks_cmd;
ts = (unsigned short) htons(port);
- tl = (unsigned long) ip;
if (version == SOCKS5_VERSION) {
p[n_bytes++] = 0; //Reserved
Modified: trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Tue Aug 3 23:21:49 2010
@@ -325,7 +325,6 @@ UDPReadContinuation::readPollEvent(int e
{
(void) event_;
(void) e;
- int res;
//PollCont *pc = get_PollCont(e->ethread);
Continuation *c;
@@ -341,7 +340,8 @@ UDPReadContinuation::readPollEvent(int e
elapsed_time += -period;
if (elapsed_time >= timeout_interval) {
c = completionUtil::getContinuation(event);
- res = c->handleEvent(NET_EVENT_DATAGRAM_READ_ERROR, event);
+ // TODO: Should we deal with the return code?
+ c->handleEvent(NET_EVENT_DATAGRAM_READ_ERROR, event);
e->cancel();
free();
// delete this;
@@ -364,7 +364,8 @@ UDPReadContinuation::readPollEvent(int e
*fromaddrlen = tmp_fromlen;
completionUtil::setInfo(event, fd, readbuf, rlen, errno);
readbuf->fill(rlen);
- res = c->handleEvent(NET_EVENT_DATAGRAM_READ_COMPLETE, event);
+ // TODO: Should we deal with the return code?
+ c->handleEvent(NET_EVENT_DATAGRAM_READ_COMPLETE, event);
e->cancel();
free();
// delete this;
@@ -374,7 +375,8 @@ UDPReadContinuation::readPollEvent(int e
*fromaddrlen = tmp_fromlen;
completionUtil::setInfo(event, fd, (IOBufferBlock *) readbuf, rlen, errno);
c = completionUtil::getContinuation(event);
- res = c->handleEvent(NET_EVENT_DATAGRAM_READ_ERROR, event);
+ // TODO: Should we deal with the return code?
+ c->handleEvent(NET_EVENT_DATAGRAM_READ_ERROR, event);
e->cancel();
free();
//delete this;
Modified: trafficserver/traffic/trunk/libinktomi++/mkdfa.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/mkdfa.c?rev=982070&r1=982069&r2=982070&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/mkdfa.c (original)
+++ trafficserver/traffic/trunk/libinktomi++/mkdfa.c Tue Aug 3 23:21:49 2010
@@ -62,22 +62,6 @@ struct _transition_t
};
-// TODO: Are these forward declarations really necessary?
-state_t *mkstate(void);
-transition_t *mktransition(void);
-void prstate(state_t * state);
-void add_states(state_t * state, info_t * info, int pos);
-void prtable(const char *type, const char *name, int *table, int size);
-int mkmap(state_t * state);
-void mkaccept(state_t * state, const char *defvalue);
-void mkprefix(state_t * state, char *prefix, int length);
-int checkbase(state_t * state, int base);
-void mktranstables(state_t * state);
-void mktables(state_t * state, const char *defvalue, int useprefix);
-const char *rundfa(const char *buf, int length);
-void mkdfa(info_t * infos, int ninfos, int useprefix, int debug);
-
-
info_t fields[] = {
{"Accept", "MIME_FIELD_ACCEPT", 0},
{"Accept-Charset", "MIME_FIELD_ACCEPT_CHARSET", 0},