[CalendarServer-changes] [1809] CalDAVTester/trunk/fsusage.py

[source_changes at macosforge.org]

Revision: 1809
          http://trac.macosforge.org/projects/calendarserver/changeset/1809
Author:   cdaboo at apple.com
Date:     2007-08-20 17:35:50 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Latest fsusage for buildbot.

Modified Paths:
--------------
    CalDAVTester/trunk/fsusage.py

Modified: CalDAVTester/trunk/fsusage.py
===================================================================
--- CalDAVTester/trunk/fsusage.py	2007-08-20 23:08:03 UTC (rev 1808)
+++ CalDAVTester/trunk/fsusage.py	2007-08-21 00:35:50 UTC (rev 1809)
@@ -36,11 +36,10 @@
     -f file  pid file of caldavd server
 """
 
-def getFSUsage(testscript, runs, pid):
+def getFSUsage(testscript, runs, pid, sname):
     fd = open("temp", "w")
     cid = subprocess.Popen(["fs_usage", "-f", "filesys", "%s" %(pid,),], stdout=fd).pid
     
-    sname = "scripts/server/serverinfo.xml"
     pname = None
     fnames = [testscript]
 
@@ -58,7 +57,9 @@
 
 if __name__ == "__main__":
 
-    options, args = getopt.getopt(sys.argv[1:], "f:")
+    pidfile = "../CalendarServer/logs/caldavd.pid"
+    scriptsfile = "scripts/server/serverinfo.xml"
+    options, args = getopt.getopt(sys.argv[1:], "f:s:")
 
     for option, value in options:
         if option == "-h":
@@ -66,6 +67,8 @@
             sys.exit(0)
         elif option == "-f":
             pidfile = value
+        elif option == "-s":
+            scriptsfile = value
         else:
             print "Unrecognized option: %s" % (option,)
             usage()
@@ -82,11 +85,11 @@
         ("performance/get/get-large.xml", 10, "GET large",),
         ("performance/put/put-small.xml", 10, "PUT small",),
         ("performance/put/put-large.xml", 10, "PUT large",),
-        ("performance/propfind/propfind-small.xml", 10, "PROPFIND small",),
-        ("performance/propfind/propfind-medium.xml", 10, "PROPFIND medium",),
-        ("performance/propfind/propfind-large.xml", 10, "PROPFIND large",),
+        #("performance/propfind/propfind-small.xml", 10, "PROPFIND small",),
+        #("performance/propfind/propfind-medium.xml", 10, "PROPFIND medium",),
+        #("performance/propfind/propfind-large.xml", 10, "PROPFIND large",),
     )
     
     result = []
     for test in tests:
-        print "%s\t%s" % (test[2], getFSUsage(test[0], test[1], pid),)
+        print "%s\t%s" % (test[2], getFSUsage(test[0], test[1], pid, scriptsfile),)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070820/cbeb4ce4/attachment.html