[CalendarServer-changes] [6086] CalendarServer/trunk/contrib/performance

[source_changes at macosforge.org]

Revision: 6086
          http://trac.macosforge.org/projects/calendarserver/changeset/6086
Author:   exarkun at twistedmatrix.com
Date:     2010-08-16 14:57:32 -0700 (Mon, 16 Aug 2010)
Log Message:
-----------
Clean up the output; in this form it should be possible to parse eventually (but does not parse now)

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/io_measure.d
    CalendarServer/trunk/contrib/performance/mkcal.py

Modified: CalendarServer/trunk/contrib/performance/io_measure.d
===================================================================
--- CalendarServer/trunk/contrib/performance/io_measure.d	2010-08-16 21:56:34 UTC (rev 6085)
+++ CalendarServer/trunk/contrib/performance/io_measure.d	2010-08-16 21:57:32 UTC (rev 6086)
@@ -12,13 +12,13 @@
 io:::start
 /args[0]->b_flags & B_READ/
 {
-        printf("%d", args[0]->b_bcount);
+        printf("B_READ %d\n\1", args[0]->b_bcount);
 }
 
 io:::start
 /!(args[0]->b_flags & B_READ)/
 {
-        printf("%d", args[0]->b_bcount);
+        printf("B_WRITE %d\n\1", args[0]->b_bcount);
 }
 
 /*
@@ -29,13 +29,13 @@
 {
         self->executing = 1;
         self->sql = "";
-        printf("%d", timestamp);
+        printf("EXECUTE ENTRY %d\n\1", timestamp);
 }
 
 pid$target:_sqlite3.so:_pysqlite_query_execute:return
 {
         self->executing = 0;
-        printf("%d %s", timestamp, self->sql);
+        printf("EXECUTE RETURN %d %s\n\1", timestamp, self->sql);
 }
 
 pid$target::PyString_AsString:return
@@ -47,10 +47,24 @@
 
 pid$target:_sqlite3.so:pysqlite_cursor_iternext:entry
 {
-        printf("%d", timestamp);
+        printf("ITERNEXT ENTRY %d\n\1", timestamp);
 }
 
 pid$target:_sqlite3.so:pysqlite_cursor_iternext:return
 {
-        printf("%d", timestamp);
+        printf("ITERNEXT RETURN %d\n\1", timestamp);
 }
+
+/*
+ * PyGreSQL stuff
+ */
+
+pid$target::PQexec:entry
+{
+        printf("EXECUTE ENTRY %d %s\n\1", timestamp, copyinstr(arg1));
+}
+
+pid$target::PQexec:return
+{
+	printf("EXECUTE RETURN %d\n\1", timestamp);
+}

Modified: CalendarServer/trunk/contrib/performance/mkcal.py
===================================================================
--- CalendarServer/trunk/contrib/performance/mkcal.py	2010-08-16 21:56:34 UTC (rev 6085)
+++ CalendarServer/trunk/contrib/performance/mkcal.py	2010-08-16 21:57:32 UTC (rev 6086)
@@ -279,7 +279,7 @@
             self.dtraces[p] = reactor.spawnProcess(
                 IOMeasureConsumer(d),
                 "/usr/sbin/dtrace",
-                ["/usr/sbin/dtrace", "-p", str(p), "-s", "io_measure.d"])
+                ["/usr/sbin/dtrace", "-q", "-p", str(p), "-s", "io_measure.d"])
             d.addCallback(self._cleanup, p)
             d.addCallback(self._parse)
             finished.append(d)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100816/32181ecf/attachment-0001.html>