/[jscoverage]/trunk/js/jsdbgapi.cpp

Diff of /trunk/js/jsdbgapi.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 506 by siliconforks,
Sat Sep 26 23:15:22 2009 UTC
+revision 507 by siliconforks,
Sun Jan 10 07:23:34 2010 UTC
 Line 1
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
   * vim: set ts=8 sw=4 et tw=78:
   *
   * ***** BEGIN LICENSE BLOCK *****
 Line 41
  /*
   * JS debugging API.
   */
- #include "jsstddef.h"
  #include <string.h>
  #include "jstypes.h"
+ #include "jsstdint.h"
  #include "jsutil.h" /* Added by JSIFY */
  #include "jsclist.h"
  #include "jsapi.h"
 Line 63
  #include "jsstaticcheck.h"
  #include "jsstr.h"
+ #include "jsatominlines.h"
  #include "jsautooplen.h"
  typedef struct JSTrap {
-Line 116
+Line 118
                  size_t nbytes;
                  nbytes = script->length * sizeof(jsbytecode);
-                 notes = SCRIPT_NOTES(script);
+                 notes = script->notes();
                  for (sn = notes; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn))
                      continue;
                  nbytes += (sn - notes + 1) * sizeof *sn;
-                 code = (jsbytecode *) JS_malloc(cx, nbytes);
+                 code = (jsbytecode *) cx->malloc(nbytes);
                  if (!code)
                      break;
                  memcpy(code, script->code, nbytes);
-Line 153
+Line 155
      } else {
          sample = rt->debuggerMutations;
          DBG_UNLOCK(rt);
-         trap = (JSTrap *) JS_malloc(cx, sizeof *trap);
+         trap = (JSTrap *) cx->malloc(sizeof *trap);
          if (!trap)
              return JS_FALSE;
          trap->closure = NULL;
          if(!js_AddRoot(cx, &trap->closure, "trap->closure")) {
-             JS_free(cx, trap);
+             cx->free(trap);
              return JS_FALSE;
          }
          DBG_LOCK(rt);
-Line 182
+Line 184
      DBG_UNLOCK(rt);
      if (junk) {
          js_RemoveRoot(rt, &junk->closure);
-         JS_free(cx, junk);
+         cx->free(junk);
      }
      return JS_TRUE;
  }
-Line 211
+Line 213
      DBG_UNLOCK(cx->runtime);
      js_RemoveRoot(cx->runtime, &trap->closure);
-     JS_free(cx, trap);
+     cx->free(trap);
  }
  JS_PUBLIC_API(void)
-Line 323
+Line 325
      return status;
  }
+ #ifdef JS_TRACER
+ static void
+ JITInhibitingHookChange(JSRuntime *rt, bool wasInhibited)
+ {
+     if (wasInhibited) {
+         if (!rt->debuggerInhibitsJIT()) {
+             for (JSCList *cl = rt->contextList.next; cl != &rt->contextList; cl = cl->next)
+                 js_ContextFromLinkField(cl)->updateJITEnabled();
+         }
+     } else if (rt->debuggerInhibitsJIT()) {
+         for (JSCList *cl = rt->contextList.next; cl != &rt->contextList; cl = cl->next)
+             js_ContextFromLinkField(cl)->jitEnabled = false;
+     }
+ }
+ static void
+ LeaveTraceRT(JSRuntime *rt)
+ {
+     JSThreadData *data = js_CurrentThreadData(rt);
+     JSContext *cx = data ? data->traceMonitor.tracecx : NULL;
+     JS_UNLOCK_GC(rt);
+     if (cx)
+         js_LeaveTrace(cx);
+ }
+ #endif
  JS_PUBLIC_API(JSBool)
  JS_SetInterrupt(JSRuntime *rt, JSTrapHandler handler, void *closure)
  {
+ #ifdef JS_TRACER
+     JS_LOCK_GC(rt);
+     bool wasInhibited = rt->debuggerInhibitsJIT();
+ #endif
      rt->globalDebugHooks.interruptHandler = handler;
      rt->globalDebugHooks.interruptHandlerData = closure;
+ #ifdef JS_TRACER
+     JITInhibitingHookChange(rt, wasInhibited);
+     JS_UNLOCK_GC(rt);
+     LeaveTraceRT(rt);
+ #endif
      return JS_TRUE;
  }
  JS_PUBLIC_API(JSBool)
  JS_ClearInterrupt(JSRuntime *rt, JSTrapHandler *handlerp, void **closurep)
  {
+ #ifdef JS_TRACER
+     JS_LOCK_GC(rt);
+     bool wasInhibited = rt->debuggerInhibitsJIT();
+ #endif
      if (handlerp)
-         *handlerp = (JSTrapHandler)rt->globalDebugHooks.interruptHandler;
+         *handlerp = rt->globalDebugHooks.interruptHandler;
      if (closurep)
          *closurep = rt->globalDebugHooks.interruptHandlerData;
      rt->globalDebugHooks.interruptHandler = 0;
      rt->globalDebugHooks.interruptHandlerData = 0;
+ #ifdef JS_TRACER
+     JITInhibitingHookChange(rt, wasInhibited);
+     JS_UNLOCK_GC(rt);
+ #endif
      return JS_TRUE;
  }
-Line 351
+Line 397
      JSScopeProperty     *sprop;
      JSPropertyOp        setter;
      JSWatchPointHandler handler;
-     void                *closure;
+     JSObject            *closure;
      uintN               flags;
  } JSWatchPoint;
-Line 395
+Line 441
      if (!setter) {
          JS_LOCK_OBJ(cx, wp->object);
          scope = OBJ_SCOPE(wp->object);
-         found = (scope->object == wp->object &&
+         found = (scope->lookup(sprop->id) != NULL);
-                  SCOPE_GET_PROPERTY(scope, sprop->id));
          JS_UNLOCK_SCOPE(cx, scope);
          /*
-Line 405
+Line 450
           * the property attributes.
           */
          if (found) {
-             sprop = js_ChangeScopePropertyAttrs(cx, scope, sprop,
+             sprop = scope->change(cx, sprop, 0, sprop->attrs,
-, sprop->attrs,
+                                   sprop->getter, wp->setter);
-                                                 sprop->getter,
-                                                 wp->setter);
              if (!sprop)
                  ok = JS_FALSE;
          }
      }
-     JS_free(cx, wp);
+     cx->free(wp);
      return ok;
  }
-Line 435
+Line 478
           &wp->links != &rt->watchPointList;
           wp = (JSWatchPoint *)wp->links.next) {
          if (wp->object == obj) {
-             TRACE_SCOPE_PROPERTY(trc, wp->sprop);
+             wp->sprop->trace(trc);
              if ((wp->sprop->attrs & JSPROP_SETTER) && wp->setter) {
                  JS_CALL_OBJECT_TRACER(trc, js_CastAsObject(wp->setter),
                                        "wp->setter");
              }
              JS_SET_TRACING_NAME(trc, "wp->closure");
-             js_CallValueTracerIfGCThing(trc, (jsval) wp->closure);
+             js_CallValueTracerIfGCThing(trc, OBJECT_TO_JSVAL(wp->closure));
          }
      }
  }
-Line 485
+Line 528
      for (wp = (JSWatchPoint *)rt->watchPointList.next;
           &wp->links != &rt->watchPointList;
           wp = (JSWatchPoint *)wp->links.next) {
-         if (wp->object == scope->object && wp->sprop->id == id)
+         if (OBJ_SCOPE(wp->object) == scope && wp->sprop->id == id)
              return wp;
      }
      return NULL;
-Line 521
+Line 564
      for (wp = (JSWatchPoint *)rt->watchPointList.next;
           &wp->links != &rt->watchPointList;
           wp = (JSWatchPoint *)wp->links.next) {
-         if ((!scope || wp->object == scope->object) && wp->sprop == sprop) {
+         if ((!scope || OBJ_SCOPE(wp->object) == scope) && wp->sprop == sprop) {
              setter = wp->setter;
              break;
          }
-Line 589
+Line 632
                  JSStackFrame frame;
                  JSFrameRegs regs;
-                 closure = (JSObject *) wp->closure;
+                 closure = wp->closure;
                  clasp = OBJ_GET_CLASS(cx, closure);
                  if (clasp == &js_FunctionClass) {
                      fun = GET_FUNCTION_PRIVATE(cx, closure);
                      script = FUN_SCRIPT(fun);
                  } else if (clasp == &js_ScriptClass) {
                      fun = NULL;
-                     script = (JSScript *) JS_GetPrivate(cx, closure);
+                     script = (JSScript *) closure->getPrivate();
                  } else {
                      fun = NULL;
                      script = NULL;
-Line 620
+Line 663
                      if (nslots <= JS_ARRAY_LENGTH(smallv)) {
                          argv = smallv;
                      } else {
-                         argv = (jsval *) JS_malloc(cx, nslots * sizeof(jsval));
+                         argv = (jsval *) cx->malloc(nslots * sizeof(jsval));
                          if (!argv) {
                              DBG_LOCK(rt);
                              DropWatchPointAndUnlock(cx, wp, JSWP_HELD);
-Line 635
+Line 678
                      memset(&frame, 0, sizeof(frame));
                      frame.script = script;
                      frame.regs = NULL;
-                     frame.callee = closure;
                      frame.fun = fun;
                      frame.argv = argv + 2;
                      frame.down = js_GetTopStackFrame(cx);
-Line 652
+Line 694
                              JSFUN_HEAVYWEIGHT_TEST(fun->flags) &&
                              !js_GetCallObject(cx, &frame)) {
                              if (argv != smallv)
-                                 JS_free(cx, argv);
+                                 cx->free(argv);
                              DBG_LOCK(rt);
                              DropWatchPointAndUnlock(cx, wp, JSWP_HELD);
                              return JS_FALSE;
-Line 673
+Line 715
                        : wp->setter(cx, obj, userid, vp));
                  if (injectFrame) {
                      /* Evil code can cause us to have an arguments object. */
-                     if (frame.callobj)
+                     frame.putActivationObjects(cx);
-                         ok &= js_PutCallObject(cx, &frame);
-                     if (frame.argsobj)
-                         ok &= js_PutArgsObject(cx, &frame);
                      cx->fp = frame.down;
                      if (argv != smallv)
-                         JS_free(cx, argv);
+                         cx->free(argv);
                  }
              }
              DBG_LOCK(rt);
-Line 691
+Line 729
      return JS_TRUE;
  }
- JS_REQUIRES_STACK JSBool
+ JSBool
  js_watch_set_wrapper(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
                       jsval *rval)
  {
-Line 736
+Line 774
  JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval idval,
                   JSWatchPointHandler handler, void *closure)
  {
+     JSObject *origobj;
+     jsval v;
+     uintN attrs;
      jsid propid;
      JSObject *pobj;
      JSProperty *prop;
-Line 745
+Line 786
      JSWatchPoint *wp;
      JSPropertyOp watcher;
-     if (!OBJ_IS_NATIVE(obj)) {
+     origobj = obj;
-         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_WATCH,
+     obj = js_GetWrappedObject(cx, obj);
-                              OBJ_GET_CLASS(cx, obj)->name);
+     OBJ_TO_INNER_OBJECT(cx, obj);
+     if (!obj)
          return JS_FALSE;
-     }
      if (JSVAL_IS_INT(idval)) {
          propid = INT_JSVAL_TO_JSID(idval);
      } else {
          if (!js_ValueToStringId(cx, idval, &propid))
              return JS_FALSE;
-         CHECK_FOR_STRING_INDEX(propid);
+         propid = js_CheckForStringIndex(propid);
+     }
+     /*
+      * If, by unwrapping and innerizing, we changed the object, check
+      * again to make sure that we're allowed to set a watch point.
+      */
+     if (origobj != obj && !obj->checkAccess(cx, propid, JSACC_WATCH, &v, &attrs))
+         return JS_FALSE;
+     if (!OBJ_IS_NATIVE(obj)) {
+         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_CANT_WATCH,
+                              OBJ_GET_CLASS(cx, obj)->name);
+         return JS_FALSE;
      }
      if (!js_LookupProperty(cx, obj, propid, &pobj, &prop))
-Line 768
+Line 822
          sprop = js_FindWatchPoint(rt, OBJ_SCOPE(obj), propid);
          if (!sprop) {
              /* Make a new property in obj so we can watch for the first set. */
-             if (!js_DefineProperty(cx, obj, propid, JSVAL_VOID,
+             if (!js_DefineNativeProperty(cx, obj, propid, JSVAL_VOID, NULL, NULL,
-                                    NULL, NULL, JSPROP_ENUMERATE,
+                                          JSPROP_ENUMERATE, 0, 0, &prop)) {
-                                    &prop)) {
                  return JS_FALSE;
              }
              sprop = (JSScopeProperty *) prop;
-Line 792
+Line 845
              flags = sprop->flags;
              shortid = sprop->shortid;
          } else {
-             if (!OBJ_GET_PROPERTY(cx, pobj, propid, &value) ||
+             if (!pobj->getProperty(cx, propid, &value) ||
-                 !OBJ_GET_ATTRIBUTES(cx, pobj, propid, prop, &attrs)) {
+                 !pobj->getAttributes(cx, propid, prop, &attrs)) {
-                 OBJ_DROP_PROPERTY(cx, pobj, prop);
+                 pobj->dropProperty(cx, prop);
                  return JS_FALSE;
              }
              getter = setter = NULL;
              flags = 0;
              shortid = 0;
          }
-         OBJ_DROP_PROPERTY(cx, pobj, prop);
+         pobj->dropProperty(cx, prop);
          /* Recall that obj is native, whether or not pobj is native. */
          if (!js_DefineNativeProperty(cx, obj, propid, value, getter, setter,
-Line 813
+Line 866
      /*
       * At this point, prop/sprop exists in obj, obj is locked, and we must
-      * OBJ_DROP_PROPERTY(cx, obj, prop) before returning.
+      * obj->dropProperty(cx, prop) before returning.
       */
      ok = JS_TRUE;
      DBG_LOCK(rt);
-Line 826
+Line 879
              goto out;
          }
-         wp = (JSWatchPoint *) JS_malloc(cx, sizeof *wp);
+         wp = (JSWatchPoint *) cx->malloc(sizeof *wp);
          if (!wp) {
              ok = JS_FALSE;
              goto out;
-Line 862
+Line 915
          ++rt->debuggerMutations;
      }
      wp->handler = handler;
-     wp->closure = closure;
+     wp->closure = reinterpret_cast<JSObject*>(closure);
      DBG_UNLOCK(rt);
  out:
-     OBJ_DROP_PROPERTY(cx, obj, prop);
+     obj->dropProperty(cx, prop);
      return ok;
  }
-Line 1024
+Line 1077
      if (fp->fun) {
          callbacks = JS_GetSecurityCallbacks(cx);
          if (callbacks && callbacks->findObjectPrincipals) {
-             if (FUN_OBJECT(fp->fun) != fp->callee)
+             if (FUN_OBJECT(fp->fun) != fp->callee())
-                 return callbacks->findObjectPrincipals(cx, fp->callee);
+                 return callbacks->findObjectPrincipals(cx, fp->callee());
              /* FALL THROUGH */
          }
      }
-Line 1042
+Line 1095
      callbacks = JS_GetSecurityCallbacks(cx);
      if (callbacks && callbacks->findObjectPrincipals) {
-         principals = callbacks->findObjectPrincipals(cx, fp->callee);
+         principals = callbacks->findObjectPrincipals(cx, fp->callee());
      } else {
          principals = NULL;
      }
-Line 1147
+Line 1200
          afp = NULL;
      }
-     if (!fp->thisp && fp->argv)
+     if (fp->argv)
          fp->thisp = js_ComputeThis(cx, JS_TRUE, fp->argv);
      if (afp) {
-Line 1171
+Line 1224
      if (!fp->fun)
          return NULL;
-     JS_ASSERT(HAS_FUNCTION_CLASS(fp->callee));
+     JS_ASSERT(HAS_FUNCTION_CLASS(fp->callee()));
-     JS_ASSERT(OBJ_GET_PRIVATE(cx, fp->callee) == fp->fun);
+     JS_ASSERT(fp->callee()->getPrivate() == fp->fun);
-     return fp->callee;
+     return fp->callee();
  }
  JS_PUBLIC_API(JSBool)
-Line 1185
+Line 1238
  JS_PUBLIC_API(JSObject *)
  JS_GetFrameCalleeObject(JSContext *cx, JSStackFrame *fp)
  {
-     return fp->callee;
+     return fp->callee();
  }
  JS_PUBLIC_API(JSBool)
-Line 1344
+Line 1397
      length = (uintN) len;
      ok = JS_EvaluateUCInStackFrame(cx, fp, chars, length, filename, lineno,
                                     rval);
-     JS_free(cx, chars);
+     cx->free(chars);
      return ok;
  }
-Line 1367
+Line 1420
          sprop = SCOPE_LAST_PROP(scope);
      } else {
          while ((sprop = sprop->parent) != NULL) {
-             if (!SCOPE_HAD_MIDDLE_DELETE(scope))
+             if (!scope->hadMiddleDelete())
                  break;
-             if (SCOPE_HAS_PROPERTY(scope, sprop))
+             if (scope->has(sprop))
                  break;
          }
      }
-Line 1463
+Line 1516
      /* have no props, or object's scope has not mutated from that of proto */
      scope = OBJ_SCOPE(obj);
-     if (scope->object != obj || scope->entryCount == 0) {
+     if (scope->entryCount == 0) {
          pda->length = 0;
          pda->array = NULL;
          return JS_TRUE;
      }
      n = scope->entryCount;
-     pd = (JSPropertyDesc *) JS_malloc(cx, (size_t)n * sizeof(JSPropertyDesc));
+     pd = (JSPropertyDesc *) cx->malloc((size_t)n * sizeof(JSPropertyDesc));
      if (!pd)
          return JS_FALSE;
      i = 0;
      for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
-         if (SCOPE_HAD_MIDDLE_DELETE(scope) && !SCOPE_HAS_PROPERTY(scope, sprop))
+         if (scope->hadMiddleDelete() && !scope->has(sprop))
              continue;
          if (!js_AddRoot(cx, &pd[i].id, NULL))
              goto bad;
-Line 1512
+Line 1565
          if (pd[i].flags & JSPD_ALIAS)
              js_RemoveRoot(cx->runtime, &pd[i].alias);
      }
-     JS_free(cx, pd);
+     cx->free(pd);
  }
  /************************************************************************/
-Line 1544
+Line 1597
  JS_PUBLIC_API(JSBool)
  JS_SetCallHook(JSRuntime *rt, JSInterpreterHook hook, void *closure)
  {
+ #ifdef JS_TRACER
+     JS_LOCK_GC(rt);
+     bool wasInhibited = rt->debuggerInhibitsJIT();
+ #endif
      rt->globalDebugHooks.callHook = hook;
      rt->globalDebugHooks.callHookData = closure;
+ #ifdef JS_TRACER
+     JITInhibitingHookChange(rt, wasInhibited);
+     JS_UNLOCK_GC(rt);
+     if (hook)
+         LeaveTraceRT(rt);
+ #endif
      return JS_TRUE;
  }
  JS_PUBLIC_API(JSBool)
  JS_SetObjectHook(JSRuntime *rt, JSObjectHook hook, void *closure)
  {
+ #ifdef JS_TRACER
+     JS_LOCK_GC(rt);
+     bool wasInhibited = rt->debuggerInhibitsJIT();
+ #endif
      rt->globalDebugHooks.objectHook = hook;
      rt->globalDebugHooks.objectHookData = closure;
+ #ifdef JS_TRACER
+     JITInhibitingHookChange(rt, wasInhibited);
+     JS_UNLOCK_GC(rt);
+     if (hook)
+         LeaveTraceRT(rt);
+ #endif
      return JS_TRUE;
  }
-Line 1588
+Line 1661
      }
      if (OBJ_IS_NATIVE(obj)) {
          scope = OBJ_SCOPE(obj);
-         if (scope->object == obj) {
+         if (scope->owned()) {
              nbytes += sizeof *scope;
              nbytes += SCOPE_CAPACITY(scope) * sizeof(JSScopeProperty *);
          }
-Line 1604
+Line 1677
      nbytes = sizeof(JSAtom *) + sizeof(JSDHashEntryStub);
      if (ATOM_IS_STRING(atom)) {
          nbytes += sizeof(JSString);
-         nbytes += (JSFLATSTR_LENGTH(ATOM_TO_STRING(atom)) + 1) * sizeof(jschar);
+         nbytes += (ATOM_TO_STRING(atom)->flatLength() + 1) * sizeof(jschar);
      } else if (ATOM_IS_DOUBLE(atom)) {
          nbytes += sizeof(jsdouble);
      }
-Line 1648
+Line 1721
      if (script->filename)
          nbytes += strlen(script->filename) + 1;
-     notes = SCRIPT_NOTES(script);
+     notes = script->notes();
      for (sn = notes; !SN_IS_TERMINATOR(sn); sn = SN_NEXT(sn))
          continue;
      nbytes += (sn - notes + 1) * sizeof *sn;
      if (script->objectsOffset != 0) {
-         objarray = JS_SCRIPT_OBJECTS(script);
+         objarray = script->objects();
          i = objarray->length;
          nbytes += sizeof *objarray + i * sizeof objarray->vector[0];
          do {
-Line 1663
+Line 1736
      }
      if (script->regexpsOffset != 0) {
-         objarray = JS_SCRIPT_REGEXPS(script);
+         objarray = script->regexps();
          i = objarray->length;
          nbytes += sizeof *objarray + i * sizeof objarray->vector[0];
          do {
-Line 1673
+Line 1746
      if (script->trynotesOffset != 0) {
          nbytes += sizeof(JSTryNoteArray) +
-             JS_SCRIPT_TRYNOTES(script)->length * sizeof(JSTryNote);
+             script->trynotes()->length * sizeof(JSTryNote);
      }
      principals = script->principals;
-Line 1721
+Line 1794
  JS_PUBLIC_API(JSBool)
  JS_IsSystemObject(JSContext *cx, JSObject *obj)
  {
-     return STOBJ_IS_SYSTEM(obj);
+     return obj->isSystem();
  }
  JS_PUBLIC_API(JSObject *)
-Line 1730
+Line 1803
  {
      JSObject *obj;
-     obj = js_NewObject(cx, clasp, proto, parent, 0);
+     obj = js_NewObject(cx, clasp, proto, parent);
      if (obj && system)
-         STOBJ_SET_SYSTEM(obj);
+         obj->setSystem();
      return obj;
  }
  /************************************************************************/
- JS_PUBLIC_API(JSDebugHooks *)
+ JS_PUBLIC_API(const JSDebugHooks *)
  JS_GetGlobalDebugHooks(JSRuntime *rt)
  {
      return &rt->globalDebugHooks;
  }
  JS_PUBLIC_API(JSDebugHooks *)
- JS_SetContextDebugHooks(JSContext *cx, JSDebugHooks *hooks)
+ JS_SetContextDebugHooks(JSContext *cx, const JSDebugHooks *hooks)
  {
-     JSDebugHooks *old;
      JS_ASSERT(hooks);
-     old = cx->debugHooks;
+     if (hooks != &cx->runtime->globalDebugHooks)
+         js_LeaveTrace(cx);
+ #ifdef JS_TRACER
+     JS_LOCK_GC(cx->runtime);
+ #endif
+     JSDebugHooks *old = const_cast<JSDebugHooks *>(cx->debugHooks);
      cx->debugHooks = hooks;
+ #ifdef JS_TRACER
+     cx->updateJITEnabled();
+     JS_UNLOCK_GC(cx->runtime);
+ #endif
      return old;
  }
-Line 1882
+Line 1963
      if (argc > 0 && JSVAL_IS_STRING(argv[0])) {
          str = JSVAL_TO_STRING(argv[0]);
-         cstr = js_DeflateString(cx, JSSTRING_CHARS(str), JSSTRING_LENGTH(str));
+         cstr = js_DeflateString(cx, str->chars(), str->length());
          if (cstr) {
              CALLGRIND_DUMP_STATS_AT(cstr);
-             JS_free(cx, cstr);
+             cx->free(cstr);
              return JS_TRUE;
          }
      }
-Line 1957
+Line 2038
      if (argc > 0 && JSVAL_IS_STRING(argv[0])) {
          str = JSVAL_TO_STRING(argv[0]);
-         params.tb5Filename = js_DeflateString(cx,
+         params.tb5Filename = js_DeflateString(cx, str->chars(), str->length());
-                                               JSSTRING_CHARS(str),
-                                               JSSTRING_LENGTH(str));
      }
      status = VTStartSampling(&params);
      if (params.tb5Filename != default_filename)
-         JS_free(cx, params.tb5Filename);
+         cx->free(params.tb5Filename);
      if (status != 0) {
          if (status == VTAPI_MULTIPLE_RUNS)
-Line 2015
+Line 2094
  }
  #endif /* MOZ_VTUNE */
+ #ifdef MOZ_TRACEVIS
+ /*
+  * Ethogram - Javascript wrapper for TraceVis state
+  *
+  * ethology: The scientific study of animal behavior,
+  *           especially as it occurs in a natural environment.
+  * ethogram: A pictorial catalog of the behavioral patterns of
+  *           an organism or a species.
+  *
+  */
+ #if defined(XP_WIN)
+ #include <windows.h>
+ #else
+ #include <sys/time.h>
+ #endif
+ #include "jstracer.h"
+ #define ETHOGRAM_BUF_SIZE 65536
+ static JSBool
+ ethogram_construct(JSContext *cx, JSObject *obj,
+                    uintN argc, jsval *argv, jsval *rval);
+ static void
+ ethogram_finalize(JSContext *cx, JSObject *obj);
+ static JSClass ethogram_class = {
+     "Ethogram",
+     JSCLASS_HAS_PRIVATE,
+     JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+     JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, ethogram_finalize,
+     JSCLASS_NO_OPTIONAL_MEMBERS
+ };
+ struct EthogramEvent {
+     TraceVisState s;
+     TraceVisExitReason r;
+     int ts;
+     int tus;
+     JSString *filename;
+     int lineno;
+ };
+ static int
+ compare_strings(const void *k1, const void *k2)
+ {
+     return strcmp((const char *) k1, (const char *) k2) == 0;
+ }
+ class EthogramEventBuffer {
+ private:
+     EthogramEvent mBuf[ETHOGRAM_BUF_SIZE];
+     int mReadPos;
+     int mWritePos;
+     JSObject *mFilenames;
+     int mStartSecond;
+     struct EthogramScriptEntry {
+         char *filename;
+         JSString *jsfilename;
+         EthogramScriptEntry *next;
+     };
+     EthogramScriptEntry *mScripts;
+ public:
+     friend JSBool
+     ethogram_construct(JSContext *cx, JSObject *obj,
+                        uintN argc, jsval *argv, jsval *rval);
+     inline void push(TraceVisState s, TraceVisExitReason r, char *filename, int lineno) {
+         mBuf[mWritePos].s = s;
+         mBuf[mWritePos].r = r;
+ #if defined(XP_WIN)
+         FILETIME now;
+         GetSystemTimeAsFileTime(&now);
+         unsigned long long raw_us = 0.1 *
+             (((unsigned long long) now.dwHighDateTime << 32ULL) |
+              (unsigned long long) now.dwLowDateTime);
+         unsigned int sec = raw_us / 1000000L;
+         unsigned int usec = raw_us % 1000000L;
+         mBuf[mWritePos].ts = sec - mStartSecond;
+         mBuf[mWritePos].tus = usec;
+ #else
+         struct timeval tv;
+         gettimeofday(&tv, NULL);
+         mBuf[mWritePos].ts = tv.tv_sec - mStartSecond;
+         mBuf[mWritePos].tus = tv.tv_usec;
+ #endif
+         JSString *jsfilename = findScript(filename);
+         mBuf[mWritePos].filename = jsfilename;
+         mBuf[mWritePos].lineno = lineno;
+         mWritePos = (mWritePos + 1) % ETHOGRAM_BUF_SIZE;
+         if (mWritePos == mReadPos) {
+             mReadPos = (mWritePos + 1) % ETHOGRAM_BUF_SIZE;
+         }
+     }
+     inline EthogramEvent *pop() {
+         EthogramEvent *e = &mBuf[mReadPos];
+         mReadPos = (mReadPos + 1) % ETHOGRAM_BUF_SIZE;
+         return e;
+     }
+     bool isEmpty() {
+         return (mReadPos == mWritePos);
+     }
+     EthogramScriptEntry *addScript(JSContext *cx, JSObject *obj, char *filename, JSString *jsfilename) {
+         JSHashNumber hash = JS_HashString(filename);
+         JSHashEntry **hep = JS_HashTableRawLookup(traceVisScriptTable, hash, filename);
+         if (*hep != NULL)
+             return JS_FALSE;
+         JS_HashTableRawAdd(traceVisScriptTable, hep, hash, filename, this);
+         EthogramScriptEntry * entry = (EthogramScriptEntry *) JS_malloc(cx, sizeof(EthogramScriptEntry));
+         if (entry == NULL)
+             return NULL;
+         entry->next = mScripts;
+         mScripts = entry;
+         entry->filename = filename;
+         entry->jsfilename = jsfilename;
+         return mScripts;
+     }
+     void removeScripts(JSContext *cx) {
+         EthogramScriptEntry *se = mScripts;
+         while (se != NULL) {
+             char *filename = se->filename;
+             JSHashNumber hash = JS_HashString(filename);
+             JSHashEntry **hep = JS_HashTableRawLookup(traceVisScriptTable, hash, filename);
+             JSHashEntry *he = *hep;
+             if (he) {
+                 /* we hardly knew he */
+                 JS_HashTableRawRemove(traceVisScriptTable, hep, he);
+             }
+             EthogramScriptEntry *se_head = se;
+             se = se->next;
+             JS_free(cx, se_head);
+         }
+     }
+     JSString *findScript(char *filename) {
+         EthogramScriptEntry *se = mScripts;
+         while (se != NULL) {
+             if (compare_strings(se->filename, filename))
+                 return (se->jsfilename);
+             se = se->next;
+         }
+         return NULL;
+     }
+     JSObject *filenames() {
+         return mFilenames;
+     }
+     int length() {
+         if (mWritePos < mReadPos)
+             return (mWritePos + ETHOGRAM_BUF_SIZE) - mReadPos;
+         else
+             return mWritePos - mReadPos;
+     }
+ };
+ static char jstv_empty[] = "<null>";
+ inline char *
+ jstv_Filename(JSStackFrame *fp)
+ {
+     while (fp && fp->script == NULL)
+         fp = fp->down;
+     return (fp && fp->script && fp->script->filename)
+            ? (char *)fp->script->filename
+            : jstv_empty;
+ }
+ inline uintN
+ jstv_Lineno(JSContext *cx, JSStackFrame *fp)
+ {
+     while (fp && fp->regs == NULL)
+         fp = fp->down;
+     return (fp && fp->regs) ? js_FramePCToLineNumber(cx, fp) : 0;
+ }
+ /* Collect states here and distribute to a matching buffer, if any */
+ JS_FRIEND_API(void)
+ js_StoreTraceVisState(JSContext *cx, TraceVisState s, TraceVisExitReason r)
+ {
+     JSStackFrame *fp = cx->fp;
+     char *script_file = jstv_Filename(fp);
+     JSHashNumber hash = JS_HashString(script_file);
+     JSHashEntry **hep = JS_HashTableRawLookup(traceVisScriptTable, hash, script_file);
+     /* update event buffer, flag if overflowed */
+     JSHashEntry *he = *hep;
+     if (he) {
+         EthogramEventBuffer *p;
+         p = (EthogramEventBuffer *) he->value;
+         p->push(s, r, script_file, jstv_Lineno(cx, fp));
+     }
+ }
+ static JSBool
+ ethogram_construct(JSContext *cx, JSObject *obj,
+                    uintN argc, jsval *argv, jsval *rval)
+ {
+     EthogramEventBuffer *p;
+     p = (EthogramEventBuffer *) JS_malloc(cx, sizeof(EthogramEventBuffer));
+     p->mReadPos = p->mWritePos = 0;
+     p->mScripts = NULL;
+     p->mFilenames = JS_NewArrayObject(cx, 0, NULL);
+ #if defined(XP_WIN)
+     FILETIME now;
+     GetSystemTimeAsFileTime(&now);
+     unsigned long long raw_us = 0.1 *
+         (((unsigned long long) now.dwHighDateTime << 32ULL) |
+          (unsigned long long) now.dwLowDateTime);
+     unsigned int s = raw_us / 1000000L;
+     p->mStartSecond = s;
+ #else
+     struct timeval tv;
+     gettimeofday(&tv, NULL);
+     p->mStartSecond = tv.tv_sec;
+ #endif
+     jsval filenames = OBJECT_TO_JSVAL(p->filenames());
+     if (!JS_DefineProperty(cx, obj, "filenames", filenames,
+                            NULL, NULL, JSPROP_READONLY|JSPROP_PERMANENT))
+         return JS_FALSE;
+     if (!JS_IsConstructing(cx)) {
+         obj = JS_NewObject(cx, &ethogram_class, NULL, NULL);
+         if (!obj)
+             return JS_FALSE;
+         *rval = OBJECT_TO_JSVAL(obj);
+     }
+     JS_SetPrivate(cx, obj, p);
+     return JS_TRUE;
+ }
+ static void
+ ethogram_finalize(JSContext *cx, JSObject *obj)
+ {
+     EthogramEventBuffer *p;
+     p = (EthogramEventBuffer *) JS_GetInstancePrivate(cx, obj, &ethogram_class, NULL);
+     if (!p)
+         return;
+     p->removeScripts(cx);
+     JS_free(cx, p);
+ }
+ static JSBool
+ ethogram_addScript(JSContext *cx, JSObject *obj,
+                    uintN argc, jsval *argv, jsval *rval)
+ {
+     JSString *str;
+     char *filename = NULL;
+     if (argc > 0 && JSVAL_IS_STRING(argv[0])) {
+         str = JSVAL_TO_STRING(argv[0]);
+         filename = js_DeflateString(cx,
+                                     str->chars(),
+                                     str->length());
+     }
+     /* silently ignore no args */
+     if (!filename)
+         return JS_TRUE;
+     EthogramEventBuffer *p = (EthogramEventBuffer *) JS_GetInstancePrivate(cx, obj, &ethogram_class, argv);
+     p->addScript(cx, obj, filename, str);
+     JS_CallFunctionName(cx, p->filenames(), "push", 1, argv, rval);
+     return JS_TRUE;
+ }
+ static JSBool
+ ethogram_getAllEvents(JSContext *cx, JSObject *obj,
+                       uintN argc, jsval *argv, jsval *rval)
+ {
+     EthogramEventBuffer *p;
+     p = (EthogramEventBuffer *) JS_GetInstancePrivate(cx, obj, &ethogram_class, argv);
+     if (!p)
+         return JS_FALSE;
+     if (p->isEmpty()) {
+         *rval = JSVAL_NULL;
+         return JS_TRUE;
+     }
+     JSObject *rarray = JS_NewArrayObject(cx, 0, NULL);
+     if (rarray == NULL) {
+         *rval = JSVAL_NULL;
+         return JS_TRUE;
+     }
+     *rval = OBJECT_TO_JSVAL(rarray);
+     for (int i = 0; !p->isEmpty(); i++) {
+         JSObject *x = JS_NewObject(cx, NULL, NULL, NULL);
+         if (x == NULL)
+             return JS_FALSE;
+         EthogramEvent *e = p->pop();
+         jsval state = INT_TO_JSVAL(e->s);
+         jsval reason = INT_TO_JSVAL(e->r);
+         jsval ts = INT_TO_JSVAL(e->ts);
+         jsval tus = INT_TO_JSVAL(e->tus);
+         jsval filename = STRING_TO_JSVAL(e->filename);
+         jsval lineno = INT_TO_JSVAL(e->lineno);
+         if (!JS_SetProperty(cx, x, "state", &state))
+             return JS_FALSE;
+         if (!JS_SetProperty(cx, x, "reason", &reason))
+             return JS_FALSE;
+         if (!JS_SetProperty(cx, x, "ts", &ts))
+             return JS_FALSE;
+         if (!JS_SetProperty(cx, x, "tus", &tus))
+             return JS_FALSE;
+         if (!JS_SetProperty(cx, x, "filename", &filename))
+             return JS_FALSE;
+         if (!JS_SetProperty(cx, x, "lineno", &lineno))
+             return JS_FALSE;
+         jsval element = OBJECT_TO_JSVAL(x);
+         JS_SetElement(cx, rarray, i, &element);
+     }
+     return JS_TRUE;
+ }
+ static JSBool
+ ethogram_getNextEvent(JSContext *cx, JSObject *obj,
+                       uintN argc, jsval *argv, jsval *rval)
+ {
+     EthogramEventBuffer *p;
+     p = (EthogramEventBuffer *) JS_GetInstancePrivate(cx, obj, &ethogram_class, argv);
+     if (!p)
+         return JS_FALSE;
+     JSObject *x = JS_NewObject(cx, NULL, NULL, NULL);
+     if (x == NULL)
+         return JS_FALSE;
+     if (p->isEmpty()) {
+         *rval = JSVAL_NULL;
+         return JS_TRUE;
+     }
+     EthogramEvent *e = p->pop();
+     jsval state = INT_TO_JSVAL(e->s);
+     jsval reason = INT_TO_JSVAL(e->r);
+     jsval ts = INT_TO_JSVAL(e->ts);
+     jsval tus = INT_TO_JSVAL(e->tus);
+     jsval filename = STRING_TO_JSVAL(e->filename);
+     jsval lineno = INT_TO_JSVAL(e->lineno);
+     if (!JS_SetProperty(cx, x, "state", &state))
+         return JS_FALSE;
+     if (!JS_SetProperty(cx, x, "reason", &reason))
+         return JS_FALSE;
+     if (!JS_SetProperty(cx, x, "ts", &ts))
+         return JS_FALSE;
+     if (!JS_SetProperty(cx, x, "tus", &tus))
+         return JS_FALSE;
+     if (!JS_SetProperty(cx, x, "filename", &filename))
+         return JS_FALSE;
+     if (!JS_SetProperty(cx, x, "lineno", &lineno))
+         return JS_FALSE;
+     *rval = OBJECT_TO_JSVAL(x);
+     return JS_TRUE;
+ }
+ static JSFunctionSpec ethogram_methods[] = {
+     {"addScript",    ethogram_addScript,    1},
+     {"getAllEvents", ethogram_getAllEvents, 0},
+     {"getNextEvent", ethogram_getNextEvent, 0},
+     {0}
+ };
+ /*
+  * An |Ethogram| organizes the output of a collection of files that should be
+  * monitored together. A single object gets events for the group.
+  */
+ JS_FRIEND_API(JSBool)
+ js_InitEthogram(JSContext *cx, JSObject *obj,
+                 uintN argc, jsval *argv, jsval *rval)
+ {
+     if (!traceVisScriptTable) {
+         traceVisScriptTable = JS_NewHashTable(8, JS_HashString, compare_strings,
+                                          NULL, NULL, NULL);
+     }
+     JS_InitClass(cx, JS_GetGlobalObject(cx), NULL, &ethogram_class,
+                  ethogram_construct, 0, NULL, ethogram_methods,
+                  NULL, NULL);
+     return JS_TRUE;
+ }
+ JS_FRIEND_API(JSBool)
+ js_ShutdownEthogram(JSContext *cx, JSObject *obj,
+                     uintN argc, jsval *argv, jsval *rval)
+ {
+     if (traceVisScriptTable)
+         JS_HashTableDestroy(traceVisScriptTable);
+     return JS_TRUE;
+ }
+ #endif /* MOZ_TRACEVIS */

 Legend:



Removed from v.506
 


changed lines


 
Added in v.507
 Legend:



Removed from v.506
 


changed lines


 
Added in v.507
-Removed from v.506
+Added in v.507

	ViewVC Help
Powered by ViewVC 1.1.24