src/native_service/BrowserProfiler/libBrowserProfiler.so @@ -826,6 +826,22 @@ bp::List::operator= (const List & other) return *this; } +void bp::List::clear() +{ + for (unsigned int i = 0; i < values.size(); i++) + { + delete values[i]; + } + values.clear(); + + if (e.value.listVal.elements != NULL) + { + free(e.value.listVal.elements); + } + e.value.listVal.size = 0; + e.value.listVal.elements = NULL; +} + bp::List::~List() { for (unsigned int i = 0; i < values.size(); i++) src/native_service/bptypeutil.cpp @@ -227,6 +227,9 @@ namespace bp { operator std::vector<const Object *>() const; // throw(ConversionException); virtual const Object & operator[](unsigned int index) const; // throw(); + + // empty out a list + void clear(); private: std::vector<Object *> values; }; src/native_service/bptypeutil.h @@ -65,11 +65,15 @@ sampleThread(void * arg) { ServiceContext * myCtx = (ServiceContext *) arg; + std::cout << "sampling thread running" << std::endl; + while (myCtx->samples.size() < MAX_SAMPLES && myCtx->running) { float cpu; long long mem; - + bp::time::Stopwatch sampleTime; + sampleTime.start(); + if (get_sample(myCtx->pid, mem, cpu)) { bp::Map * m = new bp::Map; m->add("cpu", new bp::Double(cpu)); @@ -84,13 +88,20 @@ sampleThread(void * arg) } } - // now pause SAMPLE_INTERVAL_MS - usleep(1000 * SAMPLE_INTERVAL_MS); + // taking a sample takes time. sleep less. + int msToSleep = SAMPLE_INTERVAL_MS; + int sampleTookMS = (int) (sampleTime.elapsedSec() * 1000); + if (msToSleep > sampleTookMS) msToSleep -= sampleTookMS; + + // now pause + usleep(1000 * msToSleep); } g_bpCoreFunctions->postResults(myCtx->tid, myCtx->samples.elemPtr()); + std::cout << "sampling thread returning" << std::endl; + + myCtx->samples.clear(); - // XXX: clear samples list return NULL; } @@ -123,7 +134,7 @@ myAllocate(void ** instance, unsigned int, const BPElement * ctx) static void myDestroy(void * instance) { - ServiceContext * myCtx = new ServiceContext; + ServiceContext * myCtx = (ServiceContext *) instance; if (myCtx->running) { void * ignore; @@ -145,6 +156,9 @@ myInvoke(void * instance, const char * funcName, { ServiceContext * myCtx = (ServiceContext *) instance; + std::cout << funcName << " called!"<< std::endl; + + if (!strcmp(funcName, "start")) { if (myCtx->running) { @@ -159,8 +173,17 @@ myInvoke(void * instance, const char * funcName, myCtx->sw.reset(); myCtx->sw.start(); - // extract callback if present + // use bptypeutil to simplify argument extraction bp::Object * o = bp::Object::build(elem); + + // invoke "started callback" if present + if (o->has("startedCallback", BPTCallBack)) + { + long long scb = ((bp::CallBack *) o->get("startedCallback"))->value(); + g_bpCoreFunctions->invoke(tid, scb, bp::Null().elemPtr()); + } + + // extract callback if present if (o->has("callback", BPTCallBack)) { myCtx->cb = (int) ((bp::CallBack *) o->get("callback"))->value(); @@ -218,6 +241,15 @@ myInvoke(void * instance, const char * funcName, static BPArgumentDefinition s_startArgs[] = { { + "startedCallback", + "A callback which will be invoked immediately (when provided) at " + "the point when sampling begins. The intention of this callback is " + "to allow javascript based code and sampling to attain a correlated " + "zero point for the correlation of resource usage and execution state.", + BPTCallBack, + BP_FALSE + }, + { "callback", "If provided callback will be invoked for each sample rather than " "returning all data in an array at the end of sampling", @@ -229,7 +261,7 @@ static BPArgumentDefinition s_startArgs[] = { static BPFunctionDefinition s_myServiceFunctions[] = { { "start", - "start taking samples. (XXX)", + "Begin taking samples. (XXX)", sizeof(s_startArgs)/sizeof(s_startArgs[0]), s_startArgs }, @@ -250,7 +282,7 @@ static BPFunctionDefinition s_myServiceFunctions[] = { static BPCoreletDefinition s_myServiceDef = { "BrowserProfiler", - 0, 1, 0, + 0, 1, 1, "A service that analyzes the memory and cpu usage of a web browser. " "The service can take 1 sample or multiple samples at a specified interval. " "When sampling at intervals, at most 1,000 samples are taken. If you provide " src/native_service/service.cpp @@ -28,31 +28,31 @@ <script> - var cpuData = []; + var startTime = null; var stopProfile = function() { BrowserPlus.BrowserProfiler.stop({}, function(x) {}); - var report = YAHOO.tool.Profiler.getFullReport(function(data){ - return data.calls > 0; - }); - buildReport(cpuData, report); - //console.log(cpuData); - //console.log(report); }; var startProfile = function() { + var beforeCall = (new Date()).getTime(); BrowserPlus.BrowserProfiler.start({ - interval: 0.1, - callback: function(data) { - //console.log(arguments); - var o = { - stamp: Math.round(parseFloat(data.stamp) /10), - cpu: data.browsers[1].cpu, - mem: data.browsers[1].mem - }; - cpuData.push(o); - //console.log(Math.round(parseFloat(data.stamp) /10), Math.round((new Date()).getTime() / 10)); + startedCallback: function(data) { + var afterCall = (new Date()).getTime(); + startTime = (afterCall + beforeCall) / 2; + console.log("startedCallback delay: " + + (afterCall - beforeCall) + "ms"); } - }, function(x) {}); + }, function(cpuData) { + var report = YAHOO.tool.Profiler.getFullReport(function(data){ + return data.calls > 0; + }); + buildReport(cpuData.value, report); + console.log(cpuData.value); + console.log(report); + + YAHOO.tool.Profiler.unregisterObject("YAHOO.util.DD"); + YAHOO.tool.Profiler.unregisterObject("YAHOO.util.Dom"); + }); YAHOO.tool.Profiler.registerObject("YAHOO.util.DD"); YAHOO.tool.Profiler.registerObject("YAHOO.util.Dom"); @@ -66,7 +66,7 @@ { service: "BrowserProfiler", version: "0", - minversion: "0.0.6" + minversion: "0.1.1" } ]}, function(r) { if (!r.success) { @@ -83,41 +83,36 @@ var buildReport = function(cpuData, report) { //console.log(arguments); //This is really hacky, but oh well it's a hack ;) - var data = {}; + // (lth) and I doubled the hackery for (var i in report) { //console.log(i); var stamps = report[i].stamps; for (var s = 0; s < stamps.length; s++) { - var start = Math.round(stamps[s].start / 10); - if (!data[start]) { - data[start] = {}; - data[start].methods = []; - } - data[start].methods.push(i); - } - } - for (var i in cpuData) { - var stamp = cpuData[i].stamp; - //Cover a +- 100 millisecond gap in data.. - var s_stamp = stamp - 10; - var e_stamp = stamp + 10; - for (var s_stamp; s_stamp <= e_stamp; s_stamp++) { - //console.log(s_stamp); - if (data[s_stamp] && !data[s_stamp].cpu) { - data[s_stamp].cpu = cpuData[i].cpu; - data[s_stamp].mem = cpuData[i].mem; - } - } + + var start = (stamps[s].start - startTime) / 1000.0; + // find which bucket to drop this in, yeah, x^3 + for (var j in cpuData) { + if ((cpuData[j].offset + .1) > start) { + if (!cpuData[j].methods) cpuData[j].methods = []; + cpuData[j].methods.push(i); + break; + } + } + } } //console.log(report); //console.log(data); var r = document.getElementById('results'); r.innerHTML = ''; var str = '<table border="1" width="50%" cellpadding="2" cellspacing="2">'; - str += '<tr><th>Method calls</th><th>CPU</th><th>Memory</th></tr>'; + str += '<tr><th>offset</th><th>cpu</th><th>memory</th><th># of calls</th></tr>'; - for (var i in data) { - str += '<tr><td>' + data[i].methods.length + '</td><td>' + data[i].cpu + '</td><td>' + data[i].mem + '</td></tr>'; + for (var i in cpuData) { + console.log(i); + console.log(cpuData[i]); + str += '<tr><td>' + cpuData[i].offset +'</td><td>' + + cpuData[i].cpu + '</td><td>' + cpuData[i].mem + '</td><td>' + + (cpuData[i].methods ? cpuData[i].methods.length : 0) + '</td></tr>'; } str += '</table>'; tests/profiler.htm src/native_service/BrowserProfiler/libBrowserProfiler.so.dSYM/Contents/Info.plist src/native_service/BrowserProfiler/libBrowserProfiler.so.dSYM/Contents/Resources/DWARF/libBrowserProfiler.so 000cdf3e10ef7ce2465356471d597d5723cf67a5 Lloyd Hilaiel lloydh@fancyfront-hilaiel-com.local http://github.com/davglass/bp-profiler/commit/bd4e2e3b5f4625084bba72faf9e2e1bd5f28a4df bd4e2e3b5f4625084bba72faf9e2e1bd5f28a4df 2008-12-22T10:14:07-08:00 2008-12-22T10:14:07-08:00 hack on profiler a bit. don't use callback method to reduce profiling overhead during execution, play with correlation of sampling data and javascript call data. dc224ad342324bccf55262f62f532315d7343cb1 Lloyd Hilaiel lloydh@fancyfront-hilaiel-com.local