[CalendarServer-changes] [2435] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue May 20 10:45:01 PDT 2008


Revision: 2435
          http://trac.macosforge.org/projects/calendarserver/changeset/2435
Author:   dreid at apple.com
Date:     2008-05-20 10:45:00 -0700 (Tue, 20 May 2008)

Log Message:
-----------
Make the -S option profile all caldavd processes.

Modified Paths:
--------------
    CalendarServer/trunk/bin/caldavd
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2008-05-20 17:39:38 UTC (rev 2434)
+++ CalendarServer/trunk/bin/caldavd	2008-05-20 17:45:00 UTC (rev 2435)
@@ -75,7 +75,7 @@
 usage ()
 {
     program="$(basename "$0")";
-    
+
     if [ "${1--}" != "-" ]; then echo "$@"; echo; fi;
 
     echo "Usage: ${program} [-hX] [-u username] [-g groupname] [-T twistd] [-t type] [-f caldavd.plist] [-p statsfile]";
@@ -88,7 +88,7 @@
     echo "        -T Path to twistd binary";
     echo "        -t Process type (Master, Slave or Combined)";
     echo "        -p Path to the desired pstats file.";
-    
+
     if [ "${1-}" == "-" ]; then return 0; fi;
     exit 64;
 }
@@ -104,7 +104,7 @@
         'g') groupname="-g ${OPTARG}"; ;;
         'P') plugin_name="${OPTARG}"; ;;
         't') service_type="-o ProcessType=${OPTARG}"; ;;
-        'p') profile="--profile=${OPTARG} --nothotshot --savestats"; ;;
+        'p') profile="-o Profiling/Enabled=True -o Profiling/BaseDirectory=${OPTARG}"; ;;
     esac;
 done;
 
@@ -114,4 +114,4 @@
 
 export PYTHONPATH
 
-exec "${python}" "${twistdpath}" ${daemonize} ${username} ${groupname} ${profile} "${plugin_name}" ${configfile} ${service_type};
+exec "${python}" "${twistdpath}" ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type} ${profile};

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2008-05-20 17:39:38 UTC (rev 2434)
+++ CalendarServer/trunk/run	2008-05-20 17:45:00 UTC (rev 2435)
@@ -47,7 +47,7 @@
 
   if [ "${1--}" != "-" ]; then echo "$@"; echo; fi;
 
-  echo "Usage: ${program} [-hvsfpndkr] [-K key] [-iI dst] [-t type] [-S statsfile]";
+  echo "Usage: ${program} [-hvsfpndkr] [-K key] [-iI dst] [-t type] [-S statsdirectory]";
   echo "Options:";
   echo "	-h  Print this help and exit";
   echo "	-v  Be verbose";
@@ -62,7 +62,7 @@
   echo "        -i  Perform a system install into dst; implies -s";
   echo "        -I  Perform a home install into dst; implies -s";
   echo "        -t  Select the server process type (Master, Slave or Combined)";
-  echo "        -S  Write a pstats object to the given file when the server is stopped.";
+  echo "        -S  Write a pstats object for each process to the given directory when the server is stopped.";
 
   if [ "${1-}" == "-" ]; then return 0; fi;
   exit 64;
@@ -536,7 +536,7 @@
 # PYTHONPATH, not a build directory.
 
 py_install "Twisted" "${twisted}";
- 
+
 export PYTHONPATH="${PYTHONPATH}:${twisted}";
 
 # twisted.web2 doesn't get installed by default
@@ -603,7 +603,7 @@
 
 if ! py_have_module pydirector; then
   pydirector="${top}/pydirector-1.0.0";
-    
+
   www_get "PyDirector" "${pydirector}" http://easynews.dl.sourceforge.net/sourceforge/pythondirector/pydirector-1.0.0.tar.gz;
   put_setuptools "${pydirector}";
   py_build "PyDirector" "${pydirector}" false;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080520/dc8770cd/attachment.htm 


More information about the calendarserver-changes mailing list