trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject svn commit: r941972 [1/3] - in /trafficserver/traffic/trunk: iocore/block-cache/ iocore/cache/ iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/fastio/include/ iocore/fastio/inkfio/ iocore/fastio/inkudp/ iocore/fastio/libfastIO/ iocore/fastio/too...
Date Thu, 06 May 2010 23:40:43 GMT
Author: bcall
Date: Thu May  6 23:40:41 2010
New Revision: 941972

URL: http://svn.apache.org/viewvc?rev=941972&view=rev
Log:
TS-331 Removed old #if 0 code and only include #if 1 code

Modified:
    trafficserver/traffic/trunk/iocore/block-cache/alloc2.cc
    trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
    trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h
    trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
    trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc
    trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc
    trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h
    trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h
    trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
    trafficserver/traffic/trunk/iocore/eventsystem/I_EventProcessor.h
    trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h
    trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h
    trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h
    trafficserver/traffic/trunk/iocore/eventsystem/UnixEventProcessor.cc
    trafficserver/traffic/trunk/iocore/fastio/include/fastio.h
    trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev.c
    trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev_sol.c
    trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_ioctl.c
    trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_request.c
    trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_vsession.c
    trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_recv.c
    trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched.c
    trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched_no_qos.c
    trafficserver/traffic/trunk/iocore/fastio/inkudp/solaris.c
    trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.c
    trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h
    trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/requtil.c
    trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/udpbmark.c
    trafficserver/traffic/trunk/iocore/hostdb/P_MultiCache.h
    trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c
    trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h
    trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
    trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc
    trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
    trafficserver/traffic/trunk/libinktomi++/ink_align.h
    trafficserver/traffic/trunk/libinktomi++/ink_string++.cc
    trafficserver/traffic/trunk/libinktomi++/test_atomic.cc
    trafficserver/traffic/trunk/libinktomi++/test_memchr.cc
    trafficserver/traffic/trunk/libinktomi++/test_strings.cc
    trafficserver/traffic/trunk/proxy/DiagsConfig.cc
    trafficserver/traffic/trunk/proxy/EventName.cc
    trafficserver/traffic/trunk/proxy/ICP.cc
    trafficserver/traffic/trunk/proxy/ICP.h
    trafficserver/traffic/trunk/proxy/InkAPI.cc
    trafficserver/traffic/trunk/proxy/InkAPITest.cc
    trafficserver/traffic/trunk/proxy/Prefetch.cc
    trafficserver/traffic/trunk/proxy/SimpleHttp.cc
    trafficserver/traffic/trunk/proxy/Socks.h
    trafficserver/traffic/trunk/proxy/StateEventLogger.cc
    trafficserver/traffic/trunk/proxy/TestPreProc.cc
    trafficserver/traffic/trunk/proxy/TestProxy.cc
    trafficserver/traffic/trunk/proxy/TestRegex.cc
    trafficserver/traffic/trunk/proxy/Update.cc
    trafficserver/traffic/trunk/proxy/api/include/ts_private_frozen.h
    trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc
    trafficserver/traffic/trunk/proxy/dns_cache/DNS_cache.cc
    trafficserver/traffic/trunk/proxy/hdrs/HTTP.cc
    trafficserver/traffic/trunk/proxy/hdrs/URL.cc
    trafficserver/traffic/trunk/proxy/hdrs/test_header.cc
    trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
    trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
    trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
    trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
    trafficserver/traffic/trunk/proxy/http2/test_socket_close.cc
    trafficserver/traffic/trunk/proxy/logging/Log.cc
    trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
    trafficserver/traffic/trunk/proxy/logging/LogFile.cc
    trafficserver/traffic/trunk/proxy/logging/LogFile.h
    trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
    trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
    trafficserver/traffic/trunk/proxy/mgmt2/MgmtDBM.cc
    trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.h
    trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc
    trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
    trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIlineBuffer.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateUpgradeCmd.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
    trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
    trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc
    trafficserver/traffic/trunk/test/SDKtest/client/Config.cc
    trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h
    trafficserver/traffic/trunk/test/SDKtest/client/Hist.cc
    trafficserver/traffic/trunk/test/SDKtest/client/Main.cc
    trafficserver/traffic/trunk/test/SDKtest/client/api/SimBasicAuth-1.c
    trafficserver/traffic/trunk/test/plugin/INKContinuations/ServerSM.cc
    trafficserver/traffic/trunk/test/plugin/INKFopen/INKFopen.c
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpHook.c
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c
    trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKProto.c
    trafficserver/traffic/trunk/test/plugin/check-http/check-http-0.c
    trafficserver/traffic/trunk/test/plugin/check-mime/check-mime-0.c

Modified: trafficserver/traffic/trunk/iocore/block-cache/alloc2.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/block-cache/alloc2.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/block-cache/alloc2.cc (original)
+++ trafficserver/traffic/trunk/iocore/block-cache/alloc2.cc Thu May  6 23:40:41 2010
@@ -449,14 +449,6 @@ update(unsigned int block, unsigned int 
           compressedmap[i].count--;
           assert(compressedmap[i + 1].state == newstate);
           compressedmap[i + 1].count++;
-#if 0
-          memmove(&compressedmap[i + 2], &compressedmap[i + 1], sizeof(compressedmap) * (cmap_max - (i + 1)));
-          compressedmap[i].count = untilblock - 1;
-          compressedmap[i + 1].state = newstate;
-          compressedmap[i + 1].count = 0;
-          assert(compressedmap[i].state != newstate);
-          cmap_max++;
-#endif
           assert(cmap_max > 0);
           if (rlecheck)
             check_rlestate();

Modified: trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheDir.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheDir.cc Thu May  6 23:40:41 2010
@@ -225,35 +225,6 @@ dir_init_segment(int s, Part *d)
 
 // break the infinite loop in directory entries
 // Note : abuse of the token bit in dir entries
-#if 0
-int
-dir_bucket_loop_fix(Dir *start_dir, int s, Part *d)
-{
-  int ret = 0;
-  if (start_dir == NULL)
-    return 0;
-
-  Dir *p1 = start_dir;
-  Dir *p2 = start_dir;
-  Dir *seg = dir_segment(s, d);
-  while (p2) {
-    dir_set_token(p1, 1);
-    p2 = next_dir(p2, seg);
-    if (p2 && dir_token(p2)) {
-      // Loop exists
-      Warning("cache directory loop broken");
-      ink_stack_trace_dump();
-      dir_set_next(p1, 0);
-      ret = 1;
-      break;
-    }
-    p1 = p2;
-  }
-  for (Dir *p3 = start_dir; p3; p3 = next_dir(p3, seg))
-    dir_set_token(p3, 0);
-  return ret;
-}
-#else
 int
 dir_bucket_loop_fix(Dir *start_dir, int s, Part *d)
 {
@@ -264,7 +235,6 @@ dir_bucket_loop_fix(Dir *start_dir, int 
   }
   return 0;
 }
-#endif
 
 int
 dir_freelist_length(Part *d, int s)
@@ -814,16 +784,6 @@ dir_lookaside_fixup(CacheKey *key, Part 
             key->word(0), key->word(1), dir_offset(&b->new_dir), dir_phase(&b->new_dir), res);
       d->ram_cache->fixup(key, 0, dir_offset(&b->dir), 0, dir_offset(&b->new_dir));
       d->lookaside[i].remove(b);
-#if 0
-      // we need to do this because in case of a small cache, the scan
-      // might have occured before we inserted this directory entry (if we 
-      // wrapped around fast enough)
-      ink_off_t part_end_offset = offset_to_part_offset(d, d->len + d->skip);
-      ink_off_t part_write_offset = offset_to_part_offset(d, d->header->write_pos);
-      if ((dir_offset(&b->new_dir) + part_end_offset - part_write_offset)
-          % part_end_offset <= offset_to_part_offset(d, EVAC_SIZE + (d->len / PIN_SCAN_EVERY)))
-        d->force_evacuate_head(&b->new_dir, dir_pinned(&b->new_dir));
-#endif
       free_EvacuationBlock(b, d->mutex->thread_holding);
       return res;
     }

Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h Thu May  6 23:40:41 2010
@@ -124,39 +124,16 @@ typedef inku32 DirInfo;
 // on the processor.
 struct Dir
 {
-#if 0
-  // bits are numbered from lowest in u16 to highest
-  // always index as u16 to avoid byte order issues
-  unsigned int offset:24;       // (0,1:0-7) 16M * 512 = 8GB
-  unsigned int big:2;           // (1:8-9) 512 << (3 * big)
-  unsigned int size:6;          // (1:10-15) 6**2 = 64, 64*512 = 32768 .. 64*256=16MB
-  unsigned int tag:12;          // (2:0-11) 2048 / 8 entries/bucket = .4%
-  unsigned int phase:1;         // (2:12)
-  unsigned int head:1;          // (2:13) first segment in a document
-  unsigned int pinned:1;        // (2:14)
-  unsigned int token:1;         // (2:15)
-  unsigned int next:16;         // (3)
-  inku16 offset_high;           // 8GB * 65k = 0.5PB (4)
-#else
   inku16 w[5];
   Dir() { dir_clear(this); }
-#endif
 };
 
 // INTERNAL: do not access these members directly, use the
 // accessors below (e.g. dir_offset, dir_set_offset)
 struct FreeDir
 {
-#if 0
-  unsigned int offset:24;       // 0: empty
-  unsigned int reserved:8;
-  unsigned int prev:16;         // (2)
-  unsigned int next:16;         // (3)
-  inku16 offset_high;           // 0: empty
-#else
   inku16 w[5];
   FreeDir() { dir_clear(this); }
-#endif
 };
 
 #define dir_bit(_e, _w, _b) ((inku32)(((_e)->w[_w] >> (_b)) & 1))

Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc Thu May  6 23:40:41 2010
@@ -1658,13 +1658,6 @@ CacheContinuation::replyOpEvent(int even
   ink_release_assert(expect_cache_callback);
   expect_cache_callback = false;        // make sure we are called back exactly once
 
-#if 0
-  ink_hrtime cur_time = ink_get_hrtime();
-  ink_hrtime delta = cur_time - start_time;
-  if (delta >= HRTIME_SECONDS(1)) {
-    Note("Cache callback time > 1 sec, t=%0.2f secs seqno=%d", ink_hrtime_to_msec(delta) / 1000.0, seq_number);
-  }
-#endif
 
   result = event;
   bool open = event_is_open(event);
@@ -2376,12 +2369,6 @@ retry:
 
   if (result == CACHE_EVENT_LOOKUP_FAILED) {
 
-#if 0
-    // attempt to initiate a remote probe
-
-    if (do_remote_lookup(action.continuation, NULL, this))
-      return EVENT_DONE;
-#endif
 
     // check for local probes
 
@@ -2498,31 +2485,9 @@ CacheContinuation::probeLookupEvent(int 
 int
 CacheContinuation::lookupEvent(int event, void *d)
 {
-#if 1
   ink_release_assert(!"Invalid call CacheContinuation::lookupEvent");
   return EVENT_DONE;
 
-#else
-  ink_assert(magicno == (int) MagicNo);
-  // If the lookup was a failure
-  if (event == CACHE_EVENT_LOOKUP_FAILED) {
-
-    if (local_lookup_only) {
-      callback_user(CACHE_EVENT_LOOKUP_FAILED, 0);
-      return EVENT_DONE;
-    }
-    // Try a remote lookup
-    if (!do_remote_lookup(action.continuation, NULL, this)) {
-
-      // If that is not possible, signal failure to the user
-      callback_user(CACHE_EVENT_LOOKUP_FAILED, 0);
-    }
-  } else {
-    // If we succeeded, signal the user
-    callback_user(CACHE_EVENT_LOOKUP, 0);
-  }
-  return EVENT_DONE;
-#endif
 }
 
 
@@ -3033,13 +2998,6 @@ CacheContinuation::forwardEvent(int even
     cache_read = true;
     cluster_vc = c;
     break;
-#if 0
-  case CACHE_EVENT_OPEN_READ_VIO:
-    cache_read = true;
-    vio = (VIO *) c;
-    cluster_vc = vio->vc_server;
-    break;
-#endif
   }
   SET_HANDLER((CacheContHandler) & CacheContinuation::forwardWaitEvent);
   return ret;
@@ -3071,12 +3029,6 @@ CacheContinuation::forwardWaitEvent(int 
     vc = c;
     break;
 
-#if 0
-  case CACHE_EVENT_OPEN_READ_VIO:
-    vio = (VIO *) c;
-    vc = vio->vc_server;
-    break;
-#endif
   }
   VConnection *read_vc = (cache_read ? cluster_vc : vc);
   VConnection *write_vc = (!cache_read ? cluster_vc : vc);

Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterLib.cc Thu May  6 23:40:41 2010
@@ -379,18 +379,6 @@ partial_writev(int fd, IOVec * iov, int 
   int rnd = seq;
   int sum = 0;
   int i = 0;
-#if 0
-  int element = rand_r((unsigned int *) &rnd);
-  element = element % n_iov;
-  fprintf(stderr, "partial_writev %d", element,);
-  if ((seq % 16) == 7) {
-    for (i = 0; i < element - 1; i++) {
-      int res = socketManager.write(fd, iov[i].iov_base, iov[i].iov_len);
-      if (res < 0)
-        return res;
-      sum += res;
-    }
-#endif
     for (i = 0; i < n_iov; i++) {
       int l = iov[i].iov_len;
       int r = rand_r((unsigned int *) &rnd);
@@ -412,10 +400,6 @@ partial_writev(int fd, IOVec * iov, int 
       }
     }
     return sum;
-#if 0
-  } else
-    return socketManager.write_vector(fd, iov, n_iov);
-#endif
 }
 #endif // TEST_PARTIAL_WRITES
 

Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterProcessor.cc Thu May  6 23:40:41 2010
@@ -365,67 +365,6 @@ bool ClusterProcessor::disable_remote_cl
 ////////////////////////////////////////////////////////////////////////////
 // Simplify debug access to stats
 ////////////////////////////////////////////////////////////////////////////
-#if 0
-#define GS RecRawStat// FIXME: GS conflicts with define in /usr/include/sys/regset.h
-GS *p_CLUSTER_CONNECTIONS_OPEN_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CONNECTIONS_OPEN_STAT);
-GS *p_CLUSTER_CONNECTIONS_OPENNED_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CONNECTIONS_OPENNED_STAT);
-GS *p_CLUSTER_CON_TOTAL_TIME_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CON_TOTAL_TIME_STAT);
-GS *p_CLUSTER_CTRL_MSGS_SENT_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CTRL_MSGS_SENT_STAT);
-GS *p_CLUSTER_SLOW_CTRL_MSGS_SENT_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_SLOW_CTRL_MSGS_SENT_STAT);
-GS *p_CLUSTER_CTRL_MSGS_RECVD_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CTRL_MSGS_RECVD_STAT);
-GS *p_CLUSTER_SLOW_CTRL_MSGS_RECVD_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_SLOW_CTRL_MSGS_RECVD_STAT);
-GS *p_CLUSTER_CTRL_MSGS_SEND_TIME_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CTRL_MSGS_SEND_TIME_STAT);
-GS *p_CLUSTER_CTRL_MSGS_RECV_TIME_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CTRL_MSGS_RECV_TIME_STAT);
-GS *p_CLUSTER_READ_BYTES_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_READ_BYTES_STAT);
-GS *p_CLUSTER_WRITE_BYTES_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_WRITE_BYTES_STAT);
-GS *p_CLUSTER_OP_DELAYED_FOR_LOCK_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_OP_DELAYED_FOR_LOCK_STAT);
-GS *p_CLUSTER_CONNECTIONS_LOCKED_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CONNECTIONS_LOCKED_STAT);
-GS *p_CLUSTER_CONNECTIONS_BUMPED_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CONNECTIONS_BUMPED_STAT);
-GS *p_CLUSTER_NODES_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_NODES_STAT);
-GS *p_CLUSTER_NET_BACKUP_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_NET_BACKUP_STAT);
-GS *p_machines_allocated_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_MACHINES_ALLOCATED_STAT);
-GS *p_machines_freed_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_MACHINES_FREED_STAT);
-GS *p_configuration_changes_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CONFIGURATION_CHANGES_STAT);
-GS *p_delayed_reads_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_DELAYED_READS_STAT);
-GS *p_byte_bank_used_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_BYTE_BANK_USED_STAT);
-GS *p_alloc_data_news_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_ALLOC_DATA_NEWS_STAT);
-GS *p_write_bb_mallocs_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_WRITE_BB_MALLOCS_STAT);
-GS *p_partial_reads_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_PARTIAL_READS_STAT);
-GS *p_partial_writes_stat = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_PARTIAL_WRITES_STAT);
-GS *p_cache_outstanding = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CACHE_OUTSTANDING_STAT);
-GS *p_remote_op_timeouts = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_REMOTE_OP_TIMEOUTS_STAT);
-GS *p_remote_op_reply_timeouts = RecGetGlobalRawStatPtr(cluster_rsb,
-                                                      CLUSTER_REMOTE_OP_REPLY_TIMEOUTS_STAT);
-GS *p_chan_inuse = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CHAN_INUSE_STAT);
-GS *p_CLUSTER_OPEN_DELAYS_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_OPEN_DELAYS_STAT);
-GS *p_CLUSTER_OPEN_DELAY_TIME_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_OPEN_DELAY_TIME_STAT);
-GS *p_CLUSTER_CACHE_CALLBACKS_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CACHE_CALLBACKS_STAT);
-GS *p_CLUSTER_CACHE_CALLBACK_TIME_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_CACHE_CALLBACK_TIME_STAT);
-GS *p_cluster_thread_steal_expires = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_THREAD_STEAL_EXPIRES_STAT);
-GS *p_CLUSTER_RDMSG_ASSEMBLE_TIME_STAT = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_RDMSG_ASSEMBLE_TIME_STAT);
-GS *p_cluster_ping_time = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_PING_TIME_STAT);
-GS *p_cluster_setdata_no_clustervc = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_SETDATA_NO_CLUSTERVC_STAT);
-GS *p_cluster_setdata_no_tunnel = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_SETDATA_NO_TUNNEL_STAT);
-GS *p_cluster_setdata_no_cachevc = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_SETDATA_NO_CACHEVC_STAT);
-GS *p_cluster_setdata_no_cluster = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_SETDATA_NO_CLUSTER_STAT);
-GS *p_cluster_vc_write_stall = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_VC_WRITE_STALL_STAT);
-GS *p_cluster_no_remote_space = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_NO_REMOTE_SPACE_STAT);
-GS *p_cluster_level1_bank = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_LEVEL1_BANK_STAT);
-GS *p_cluster_multilevel_bank = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_MULTILEVEL_BANK_STAT);
-GS *p_cluster_vc_cache_insert_lock_misses = RecGetGlobalRawStatPtr(cluster_rsb,
-                                                                 CLUSTER_VC_CACHE_INSERT_LOCK_MISSES_STAT);
-GS *p_cluster_vc_cache_inserts = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_VC_CACHE_INSERTS_STAT);
-GS *p_cluster_vc_cache_lookup_lock_misses = RecGetGlobalRawStatPtr(cluster_rsb,
-                                                                 CLUSTER_VC_CACHE_LOOKUP_LOCK_MISSES_STAT);
-GS *p_cluster_vc_cache_lookup_hits = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_VC_CACHE_LOOKUP_HITS_STAT);
-GS *p_cluster_vc_cache_lookup_misses = RecGetGlobalRawStatPtr(cluster_rsb,
-                                                            CLUSTER_VC_CACHE_LOOKUP_MISSES_STAT);
-GS *p_cluster_vc_cache_scans = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_VC_CACHE_SCANS_STAT);
-GS *p_cluster_vc_cache_scan_lock_misses = RecGetGlobalRawStatPtr(cluster_rsb,
-                                                               CLUSTER_VC_CACHE_SCAN_LOCK_MISSES_STAT);
-GS *p_cluster_vc_cache_purges = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_VC_CACHE_PURGES_STAT);
-GS *p_cluster_write_lock_misses = RecGetGlobalRawStatPtr(cluster_rsb, CLUSTER_WRITE_LOCK_MISSES_STAT);
-#endif
 ////////////////////////////////////////////////////////////////////////////
 
 GlobalClusterPeriodicEvent *

Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterCacheInternal.h Thu May  6 23:40:41 2010
@@ -193,12 +193,6 @@ struct CacheContinuation:public Continua
   int tunnelClosedEvent(int event, void *);
   int remove_and_delete(int, Event *);
 
-#if 0
-  int forwardEvent(int event, VConnection * vc);
-  int forwardWaitEvent(int event, VConnection * vc);
-  int tunnelEvent(int event, VConnection * e);
-  int remoteConnectEvent(int event, VConnection * vc);
-#endif
 
   inline void setMsgBufferLen(int l, IOBufferData * b = 0) {
     ink_assert(rw_buf_msg == 0);

Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterInternal.h Thu May  6 23:40:41 2010
@@ -38,13 +38,6 @@
 #define CLUSTER_TOMCAT			1
 #define CLUSTER_STATS			1
 
-#if 0                           // Debug/Test options
-#define CLUSTER_MESSAGE_CKSUM		1
-#define MSG_TRACE			1
-
-// Verify data using Peter's client/server
-#define VERIFY_PETERS_DATA             	1
-#endif
 
 #define ALIGN_DOUBLE(_p)   ((((unsigned long) (_p)) + 7) & ~7)
 #define ALLOCA_DOUBLE(_sz) ALIGN_DOUBLE(alloca((_sz) + 8))

Modified: trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc Thu May  6 23:40:41 2010
@@ -196,13 +196,6 @@ SplitDNSConfig::startup()
   dnsHandler_mutex = new_ProxyMutex();
   reconfigure();
 
-#if 0
-  IOCORE_RegisterConfigUpdateFunc("proxy.config.dns.splitdns.filename", splitDNS_CB, NULL);
-
-  IOCORE_RegisterConfigUpdateFunc("proxy.config.dns.splitDNS.enabled", splitDNS_CB, NULL);
-
-  IOCORE_RegisterConfigUpdateFunc("proxy.config.dns.splitdns.def_domain", splitDNS_CB, NULL);
-#endif
 }
 
 

Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_EventProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_EventProcessor.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_EventProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_EventProcessor.h Thu May  6 23:40:41 2010
@@ -116,12 +116,6 @@ public:
   */
   EventType spawn_event_threads(int n_threads);
 
-#if 0  
-  /**
-    Unused
-  */
-  Event *schedule_spawn(Continuation *cont);
-#endif
 
   /**
     Schedules the continuation on a specific EThread to receive an event

Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_PriorityEventQueue.h Thu May  6 23:40:41 2010
@@ -46,10 +46,6 @@ struct PriorityEventQueue
   {
     ink_hrtime t = e->timeout_at - now;
     int i = 0;
-#if 0
-    while (t > PQ_BUCKET_TIME(i) && i < N_PQ_LIST - 1)
-        i++;
-#else
     // equivalent but faster
     if (t <= PQ_BUCKET_TIME(3))
     {
@@ -90,7 +86,6 @@ struct PriorityEventQueue
         }
       }
     }
-#endif
     e->in_the_priority_queue = 1;
     e->in_heap = i;
     after[i].enqueue(e);

Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_IOBuffer.h Thu May  6 23:40:41 2010
@@ -148,14 +148,6 @@ iobuffer_mem_inc(const char *_loc, ink64
   ink64 r = ink_atomic_increment64(&res->value,
                                    index_to_buffer_size(_size_index));
   NOWARN_UNUSED(r);
-#if 0
-  printf("========================================================\n");
-  printf("iobuffer_mem_inc: %s [%d], (resource: %p, value = %d)\n", _loc, _size_index, res,
-         r + index_to_buffer_size(_size_index));
-  printf("========================================================\n");
-  ink_stack_trace_dump();
-  printf("========================================================\n\n");
-#endif
   ink_debug_assert(r >= 0);
 }
 
@@ -174,13 +166,6 @@ iobuffer_mem_dec(const char *_loc, ink64
   ink64 r = ink_atomic_increment64(&res->value,
                                    -index_to_buffer_size(_size_index));
   NOWARN_UNUSED(r);
-#if 0
-  printf("========================================================\n");
-  printf("iobuffer_mem_dec: %s [-%d], (resource %p, value = %d)\n", _loc, _size_index, res,
-         r - index_to_buffer_size(_size_index));
-  printf("========================================================\n");
-  ink_stack_trace_dump();
-#endif
   ink_debug_assert(r >= index_to_buffer_size(_size_index));
 }
 #endif

Modified: trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/P_UnixEventProcessor.h Thu May  6 23:40:41 2010
@@ -81,15 +81,6 @@ EventProcessor::schedule(Event * e, Even
   return e;
 }
 
-#if 0
-/* getting rid of this, i dont see anybody using this */
-TS_INLINE Event *
-EventProcessor::schedule_spawn(Continuation * cont)
-{
-  Event *e = eventAllocator.alloc();
-  return schedule(e->init(cont, 0, 0), ET_SPAWN);
-}
-#endif
 
 TS_INLINE Event *
 EventProcessor::schedule_imm_signal(Continuation * cont, EventType et, int callback_event, void *cookie)

Modified: trafficserver/traffic/trunk/iocore/eventsystem/UnixEventProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/UnixEventProcessor.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/UnixEventProcessor.cc (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/UnixEventProcessor.cc Thu May  6 23:40:41 2010
@@ -60,9 +60,7 @@ EventProcessor::spawn_event_threads(int 
 }
 
 
-#if 1
 #define INK_NO_CLUSTER
-#endif
 
 struct EventProcessor eventProcessor;
 

Modified: trafficserver/traffic/trunk/iocore/fastio/include/fastio.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/include/fastio.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/include/fastio.h (original)
+++ trafficserver/traffic/trunk/iocore/fastio/include/fastio.h Thu May  6 23:40:41 2010
@@ -37,12 +37,6 @@
 
 #include "IncludeFiles.h"
 
-#if 0
-#ifdef	__cplusplus
-extern "C"
-{
-#endif
-#endif
 
   struct fastIO_state;
   struct fastIO_session;
@@ -201,11 +195,6 @@ extern "C"
 #define INKUDP_SENDTO_RETRY   0x1
 
 
-#if 0
-#ifdef	__cplusplus
-}
-#endif
-#endif
 
 
 #endif

Modified: trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev.c Thu May  6 23:40:41 2010
@@ -542,9 +542,6 @@ fio_register_queue(queue_t * q)
     if (!g_fio_instance->session[i]) {
       g_fio_instance->session[i] = q;
       g_fio_instance->session_count++;
-#if 0
-      cmn_err(CE_CONT, "Registered queue 0x%x as id#%d.\n", q, i);
-#endif
 
       /* update statistics */
       g_fio_instance->stats.sessions_open = g_fio_instance->session_count;
@@ -592,9 +589,7 @@ fio_unregister_queue(int qid)
   g_fio_instance->stats.sessions_open = g_fio_instance->session_count;
 
 
-#if 1
   cmn_err(CE_CONT, "fio_unregister queue: %d.\n", qid);
-#endif
 
   return;
 

Modified: trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev_sol.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev_sol.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev_sol.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_dev_sol.c Thu May  6 23:40:41 2010
@@ -540,9 +540,6 @@ fio_register_queue(queue_t * q)
     if (!g_fio_instance->session[i]) {
       g_fio_instance->session[i] = q;
       g_fio_instance->session_count++;
-#if 0
-      cmn_err(CE_CONT, "Registered queue 0x%x as id#%d.\n", q, i);
-#endif
 
       /* update statistics */
       g_fio_instance->stats.sessions_open = g_fio_instance->session_count;
@@ -635,49 +632,6 @@ fio_emergency_unregister_queue(queue_t *
       fio_release_queue(i);
 
       return;
-#if 0
-      /* Go thru and remove all the pending requests for this queue */
-      if (!mutex_owned(&g_fio_instance->reqmx)) {
-        mutex_enter(&g_fio_instance->reqmx);
-        release_reqmx = 1;
-      }
-
-      if (g_fio_instance->pRequests) {
-
-        /* If the request is at the head, it is ok---we are not freeing it
-           here */
-        trav = g_fio_instance->pRequests->next;
-        while (trav != g_fio_instance->pRequests) {
-          if (trav->destQ == removalQ) {
-            while (trav->pktsRemaining > 0) {
-              if (getBlockPtr(g_fio_instance, trav->nextPkt->blockID))
-                /* make sure that we are freeing a valid block */
-                fio_free_cb((char *) &g_fio_instance->free_arg[trav->nextPkt->blockID]);
-              trav->nextPkt++;
-              trav->pktsRemaining--;
-            }
-            /* Remove the request from the pending request list */
-            trav->prev->next = trav->next;
-            trav->next->prev = trav->prev;
-            nextreq = trav->next;
-            freemsg(trav->dst_mblk);
-            trav->dst_mblk = 0;
-
-            /* delete the request itself: remember we copied the request into a
-               kernel block; free the kernel block */
-            kmem_free(trav->req, FASTIO_BLOCK_SIZE);
-
-            /* delete the request structure */
-            kmem_free(trav, sizeof(struct pending_request));
-
-            trav = nextreq;
-          }
-        }
-      }
-
-      if (release_reqmx)
-        mutex_exit(&g_fio_instance->reqmx);
-#endif
       return;
     }
   }

Modified: trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_ioctl.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_ioctl.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_ioctl.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_ioctl.c Thu May  6 23:40:41 2010
@@ -368,9 +368,6 @@ fio_ioctl_init(fio_devstate_t * rsp, int
   /* initialize the vsessions */
   for (i = 0; i < MAX_VSESSION; i++) {
 
-#if 0
-    rsp->vsession[i] = 0;
-#endif
     rsp->vsession_alloc[i] = 0;
 
   }
@@ -576,11 +573,6 @@ fio_ioctl_swap(fio_devstate_t * rsp, int
 
   if (rsp->activefl[rsp->nextflentry] == 0xffffffff && !rsp->signal_user) {
     /* swapping won't help the user.  Signal the user to wake up when it will */
-#if 0
-    rsp->signal_user = 1;
-    rsp->signal_ref = proc_ref();
-
-#endif
   }
 
 
@@ -671,25 +663,6 @@ fio_ioctl_get_stats(fio_devstate_t * rsp
 
 
 
-#if 0
-int
-fio_regsendto(fio_devstate_t * rsp, intptr_t arg)
-{
-
-  struct fastIO_sendto_arg p;
-  int i;
-  int retval;
-
-  ddi_copyin((void *) arg, &p, sizeof(struct fastIO_sendto_arg), 0);
-
-  /*cmn_err(CE_CONT, "fio_regsendto(%d, 0x%x, %d, 0x%x, 0x%x, %d)\n",
-     p.s, p.msg, p.len, p.flags, p.to, p.tolen); */
-  for (i = 0; i < 50; i++)
-    retval = sendto(p.s, p.msg, p.len, p.flags, p.to, p.tolen);
-  /*cmn_err(CE_CONT, "sendto returns %d.\n"); */
-  return 0;
-}
-#endif
 
 
 int

Modified: trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_request.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_request.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_request.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_request.c Thu May  6 23:40:41 2010
@@ -138,7 +138,6 @@ ink_esballoc(char *buf, int buflen, stru
 
 }
 
-#if 1
 
 int
 fio_vsession_send(fio_devstate_t * rsp, struct pending_request *req)
@@ -146,154 +145,6 @@ fio_vsession_send(fio_devstate_t * rsp, 
   return 1;
 }
 
-#else
-
-/*
- *
- * Send the next packet on a virtual session
- *
- *
- */
-int
-fio_vsession_send(fio_devstate_t * rsp, struct pending_request *req)
-{
-  struct ink_redirect_list *trav;
-  mblk_t *msg_dest, *msg_data, *master_data;
-  int first = 1;
-
-
-  cmn_err(CE_CONT, "fio_vsession_send: Sending a packet on vsession %d.\n", req->req->destQ);
-
-  /* req->req->destQ contains the vsession ID */
-
-
-  /*XXX FIXME:  Before checking the validity of the vsession ID,
-   * copy it to kernel memory.  Otherwise user might trash the memory in the meantime 
-   * and trigger a kernel panic
-   */
-
-  /* verify the provided vsession id */
-  if (!((req->req->destQ < MAX_VSESSION) && rsp->vsession_alloc[req->req->destQ] && rsp->vsession[req->req->destQ])) {
-    cmn_err(CE_NOTE, "fio_vsession_send: Invalid vsession id #%d.\n", req->req->destQ);
-    return 0;                   /* dequeue this one-- it's baaaad */
-  }
-
-  trav = rsp->vsession[req->req->destQ];
-
-
-
-  /* allocate a master data block for the packets to be sent to each of the 
-   * destinations 
-   */
-
-
-  master_data = (mblk_t *) esballoc(getBlockPtr(rsp, req->nextPkt->blockID), rsp->blocksize,
-                                    0, &rsp->free_struct[req->nextPkt->blockID]);
-
-  if (!master_data) {
-    cmn_err(CE_WARN, "inkio: esballoc fails.\n");
-    return 0;
-  }
-  master_data->b_datap->db_type = M_DATA;
-  master_data->b_wptr += req->nextPkt->pktsize;
-
-
-
-
-  while (trav && (first || trav != rsp->vsession[req->req->destQ])) {
-
-    first = 0;
-    if (!trav->destSession) {
-
-      cmn_err(CE_WARN, "fio_vsession_send: Zikes! No destination session !\n");
-      trav = trav->next;
-      continue;
-
-    }
-    if (!canputnext(trav->destSession)) {
-      /*cmn_err(CE_CONT, "fio: Zikes!!!  Queue full!\n"); */
-
-      /* well, we can't send */
-      /* it's difficult to schedule a retry for just one multicast 
-       * recepient, so we'll just forget about this guy and continue with the rest 
-       */
-
-
-      /* update statistics */
-      rsp->stats.xmit_failures++;
-      trav = trav->next;
-      continue;
-    }
-
-
-    /* Setup the destination message block 
-     * if it has not been setup already
-     */
-
-    if (!trav->dst_mblk) {
-
-      trav->dst_mblk = (mblk_t *) fio_dstmsg_create(trav->destIP, trav->destPort);
-      if (!trav->dst_mblk) {
-        cmn_err(CE_WARN, "fio: Oops.  Out of memory in fio_dstmsg_create!\n");
-        return 0;               /* failure! */
-      }
-
-
-    }
-
-
-    msg_dest = (mblk_t *) dupb(trav->dst_mblk);
-    if (!msg_dest) {
-      cmn_err(CE_WARN, "fio: Oops.  Out of memory in dupb!\n");
-      freemsg(master_data);
-      return 0;                 /* failure! */
-
-    }
-
-    msg_data = dupb(master_data);
-
-
-
-    if (!msg_data) {
-      cmn_err(CE_WARN, "fio: oops.  Dupb fails!\n");
-      freemsg(master_data);
-      return 0;
-    }
-
-    /* link the two messages together */
-    msg_dest->b_cont = msg_data;
-    msg_data->b_cont = 0;
-
-    /* send the message */
-    if (!trav->destSession) {
-
-      cmn_err(CE_WARN, "fio_vsession_send: (2) ZIKES!  trav->destSession NULL!\n");
-    }
-    if (canputnext((queue_t *) trav->destSession)) {
-      run_queues = 1;
-      putnext((queue_t *) trav->destSession, msg_dest);
-      queuerun();
-
-      /* update statistics */
-      rsp->stats.vsession_pkts_sent++;
-      rsp->stats.vsession_bytes_sent += req->nextPkt->pktsize;
-
-      rsp->stats.pkts_sent++;
-      rsp->stats.bytes_sent += req->nextPkt->pktsize;
-    } else {
-      rsp->stats.xmit_failures++;
-      cmn_err(CE_CONT, "fio: Unexpected transmission failure.\n");
-      return 0;
-    }
-    trav = trav->next;
-  }
-
-  /* dereference count the master instance of the data block */
-  freemsg(master_data);
-
-  return 1;                     /* sucess */
-}
-#endif
 
 /*
  * Process a pending request. 

Modified: trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_vsession.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_vsession.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_vsession.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkfio/fio_vsession.c Thu May  6 23:40:41 2010
@@ -45,7 +45,6 @@
 
 #define inline
 
-#if 1
 int
 fio_add_split_rule(fio_devstate_t * rsp, int id, struct fastIO_split_rule *rule)
 {
@@ -112,278 +111,3 @@ fio_vsession_ioctl(fio_devstate_t * rsp,
   return -1;
 }
 
-#else
-
-/*
- *  Add the specified splitting rule on the indicated vsession
- *
- *  Return 0 on error.
- *
- */
-int
-fio_add_split_rule(fio_devstate_t * rsp, int id, struct fastIO_split_rule *rule)
-{
-
-  /*cmn_err(CE_CONT, "fio_add_split_rule: Adding on vsession %d.\n", id); */
-
-  /* verify that destination session ID makes sense */
-  if (((int) rule->dst_queue >= MAX_SESSION) || !rsp->session[(int) rule->dst_queue])
-    return -1;
-
-  if (!rsp->vsession[id]) {
-    /* first redirect entry */
-
-    /*cmn_err(CE_CONT, "inkudp_handle_cmsg: First redirection entry.\n"); */
-
-
-    rsp->vsession[id] = kmem_alloc(sizeof(struct ink_redirect_list), 0);
-    if (!rsp->vsession[id]) {
-      cmn_err(CE_WARN, "fio_add_split_rule: Out of memory.\n");
-      return 0;
-    }
-    rsp->vsession[id]->dst_mblk = 0;
-    rsp->vsession[id]->destIP = rule->dstIP;
-    rsp->vsession[id]->destPort = rule->dstPort;
-    rsp->vsession[id]->destSession = rsp->session[(int) rule->dst_queue];       /* transform Qid to queue ptr */
-    rsp->vsession[id]->next = rsp->vsession[id];
-    rsp->vsession[id]->prev = rsp->vsession[id];
-
-  } else {
-    struct ink_redirect_list *node;
-    /* add an entry */
-/*	    cmn_err(CE_CONT, "inkudp_handle_cmsg: Adding a redirection entry.\n");*/
-
-
-    node = kmem_alloc(sizeof(struct ink_redirect_list), 0);
-    if (!node) {
-      cmn_err(CE_WARN, "inkudp_handle_cmsg: Out of memory.\n");
-      return 0;
-    }
-    node->dst_mblk = 0;
-    node->destIP = rule->dstIP;
-    node->destPort = rule->dstPort;
-    node->destSession = rsp->session[(int) rule->dst_queue];    /* transform Qid to queue ptr */
-
-    node->next = rsp->vsession[id];
-    node->prev = rsp->vsession[id]->prev;
-
-    rsp->vsession[id]->prev->next = node;
-    rsp->vsession[id]->prev = node;
-  }
-  return 1;                     /* success */
-}
-
-
-
-/*
- *
- * fio_delete_split_rule()
- *
- * Remove the specified splitting rule
- * Return 0 on failure, nonzero on success
- */
-int
-fio_delete_split_rule(fio_devstate_t * rsp, int id, struct fastIO_split_rule *rule)
-{
-  struct ink_redirect_list *trav;
-  int first = 1;
-  int axehead = 0;
-
-  trav = rsp->vsession[id];
-
-  /*cmn_err(CE_CONT, "fio_delete_split_rule: ...\n"); */
-  while (trav && (first || trav != rsp->vsession[id])) {
-    /* match */
-    if (trav->destIP == rule->dstIP && trav->destPort == rule->dstPort) {
-      trav->prev->next = trav->next;
-      trav->next->prev = trav->prev;
-
-      /* Deleting the first entry? */
-      if (trav == rsp->vsession[id]) {
-        /* Deleting the only entry ? */
-        if (trav->next == trav) {
-          rsp->vsession[id] = 0;
-        } else {
-          rsp->vsession[id] = trav->next;
-        }
-
-
-
-      }
-
-      /* if we have a template destination mblk, free it */
-      if (trav->dst_mblk)
-        freeb(trav->dst_mblk);
-
-      /* dealocate the splitting rule */
-      kmem_free(trav, sizeof(struct ink_redirect_list));
-      return 1;                 /* success */
-
-    }
-    first = 0;
-    trav = trav->next;
-
-  }
-  cmn_err(CE_NOTE, "inkudp_delete_split_rule: Unable to find requested split rule in database.\n");
-  return 0;                     /* failure */
-
-}
-
-
-
-/*
- *
- * fio_flush_split_rule()
- *
- * Remove all splitting rules
- * Return 0 on failure, nonzero on success
- */
-int
-fio_flush_split_rules(fio_devstate_t * rsp, int id)
-{
-  struct ink_redirect_list *trav;
-  int first = 1;
-  int axehead = 0;
-
-  trav = rsp->vsession[id];
-  cmn_err(CE_CONT, "inkudp_flush_split_rules...\n");
-  while (trav && (first || trav != rsp->vsession[id])) {
-
-    /* if we have a template destination mblk, free it */
-    if (trav->dst_mblk)
-      freeb(trav->dst_mblk);
-    kmem_free(trav, sizeof(struct ink_redirect_list));
-    trav = trav->next;
-    first = 0;
-  }
-
-  rsp->vsession[id] = 0;
-
-  return 1;                     /*success */
-}
-
-
-
-
-/*
- *
- *  Add or remove splitting rules for a vsession
- *
- */
-int
-fio_vsession_cmd(fio_devstate_t * rsp, struct ink_cmd_msg *msg)
-{
-
-  /* verify that the command references a valid vsession */
-  if (msg->id >= MAX_VSESSION || !rsp->vsession_alloc[msg->id]) {
-    cmn_err(CE_WARN, "inkfio: Invalid vsession identifier 0x%x.\n", msg->id);
-    return 0;                   /*failure */
-  }
-
-  switch (msg->cmd) {
-
-  case INK_CMD_SPLIT_ADD:
-    return fio_add_split_rule(rsp, msg->id, &msg->payload.split_rule);
-    break;
-  case INK_CMD_SPLIT_DELETE:
-    return fio_delete_split_rule(rsp, msg->id, &msg->payload.split_rule);
-    break;
-
-  case INK_CMD_SPLIT_FLUSH:
-    return fio_flush_split_rules(rsp, msg->id);
-    break;
-  case INK_CMD_NOSE_PICK:
-    cmn_err(CE_CONT, "inkudp_handle_cmsg: Ewww.  That's disgusting.\n");
-    break;
-
-
-  }
-
-  return 0;                     /* error */
-
-}
-
-/*
- * Create a vsession
- *
- * Return the ID of the vsession, or -1 if the creation failed
- */
-int
-fio_vsession_create(fio_devstate_t * rsp)
-{
-  int i;
-  if (rsp->vsession_count == MAX_VSESSION)
-    goto oops;
-
-  for (i = (rsp->vsession_count + 1) % MAX_VSESSION; i != rsp->vsession_count; i = (i + 1) % MAX_VSESSION) {
-    if (!rsp->vsession_alloc[i]) {
-      rsp->vsession_count++;
-      rsp->vsession_alloc[i] = 1;
-      rsp->vsession[i] = 0;     /* no redirect list yet */
-
-      /* update statistics */
-      rsp->stats.vsessions_open = rsp->vsession_count;
-
-      return i;
-    }
-
-  }
-
-
-
-oops:
-
-  cmn_err(CE_WARN, "fio_vsession_create: Ooops.  Too many vsessions already.\n");
-  return -1;
-
-}
-
-/*
- * Destroy a vsession
- *
- */
-int
-fio_vsession_destroy(fio_devstate_t * rsp, int id)
-{
-  if (id >= MAX_VSESSION || !rsp->vsession_alloc[id]) {
-    cmn_err(CE_CONT, "fio_vsession_destroy: Attempt to delete invalid vsession %d.\n", id);
-    return 0;
-  }
-
-  /* make sure we don't leak any splitting rules */
-  fio_flush_split_rules(rsp, id);
-  rsp->vsession_alloc[id] = 0;
-  rsp->vsession_count--;
-
-  return 1;                     /* success */
-}
-
-/*
- * Handle vsession-related ioctls
- *
- */
-int
-fio_vsession_ioctl(fio_devstate_t * rsp, int cmd, int arg)
-{
-  struct ink_cmd_msg msg;
-
-  switch (cmd) {
-  case INKFIO_VSESSION_CREATE:
-    return fio_vsession_create(rsp);
-  case INKFIO_VSESSION_DESTROY:
-    return fio_vsession_destroy(rsp, (int) arg);
-  case INKFIO_VSESSION_CMD:
-    if (ddi_copyin((char *) arg, &msg, sizeof(struct ink_cmd_msg), 0)) {
-      cmn_err(CE_WARN, "fio_vsession_ioctl: Invalid userspace pointer 0x%x.\n", (int) arg);
-      return -1;
-    }
-    return fio_vsession_cmd(rsp, &msg);
-
-
-  }
-
-  cmn_err(CE_WARN, "fio: Unrecognized vsession ioctl 0x%x\n", cmd);
-  return -1;
-}
-
-#endif

Modified: trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_recv.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_recv.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_recv.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_recv.c Thu May  6 23:40:41 2010
@@ -81,9 +81,6 @@ inkudp_add_split_rule(queue_t * incoming
   redirect_enabled = 1;
   redirect_passthrough = 1;
 
-#if 0
-  cmn_err(CE_CONT, "inkudp_add_split_rule\n");
-#endif
 
   /* 
    * bail out if this is an error or we have successfully added to
@@ -320,9 +317,6 @@ inkudp_handle_cmsg(mblk_t * mp, queue_t 
   int release_mutex = 0;
   struct ink_cmd_msg *cmsg;
 
-#if 0
-  cmn_err(CE_CONT, "inkdup_handle_csmg \n");
-#endif
 
   cmsg = (struct ink_cmd_msg *) mp->b_rptr;
 
@@ -334,9 +328,6 @@ inkudp_handle_cmsg(mblk_t * mp, queue_t 
   switch (cmsg->cmd) {
 
   case INK_CMD_SPLIT_ADD:
-#if 0
-    cmn_err(CE_CONT, "Adding split rule for port = %d, q = 0x%x\n", cmsg->payload.split_rule.srcPort, q);
-#endif
     inkudp_add_split_rule(q, &(cmsg->payload.split_rule));
     break;
   case INK_CMD_SPLIT_DELETE:
@@ -439,12 +430,6 @@ inkudp_recv(mblk_t * mp, queue_t * q)
   list_node = node->redirect_nodes;
 
   while (list_node) {
-#if 0
-    if ((!list_node->destSession) || (!canputnext(list_node->destSession))) {
-      list_node = list_node->next;
-      continue;
-    }
-#endif
     if (!list_node->destSession) {
       list_node = list_node->next;
       continue;
@@ -479,18 +464,8 @@ inkudp_recv(mblk_t * mp, queue_t * q)
 
     list_node = list_node->next;
   }
-#if 1
   freemsg(mp);
-#else
-  putnext(q, mp);
-#endif
 
-#if 0
-  if (redirect_passthrough) {
-    putnext(q, mp);
-  } else
-    freemsg(mp);
-#endif
 
   if (release_list_mutex)
     mutex_exit(&node->list_mutex);

Modified: trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched.c Thu May  6 23:40:41 2010
@@ -134,9 +134,6 @@ inkudp_adjust_flow_bw_share()
   node = G_redirect_incoming_list;
   while (node) {
     node->m_flow_bw_share = (G_MAX_BYTES_PER_ROUND * node->m_flow_bw_weight) / total_flow_weights;
-#if 0
-    cmn_err(CE_NOTE, "setting flow's bw share: %d, %d\n", node->m_flow_bw_weight, node->m_flow_bw_share);
-#endif
     node = node->next;
   }
   return 1;
@@ -195,9 +192,6 @@ inkudp_add_split_rule(queue_t * incoming
   redirect_enabled = 1;
   redirect_passthrough = 1;
 
-#if 0
-  cmn_err(CE_CONT, "inkudp_add_split_rule\n");
-#endif
 
   /* 
    * bail out if this is an error or we have successfully added to

Modified: trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched_no_qos.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched_no_qos.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched_no_qos.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkudp/inkudp_sched_no_qos.c Thu May  6 23:40:41 2010
@@ -192,9 +192,6 @@ inkudp_add_split_rule(queue_t * incoming
   redirect_enabled = 1;
   redirect_passthrough = 1;
 
-#if 0
-  cmn_err(CE_CONT, "inkudp_add_split_rule\n");
-#endif
 
   /* 
    * bail out if this is an error or we have successfully added to
@@ -494,9 +491,6 @@ inkudp_handle_cmsg(mblk_t * mp, queue_t 
   switch (cmsg->cmd) {
 
   case INK_CMD_SPLIT_ADD:
-#if 0
-    cmn_err(CE_CONT, "Adding split rule for port = %d, q = 0x%x\n", cmsg->payload.split_rule.srcPort, q);
-#endif
     inkudp_add_split_rule(q, &(cmsg->payload.split_rule));
     break;
   case INK_CMD_SPLIT_DELETE:

Modified: trafficserver/traffic/trunk/iocore/fastio/inkudp/solaris.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/inkudp/solaris.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/inkudp/solaris.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/inkudp/solaris.c Thu May  6 23:40:41 2010
@@ -646,18 +646,6 @@ inkudp_wput(queue_t * q, mblk_t * mp)
     putnext(q, mp);
 
 
-#if 0
-  if (msgcount == 200)
-  {
-    cmn_err(CE_CONT, "starting to ignore next time.\n");
-
-  }
-  if (msgcount > 200) {
-    freemsg(mp);
-
-    return 0;
-  }
-#endif
 
 
 

Modified: trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.c Thu May  6 23:40:41 2010
@@ -83,7 +83,6 @@ fastIO_swap(struct fastIO_state *fio, in
   time(&thetime);
 
   {
-#if 1
     int j, nfree = 0;
 
     for (j = 0; j < fio->blockcount; j++)
@@ -92,47 +91,6 @@ fastIO_swap(struct fastIO_state *fio, in
       }
     printf("\nnfree = %d\n", nfree);
 
-#else
-
-    int j, nfree = 0;
-    int startblk, endblk;
-
-    memcpy(recycledblks_temp, recycledblks, fio->blockcount);
-    memset(recycledblks, 0, fio->blockcount);
-
-    for (j = 0; j < fio->blockcount; j++) {
-      if (fio->activefl[j] != 0xffffffff) {
-        nfree++;
-        recycledblks[fio->activefl[j]] = 1;
-      }
-    }
-
-    for (j = 0; j < fio->blockcount; j++)
-      /* A non-recycled block better have been free before this swap */
-      if ((!recycledblks[j]) & (!recycledblks_temp[j]))
-        printf("Non-recycled and non-free block: %d\n", j);
-
-    printf("\nnfree = %d\n", nfree);
-
-    printf("Non-recycled: ");
-    startblk = -1;
-    for (j = 0; j < fio->blockcount; j++) {
-      if (!recycledblks[j]) {
-        if (startblk == -1)
-          startblk = j;
-        endblk = j;
-      } else if (startblk != -1) {
-        /* freeblks[j] is set; and the sequence of non-recycled blks has ended */
-        printf(" %d-%d ", startblk, endblk);
-        startblk = -1;
-      }
-    }
-    if (startblk != -1) {
-      /* freeblks[j] is set; and the sequence of non-recycled blks has ended */
-      printf(" %d-%d ", startblk, endblk);
-      startblk = -1;
-    }
-#endif
   }
 
   /* Don't block if we failed and noblock is set */
@@ -314,9 +272,6 @@ fastIO_udpsession_create(struct fastIO_s
   fs->type = FASTIO_SESSION_UDP;
 
   fs->fd = fd;
-#if 0
-  printf("fastIO_create_session: UDP Queue: 0x%x\n", fs->udp_queue);
-#endif
 
 
   return fs;
@@ -366,9 +321,6 @@ fastIO_session_destroy(struct fastIO_ses
 {
   struct strioctl strioctl;
 
-#if 0
-  printf("fastIO_session_destroy: Destroyign session with quid %d.\n", sessioncookie->udp_queue);
-#endif
 
 
   switch (sessioncookie->type) {
@@ -378,10 +330,6 @@ fastIO_session_destroy(struct fastIO_ses
       perror("ioctl I_POP inkio failed");
       break;
     }
-#if 0
-    if (ioctl(sessioncookie->fio->fiofd, FIO_DELETE_QUEUE, sessioncookie->udp_queue) == -1)
-      perror("ioctl");
-#endif
 
     break;
   case FASTIO_SESSION_VIRTUAL:
@@ -546,18 +494,11 @@ fastIO_add_split_rule(struct fastIO_sess
 
   struct ink_cmd_msg msg;
 
-#if 0
-  printf("fastIO_add_split_rule\n");
-#endif
 
   msg.cmd = INK_CMD_SPLIT_ADD;
   rule->dst_queue = (queue_t *) rule->splitTo->udp_queue;
   memcpy(&(msg.payload.split_rule), rule, sizeof(struct fastIO_split_rule));
 
-#if 0
-  printf("Adding split rule for src port = %d, dest port = %d \n",
-         msg.payload.split_rule.srcPort, msg.payload.split_rule.dstPort);
-#endif
 
   switch (srcSession->type) {
   case FASTIO_SESSION_UDP:
@@ -745,10 +686,6 @@ fastIO_get_stats(struct fastIO_state *co
 {
   ioctl(cookie->fiofd, FIO_GET_STATS, stats);
 
-#if 0
-  printf("Packets Sent: %d\n", stats->pkts_sent);
-  printf("Bytes Sent: %d\n", stats->bytes_sent);
-#endif
 
 }
 

Modified: trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h (original)
+++ trafficserver/traffic/trunk/iocore/fastio/libfastIO/libfastio.h Thu May  6 23:40:41 2010
@@ -53,12 +53,6 @@ typedef u_int32_t uint32_t;
 
 #include "fastio.h"
 
-#if 0
-#ifdef	__cplusplus
-extern "C"
-{
-#endif
-#endif
 
 
 

Modified: trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/requtil.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/requtil.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/requtil.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/requtil.c Thu May  6 23:40:41 2010
@@ -81,11 +81,6 @@ bmark_build_request()
     pkt->delaydelta = bmark.delay;
     pkt++;
 
-#if 0
-    /* write some data into the packet */
-    sprintf(databuf, "This is packet %d.  Ain't that just dandy?\n", i);
-    memcpy(fioblocks[i]->ptr, databuf, strlen(databuf));
-#endif
 
   }
 

Modified: trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/udpbmark.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/udpbmark.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/udpbmark.c (original)
+++ trafficserver/traffic/trunk/iocore/fastio/tools/advbmark/udpbmark.c Thu May  6 23:40:41 2010
@@ -161,12 +161,6 @@ thread_main(void *nuttin)
     gettimeofday(&tv2, 0);
 
     ComputeTimeDiff(&delay, &tv1, &tv2);
-#if 0
-    if (delay > 1.0)
-      printf("*");
-    else
-      printf(".");
-#endif
     printf("Time: %6.2f.\n", delay);
     fflush(stdout);
   }

Modified: trafficserver/traffic/trunk/iocore/hostdb/P_MultiCache.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/P_MultiCache.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/P_MultiCache.h (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/P_MultiCache.h Thu May  6 23:40:41 2010
@@ -178,18 +178,7 @@ struct UnsunkPtrRegistry
 //
 // Broken SunCC
 //
-#if 0
-class PtrMutex:public Ptr<ProxyMutex>
-{
-public:
-  ProxyMutex * operator =(ProxyMutex * m)
-  {
-    return Ptr<ProxyMutex>::operator=(m);
-  }
-};
-#else
 #define PtrMutex Ptr<ProxyMutex>
-#endif
 
 //
 // used by windows only - to keep track 

Modified: trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c (original)
+++ trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c Thu May  6 23:40:41 2010
@@ -86,13 +86,6 @@ struct NetTesterSM:public Continuation
       if (strcmp(&request[req_len - 4], "\r\n\r\n") == 0) {
         Debug("net_test", "The request header is :\n%s\n", request);
         // parse and get the doc size
-#if 0
-        int b = ink_strchr(request, ' ');
-        int e = ink_strchr(url_beg, ' ');
-        b = ink_strchr(b + strlen("http://"), '/');
-        b = ink_strchr(b, '/');
-        char doc strncpy();
-#endif
         SET_HANDLER(&NetTesterSM::handle_write);
         ink_debug_assert(doc_len == resp_reader->read_avail());
         vc->do_io_write(this, doc_len, resp_reader);

Modified: trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h Thu May  6 23:40:41 2010
@@ -41,13 +41,6 @@
 
 #include "P_SSLConfig.h"
 
-#if 0
-#ifndef _IOCORE_WIN32_WINNT
-#include "SSLNetAccept.h"
-#else
-#include <winsock2.h>
-#endif
-#endif
 struct UnixNetVConnection;
 struct NetAccept;
 

Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Thu May  6 23:40:41 2010
@@ -710,17 +710,6 @@ TS_INLINE int EventIO::stop() {
     ev.events = EPOLLIN | EPOLLOUT | EPOLLET;
     return epoll_ctl(event_loop->epoll_fd, EPOLL_CTL_DEL, fd, &ev);
 #elif defined(USE_KQUEUE)
-#if 0
-    // this is not necessary and may result in a race if
-    // a file descriptor is reused between polls
-    int n = 0;
-    struct kevent ev[2];
-    if (events & EVENTIO_READ)
-      EV_SET(&ev[n++], fd, EVFILT_READ, EV_DELETE, 0, 0, this);
-    if (events & EVENTIO_WRITE)
-      EV_SET(&ev[n++], fd, EVFILT_WRITE, EV_DELETE, 0, 0, this);
-    return kevent(event_loop->kqueue_fd, &ev[0], n, NULL, 0, NULL);
-#endif
 #elif defined(USE_PORT)
     int retval = port_dissociate(event_loop->port_fd, PORT_SOURCE_FD, fd);
     NetDebug("iocore_eventio", "[EventIO::stop] %d[%s]=port_dissociate(%d,%d,%d)", retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd);

Modified: trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc Thu May  6 23:40:41 2010
@@ -214,16 +214,6 @@ register_ShowNet(Continuation * c, HTTPH
     SET_CONTINUATION_HANDLER(s, &ShowNet::showConnections);
   } else if (STREQ_PREFIX(path, path_len, "threads")) {
     SET_CONTINUATION_HANDLER(s, &ShowNet::showThreads);
-#if 0
-  } else if (STREQ_PREFIX(path, path_len, "connection/")) {
-    s->iarg = atoi(path + sizeof("connection/") - 1);
-    SET_CONTINUATION_HANDLER(s, &ShowNet::showSingleConnection);
-  } else if (STREQ_PREFIX(path, path_len, "hostnames")) {
-    s->sarg = xstrdup(h->url_get().query_get());
-    if (s->sarg && *s->sarg) {
-      SET_CONTINUATION_HANDLER(s, &ShowNet::showHostnames);
-    }
-#endif
   } else if (STREQ_PREFIX(path, path_len, "ips")) {
     int query_len;
     const char *query = h->url_get()->query_get(&query_len);

Modified: trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Thu May  6 23:40:41 2010
@@ -942,16 +942,6 @@ UDPQueue::service(UDPNetHandler * nh)
       p1 += strlen(p1);
 
       ip = (unsigned char *) &(G_inkPipeInfo.perPipeInfo[i].destIP);
-#if 0
-      if (i == 0)
-        sprintf(bwMessage, "%d mixt Best-Effort %f %f\n", time(0), bw, bw / G_inkPipeInfo.interfaceMbps);
-      else
-        sprintf(bwMessage, "%d mixt %d.%d.%d.%d %f %f\n",
-                time(0), ip[0], ip[1], ip[2], ip[3], bw, bw / G_inkPipeInfo.interfaceMbps);
-
-      ::sendto(G_bwGrapherFd, bwMessage, strlen(bwMessage), 0,
-               (struct sockaddr *) &G_bwGrapherLoc, sizeof(struct sockaddr_in));
-#endif
       // use a weighted estimator of current usage
       G_inkPipeInfo.perPipeInfo[i].bwUsed = (4.0 * G_inkPipeInfo.perPipeInfo[i].bwUsed / 5.0) + (bw / 5.0);
       G_inkPipeInfo.perPipeInfo[i].bytesSent = 0;

Modified: trafficserver/traffic/trunk/libinktomi++/ink_align.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_align.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_align.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_align.h Thu May  6 23:40:41 2010
@@ -74,18 +74,5 @@ align_pointer_forward_and_zero(const voi
 // We could handle this using casts, but that's more prone to
 // errors during porting.
 //
-#if 0
-static inline void *
-DOUBLE_ALIGN(void *_x)
-{
-  return align_pointer_forward(_x, INK_ALIGN_DOUBLE);
-}
-
-static inline inku64
-DOUBLE_ALIGN(inku64 _x)
-{
-  return (inku64) align_pointer_forward((void *) _x, INK_ALIGN_DOUBLE);
-}
-#endif
 
 #endif

Modified: trafficserver/traffic/trunk/libinktomi++/ink_string++.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_string%2B%2B.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_string++.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_string++.cc Thu May  6 23:40:41 2010
@@ -82,17 +82,6 @@ ink_memchr(const void *as, int ac, size_
     unsigned int ibb = ibp ^ ib;
     ibb = ((ibb + im) ^ ~ibb) & ~im;
     if (ibb) {
-#if 0
-      // only works for bigendian
-      if (((ibp << 0) >> 24) == c)
-        return &s[0];
-      if (((ibp << 8) >> 24) == c)
-        return &s[1];
-      if (((ibp << 16) >> 24) == c)
-        return &s[2];
-      if (((ibp << 24) >> 24) == c)
-        return &s[3];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -101,7 +90,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[2];
       if (s[3] == c)
         return &s[3];
-#endif
     }
     s += 4;
   }
@@ -118,28 +106,6 @@ ink_memchr(const void *as, int ac, size_
     bb = ((bb + m) ^ ~bb) & ~m;
     if (bb) {
       s = (unsigned char *) p;
-#if 0
-      unsigned int bbb = (unsigned int) (bp >> 32);
-      if (bb >> 32) {
-        if (((bbb << 0) >> 24) == c)
-          return &s[0];
-        if (((bbb << 8) >> 24) == c)
-          return &s[1];
-        if (((bbb << 16) >> 24) == c)
-          return &s[2];
-        if (((bbb << 24) >> 24) == c)
-          return &s[3];
-      }
-      bbb = (unsigned int) bp;
-      if (((bbb << 0) >> 24) == c)
-        return &s[4];
-      if (((bbb << 8) >> 24) == c)
-        return &s[5];
-      if (((bbb << 16) >> 24) == c)
-        return &s[6];
-      if (((bbb << 24) >> 24) == c)
-        return &s[7];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -156,7 +122,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[6];
       if (s[7] == c)
         return &s[7];
-#endif
     }
     p++;
   }
@@ -173,16 +138,6 @@ ink_memchr(const void *as, int ac, size_
     unsigned int ibb = ibp ^ ib;
     ibb = ((ibb + im) ^ ~ibb) & ~im;
     if (ibb) {
-#if 0
-      if (((ibp << 0) >> 24) == c)
-        return &s[0];
-      if (((ibp << 8) >> 24) == c)
-        return &s[1];
-      if (((ibp << 16) >> 24) == c)
-        return &s[2];
-      if (((ibp << 24) >> 24) == c)
-        return &s[3];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -191,7 +146,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[2];
       if (s[3] == c)
         return &s[3];
-#endif
     }
     s += 4;
   }

Modified: trafficserver/traffic/trunk/libinktomi++/test_atomic.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_atomic.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_atomic.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_atomic.cc Thu May  6 23:40:41 2010
@@ -53,32 +53,6 @@
 
 
 #ifndef LONG_ATOMICLIST_TEST
-#if 0
-InkQueue Q;
-void *
-testfun(InkQueue * q)
-{
-  int num;
-
-  if (q == NULL) {
-    for (num = 2; num < 2000; num += 2) {
-      assert(ink_queue_enqueue(&Q, (void *) num));
-      if (num % 200 == 0) {
-        ink_queue_print(stderr, &Q);
-      }
-    }
-    sleep(10);
-    exit(0);
-  } else {
-    for (;;) {
-      num = (int) ink_queue_try_dequeue(q);
-      if (num != 0)
-        printf("%d\n", num);
-    }
-  }
-  return NULL;
-}
-#endif
 
 #define MAX_ALIST_TEST 10
 #define MAX_ALIST_ARRAY 100000
@@ -187,28 +161,12 @@ int
 main(int argc, const char *argv[])
 {
 #ifndef LONG_ATOMICLIST_TEST
-#if 0
-  InkSpinlock s;
-  ink_spinlock_init(&s);
-  InkQueue *q;
-  ink_queue_init(&Q, "test");
-  q = &Q;
-#endif
   ink32 m = 1, n = 100;
   //ink64 lm = 1LL, ln = 100LL;
   char *m2 = "hello", *n2;
 
   printf("sizeof(ink32)==%d   sizeof(void *)==%d\n", (int)sizeof(ink32), (int)sizeof(void *));
 
-#if 0
-  INK_SPINLOCK_ACQUIRE(&s);
-  printf("acquired: %s, %d\n", s.locked ? "locked" : "free", s.waiting);
-  ink_spinlock_print(stdout, &s);
-
-  ink_spinlock_release(&s);
-  printf("released: %s, %d\n", s.locked ? "locked" : "free", s.waiting);
-  ink_spinlock_print(stdout, &s);
-#endif
 
   printf("CAS: %d == 1  then  2\n", m);
   n = ink_atomic_cas(&m, 1, 2);
@@ -231,41 +189,6 @@ main(int argc, const char *argv[])
   m = ink_atomic_increment((int *) &n, 1);
   printf("changed to: %d,  result=%d\n", n, m);
 
-#if 0
-  printf("CAS64: %lld == 1  then  2\n", lm);
-  n = ink_atomic_cas64(&lm, 1, 2);
-#ifdef __alpha
-  printf("changed to: %ld,  result=%s\n", lm, ln ? "true" : "false");
-#else
-  printf("changed to: %lld,  result=%s\n", lm, ln ? "true" : "false");
-#endif
-
-#ifdef __alpha
-  printf("CAS64: %ld == 1  then  3\n", lm);
-#else
-  printf("CAS64: %lld == 1  then  3\n", lm);
-#endif
-  n = ink_atomic_cas64(&lm, 1, 3);
-#ifdef __alpha
-  printf("changed to: %ld,  result=%s\n", lm, n ? "true" : "false");
-#else
-  printf("changed to: %lld,  result=%s\n", lm, n ? "true" : "false");
-#endif
-
-  ln = 10000001000LL;
-#ifdef __alpha
-  printf("Atomic 64 Inc of %ld by %ld\n", ln, 10000000000100LL);
-#else
-  printf("Atomic 64 Inc of %lld by %lld\n", ln, 10000000000100LL);
-#endif
-  lm = ink_atomic_increment64((long long *) &ln, 10000000000100LL);
-#ifdef __alpha
-  printf("changed to: %lld,  result=%lld\n", ln, lm);
-#else
-  printf("changed to: %lld,  result=%lld\n", ln, lm);
-#endif
-
-#endif /* ! NO_64BIT_ATOMIC */
 
   printf("Atomic Fetch-and-Add 2 to pointer to '%s'\n", m2);
   n2 = (char *) ink_atomic_increment_ptr((pvvoidp) & m2, 2);
@@ -309,20 +232,5 @@ main(int argc, const char *argv[])
   }
 #endif // LONG_ATOMICLIST_TEST
 
-#if 0
-  assert(thr_create(NULL, 0, testfun, 0, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, 0, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  assert(thr_create(NULL, 0, testfun, q, THR_NEW_LWP, NULL) == 0);
-  while (1) {
-    ;
-  }
-#endif
   return 0;
 }

Modified: trafficserver/traffic/trunk/libinktomi++/test_memchr.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_memchr.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_memchr.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_memchr.cc Thu May  6 23:40:41 2010
@@ -72,17 +72,6 @@ ink_memchr(const void *as, int ac, size_
     unsigned int ibb = ibp ^ ib;
     ibb = ((ibb + im) ^ ~ibb) & ~im;
     if (ibb) {
-#if 0
-      // only works for bigendian
-      if (((ibp << 0) >> 24) == c)
-        return &s[0];
-      if (((ibp << 8) >> 24) == c)
-        return &s[1];
-      if (((ibp << 16) >> 24) == c)
-        return &s[2];
-      if (((ibp << 24) >> 24) == c)
-        return &s[3];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -91,7 +80,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[2];
       if (s[3] == c)
         return &s[3];
-#endif
     }
     s += 4;
   }
@@ -108,28 +96,6 @@ ink_memchr(const void *as, int ac, size_
     bb = ((bb + m) ^ ~bb) & ~m;
     if (bb) {
       s = (unsigned char *) p;
-#if 0
-      unsigned int bbb = (unsigned int) (bp >> 32);
-      if (bb >> 32) {
-        if (((bbb << 0) >> 24) == c)
-          return &s[0];
-        if (((bbb << 8) >> 24) == c)
-          return &s[1];
-        if (((bbb << 16) >> 24) == c)
-          return &s[2];
-        if (((bbb << 24) >> 24) == c)
-          return &s[3];
-      }
-      bbb = (unsigned int) bp;
-      if (((bbb << 0) >> 24) == c)
-        return &s[4];
-      if (((bbb << 8) >> 24) == c)
-        return &s[5];
-      if (((bbb << 16) >> 24) == c)
-        return &s[6];
-      if (((bbb << 24) >> 24) == c)
-        return &s[7];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -146,7 +112,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[6];
       if (s[7] == c)
         return &s[7];
-#endif
     }
     p++;
   }
@@ -163,16 +128,6 @@ ink_memchr(const void *as, int ac, size_
     unsigned int ibb = ibp ^ ib;
     ibb = ((ibb + im) ^ ~ibb) & ~im;
     if (ibb) {
-#if 0
-      if (((ibp << 0) >> 24) == c)
-        return &s[0];
-      if (((ibp << 8) >> 24) == c)
-        return &s[1];
-      if (((ibp << 16) >> 24) == c)
-        return &s[2];
-      if (((ibp << 24) >> 24) == c)
-        return &s[3];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -181,7 +136,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[2];
       if (s[3] == c)
         return &s[3];
-#endif
     }
     s += 4;
   }

Modified: trafficserver/traffic/trunk/libinktomi++/test_strings.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/test_strings.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/test_strings.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/test_strings.cc Thu May  6 23:40:41 2010
@@ -294,17 +294,6 @@ ink_memchr(const void *as, int ac, size_
     unsigned int ibb = ibp ^ ib;
     ibb = ((ibb + im) ^ ~ibb) & ~im;
     if (ibb) {
-#if 0
-      // only works for bigendian
-      if (((ibp << 0) >> 24) == c)
-        return &s[0];
-      if (((ibp << 8) >> 24) == c)
-        return &s[1];
-      if (((ibp << 16) >> 24) == c)
-        return &s[2];
-      if (((ibp << 24) >> 24) == c)
-        return &s[3];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -313,7 +302,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[2];
       if (s[3] == c)
         return &s[3];
-#endif
     }
     s += 4;
   }
@@ -330,28 +318,6 @@ ink_memchr(const void *as, int ac, size_
     bb = ((bb + m) ^ ~bb) & ~m;
     if (bb) {
       s = (unsigned char *) p;
-#if 0
-      unsigned int bbb = (unsigned int) (bp >> 32);
-      if (bb >> 32) {
-        if (((bbb << 0) >> 24) == c)
-          return &s[0];
-        if (((bbb << 8) >> 24) == c)
-          return &s[1];
-        if (((bbb << 16) >> 24) == c)
-          return &s[2];
-        if (((bbb << 24) >> 24) == c)
-          return &s[3];
-      }
-      bbb = (unsigned int) bp;
-      if (((bbb << 0) >> 24) == c)
-        return &s[4];
-      if (((bbb << 8) >> 24) == c)
-        return &s[5];
-      if (((bbb << 16) >> 24) == c)
-        return &s[6];
-      if (((bbb << 24) >> 24) == c)
-        return &s[7];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -368,7 +334,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[6];
       if (s[7] == c)
         return &s[7];
-#endif
     }
     p++;
   }
@@ -385,16 +350,6 @@ ink_memchr(const void *as, int ac, size_
     unsigned int ibb = ibp ^ ib;
     ibb = ((ibb + im) ^ ~ibb) & ~im;
     if (ibb) {
-#if 0
-      if (((ibp << 0) >> 24) == c)
-        return &s[0];
-      if (((ibp << 8) >> 24) == c)
-        return &s[1];
-      if (((ibp << 16) >> 24) == c)
-        return &s[2];
-      if (((ibp << 24) >> 24) == c)
-        return &s[3];
-#else
       if (s[0] == c)
         return &s[0];
       if (s[1] == c)
@@ -403,7 +358,6 @@ ink_memchr(const void *as, int ac, size_
         return &s[2];
       if (s[3] == c)
         return &s[3];
-#endif
     }
     s += 4;
   }

Modified: trafficserver/traffic/trunk/proxy/DiagsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/DiagsConfig.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/DiagsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/DiagsConfig.cc Thu May  6 23:40:41 2010
@@ -336,17 +336,7 @@ DiagsConfig::DiagsConfig(char *bdt, char
       }
     }
   }
-#if 0
-  diags_logdir = REC_readString("proxy.config.log2.logfile_dir", &found);
-  if (!found || (diags_logdir == NULL) || (diags_logdir[0] == '\0')) {
-    ink_strncpy(diags_logpath, DIAGS_LOG_FILE, sizeof(diags_logpath));
-  } else {
-    snprintf(diags_logpath, sizeof(diags_logpath), "%s%s%s", diags_logdir, DIR_SEP, DIAGS_LOG_FILE);
-  }
-
-#else
     snprintf(diags_logpath, sizeof(diags_logpath), "%s%s%s", system_log_dir, DIR_SEP, DIAGS_LOG_FILE);
-#endif
 
   // open write append
   // diags_log_fp = fopen(diags_logpath,"w");

Modified: trafficserver/traffic/trunk/proxy/EventName.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/EventName.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/EventName.cc (original)
+++ trafficserver/traffic/trunk/proxy/EventName.cc Thu May  6 23:40:41 2010
@@ -63,13 +63,6 @@ event_int_to_string(int event, char buff
     case NET_EVENT_ACCEPT_SUCCEED: return "NET_EVENT_ACCEPT_SUCCEED";
     case NET_EVENT_ACCEPT_FAILED: return "NET_EVENT_ACCEPT_FAILED";
 
-#if 0
-    case DISK_EVENT_OPEN: return "DISK_EVENT_OPEN";
-    case DISK_EVENT_OPEN_FAILED: return "DISK_EVENT_OPEN_FAILED";
-    case DISK_EVENT_CLOSE_COMPLETE: return "DISK_EVENT_CLOSE_COMPLETE";
-    case DISK_EVENT_STAT_COMPLETE: return "DISK_EVENT_STAT_COMPLETE";
-    case DISK_EVENT_SEEK_COMPLETE: return "DISK_EVENT_SEEK_COMPLETE";
-#endif
 
 #ifdef CLUSTER_CACHE
     case CLUSTER_EVENT_CHANGE: return "CLUSTER_EVENT_CHANGE";
@@ -83,19 +76,6 @@ event_int_to_string(int event, char buff
 
     case DNS_EVENT_EVENTS_START: return "DNS_EVENT_EVENTS_START";
 
-#if 0
-    case MANAGEMENT_EVENT: return "MANAGEMENT_EVENT";
-
-    case LOGIO_FINISHED: return "LOGIO_FINISHED";
-    case LOGIO_WRITE: return "LOGIO_WRITE";
-    case LOGIO_COUNTEDWRITE: return "LOGIO_COUNTEDWRITE";
-    case LOGIO_HAVENETIO: return "LOGIO_HAVENETIO";
-    case LOGIO_RECONFIG: return "LOGIO_RECONFIG";
-    case LOGIO_RECONFIG_FILE: return "LOGIO_RECONFIG_FILE";
-    case LOGIO_RECONFIG_FILEREAD: return "LOGIO_RECONFIG_FILEREAD";
-    case LOGIO_PULSE: return "LOGIO_PULSE";
-    case LOGIO_STARTUP: return "LOGIO_STARTUP";
-#endif
 
     case MULTI_CACHE_EVENT_SYNC: return "MULTI_CACHE_EVENT_SYNC";
 
@@ -116,23 +96,6 @@ event_int_to_string(int event, char buff
     case CACHE_EVENT_RESPONSE: return "CACHE_EVENT_RESPONSE";
     case CACHE_EVENT_RESPONSE_MSG: return "CACHE_EVENT_RESPONSE_MSG";
 
-#if 0
-    case CACHE_DB_EVENT_POOL_SYNC: return "CACHE_DB_EVENT_POOL_SYNC";
-    case CACHE_DB_EVENT_ITERATE_VECVEC: return "CACHE_DB_EVENT_ITERATE_VECVEC";
-    case CACHE_DB_EVENT_ITERATE_FRAG_HDR: return "CACHE_DB_EVENT_ITERATE_FRAG_HDR";
-    case CACHE_DB_EVENT_ITERATE_DONE: return "CACHE_DB_EVENT_ITERATE_DONE";
-
-    case HTTP_EVENT_CONNECTION_OPEN: return "HTTP_EVENT_CONNECTION_OPEN";
-    case HTTP_EVENT_CONNECTION_OPEN_ERROR: return "HTTP_EVENT_CONNECTION_OPEN_ERROR";
-    case HTTP_EVENT_READ_HEADER_COMPLETE: return "HTTP_EVENT_READ_HEADER_COMPLETE";
-    case HTTP_EVENT_READ_HEADER_ERROR: return "HTTP_EVENT_READ_HEADER_ERROR";
-    case HTTP_EVENT_READ_BODY_READY: return "HTTP_EVENT_READ_BODY_READY";
-    case HTTP_EVENT_READ_BODY_COMPLETE: return "HTTP_EVENT_READ_BODY_COMPLETE";
-    case HTTP_EVENT_WRITE_READY: return "HTTP_EVENT_WRITE_READY";
-    case HTTP_EVENT_WRITE_COMPLETE: return "HTTP_EVENT_WRITE_COMPLETE";
-    case HTTP_EVENT_EOS: return "HTTP_EVENT_EOS";
-    case HTTP_EVENT_CLOSED: return "HTTP_EVENT_CLOSED";
-#endif
 
     case MGMT_EVENT_SHUTDOWN: return "MGMT_EVENT_SHUTDOWN";
     case MGMT_EVENT_RESTART: return "MGMT_EVENT_RESTART";

Modified: trafficserver/traffic/trunk/proxy/ICP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICP.cc Thu May  6 23:40:41 2010
@@ -1774,16 +1774,7 @@ ICPRequestCont::BuildICPMsg(ICPopcode_t 
 // Static ICPRequestCont data declarations
 unsigned int
   ICPRequestCont::ICPRequestSeqno = 1;
-#if 0
-//**********************************************************************
-// Currently, placing this in class scope generates numerous
-// warnings on DEC (OK on Solaris).  For now, place this in file scope
-// to avoid these warnings.
-//**********************************************************************
-Queue<ICPRequestCont> ICPRequestCont::ICPRequestQueue[ICPRequestCont::ICP_REQUEST_HASH_SIZE];
-#else
 Queue<ICPRequestCont> ICPRequestQueue[ICPRequestCont::ICP_REQUEST_HASH_SIZE];
-#endif
 
 // Static member function
 unsigned int

Modified: trafficserver/traffic/trunk/proxy/ICP.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.h?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.h (original)
+++ trafficserver/traffic/trunk/proxy/ICP.h Thu May  6 23:40:41 2010
@@ -892,28 +892,6 @@ private:
   {
     return _last_recv_peer_bias;
   }
-#if 0
-  inline void SetPeerIDPollIndex(int id, int pix)
-  {
-    _PeerIDtoPollIndex[id] = pix;
-  }
-  inline int GetPeerIDPollIndex(int id)
-  {
-    return _PeerIDtoPollIndex[id];
-  }
-  inline void MarkPollDataValid()
-  {
-    _ValidPollData = 1;
-  }
-  inline void InvalidatePollData()
-  {
-    _ValidPollData = 0;
-  }
-  inline int IsPollDataValid()
-  {
-    return _ValidPollData;
-  }
-#endif
   void CancelPendingReads();
   void DumpICPConfig();
 
@@ -1210,14 +1188,6 @@ private:
 
   // Static data
   static inku32 ICPRequestSeqno;
-#if 0
-  //**********************************************************************
-  // Currently, placing this in class scope generates numerous
-  // warnings on DEC (OK on Solaris).  For now, place this in file scope
-  // to avoid these warnings.
-  //**********************************************************************
-  static Queue<ICPRequestCont> ICPRequestQueue[ICP_REQUEST_HASH_SIZE];
-#endif
 
   // Passed request data
   Continuation *_cont;

Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=941972&r1=941971&r2=941972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Thu May  6 23:40:41 2010
@@ -7539,43 +7539,11 @@ INKHttpTxnClientRemotePortGet(INKHttpTxn
 }
 
 /* IP Lookup */
-#if 0                           // Not used.
-INKIPLookup
-INKIPLookupCreate()
-{
-  return (INKIPLookup) (NEW(new IpLookup("INKIPLookup")));
-}
-#endif
 
 // This is very suspicious, INKILookup is a (void *), so how on earth
 // can we try to delete an instance of it?
-#if 0                           // Not used.
-void
-INKIPLookupDestroy(INKIPLookup iplu)
-{
-  if (iplu) {
-    delete iplu;
-  }
-}
-#endif
 
-#if 0                           // Not used.
-INKIPLookupState
-INKIPLookupStateCreate()
-{
-  return (INKIPLookupState) xmalloc(sizeof(IpLookupState));
-}
-#endif
 
-#if 0                           // Not used.
-void
-INKIPLookupStateDestroy(INKIPLookupState iplus)
-{
-  if (iplus) {
-    xfree(iplus);
-  }
-}
-#endif
 
 void
 INKIPLookupNewEntry(INKIPLookup iplu, INKU32 addr1, INKU32 addr2, void *data)



Mime
View raw message