You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/17 16:06:30 UTC

svn commit: r945168 - in /trafficserver/traffic/trunk/proxy: ./ mgmt2/ mgmt2/cli/ mgmt2/cli2/ mgmt2/cop/ mgmt2/tools/

Author: mturk
Date: Mon May 17 14:06:29 2010
New Revision: 945168

URL: http://svn.apache.org/viewvc?rev=945168&view=rev
Log:
Use new Layout API that is more C++ friendly

Modified:
    trafficserver/traffic/trunk/proxy/Main.cc
    trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc
    trafficserver/traffic/trunk/proxy/logcat.cc
    trafficserver/traffic/trunk/proxy/logstats.cc
    trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc
    trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
    trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc
    trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
    trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc
    trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
    trafficserver/traffic/trunk/proxy/sac.cc

Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Mon May 17 14:06:29 2010
@@ -1783,7 +1783,7 @@ main(int argc, char **argv)
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
   chdir_root(); // change directory to the install root of traffic server.
 
   process_args(argument_descriptions, n_argument_descriptions, argv);

Modified: trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc (original)
+++ trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc Mon May 17 14:06:29 2010
@@ -500,7 +500,7 @@ main(int argc, char **argv)
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
   // process command-line arguments
   //
   output_file[0] = 0;

Modified: trafficserver/traffic/trunk/proxy/logcat.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logcat.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logcat.cc (original)
+++ trafficserver/traffic/trunk/proxy/logcat.cc Mon May 17 14:06:29 2010
@@ -248,7 +248,7 @@ main(int argc, char *argv[])
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
   // process command-line arguments
   //
   output_file[0] = 0;

Modified: trafficserver/traffic/trunk/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logstats.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ trafficserver/traffic/trunk/proxy/logstats.cc Mon May 17 14:06:29 2010
@@ -1768,7 +1768,7 @@ main(int argc, char *argv[])
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
   // Initialize some globals
   memset(&totals, 0, sizeof(totals));   // Make sure counters are zero
   // Initialize "elapsed" field

Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Mon May 17 14:06:29 2010
@@ -487,7 +487,7 @@ int
 main(int argc, char **argv)
 {
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
   // change the directory to the "root" directory
   chdir_root();
 

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc Mon May 17 14:06:29 2010
@@ -321,7 +321,7 @@ main(int argc, char **argv)
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
   clientCLI *cli = new clientCLI();
 
 /* Argument description table used to describe how to parse command line args, */

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliMain.cc Mon May 17 14:06:29 2010
@@ -58,7 +58,7 @@ main(int argc, char *argv[])
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
 
   // Argument description table used to describe how to parse command line args,
   // see 'ink_args.h' for meanings of the various fields

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Mon May 17 14:06:29 2010
@@ -1931,7 +1931,7 @@ main(int argc, char *argv[])
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
 
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-stop") == 0) {

Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/McastSnoop.cc Mon May 17 14:06:29 2010
@@ -284,10 +284,10 @@ int
 main(int argc, char **argv)
 {
 
+  // Before accessing file system initialize Layout engine
+  Layout::create();
   // Process command line arguments and dump into variables
   process_args(argument_descriptions, n_argument_descriptions, argv);
-  // Before accessing file system initialize Layout engine
-  create_default_layout();
 
   init();
 

Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc Mon May 17 14:06:29 2010
@@ -2977,7 +2977,7 @@ main(int argc, char **argv)
 
   fun_no = atoi(argv[1]);
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
 
   switch (fun_no) {
   case 0:

Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/TimeConfig.cc Mon May 17 14:06:29 2010
@@ -79,7 +79,7 @@ main(int argc, char *argv[])
   }
   buffer[0] = 0;
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
 
   if ((env_path = getenv("TS_ROOT"))) {
     strncpy(buffer, env_path, sizeof(buffer) - 1);

Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc Mon May 17 14:06:29 2010
@@ -81,7 +81,7 @@ main(int argc, char **argv)
   char binary[1024], tinterface[1024], interface[1024], vip[1024];
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
 
   if (argc != 6 || (argc != 2 && strstr(argv[1], "help"))) {
     ink_fputln(stderr, "[vip_config] Usage incorrect(1)");

Modified: trafficserver/traffic/trunk/proxy/sac.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/sac.cc?rev=945168&r1=945167&r2=945168&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/sac.cc (original)
+++ trafficserver/traffic/trunk/proxy/sac.cc Mon May 17 14:06:29 2010
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
                        __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
 
   // Before accessing file system initialize Layout engine
-  create_default_layout();
+  Layout::create();
   // take care of command-line arguments
   //
   snprintf(configDirectoryType, sizeof(configDirectoryType), "S%d", PATH_NAME_MAX - 1);