summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-08 22:57:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-08 22:57:00 (GMT)
commit63572ac935b2a961b916e80da1efb67e2dfb5cf5 (patch)
treeb6be99dcea71575a9bee4300231364bcf6ad547a /generic
parentf1e390fc29f2b6d8bb7d6157c6a70ce42cbba762 (diff)
parenta89d11864715181fa74000e72b692e93faa1b7d5 (diff)
downloadtcl-63572ac935b2a961b916e80da1efb67e2dfb5cf5.zip
tcl-63572ac935b2a961b916e80da1efb67e2dfb5cf5.tar.gz
tcl-63572ac935b2a961b916e80da1efb67e2dfb5cf5.tar.bz2
merge
Diffstat (limited to 'generic')
-rw-r--r--generic/tclBasic.c6
-rw-r--r--generic/tclIORChan.c2
-rw-r--r--generic/tclIORTrans.c2
-rw-r--r--generic/tclProc.c10
4 files changed, 15 insertions, 5 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 5100dd9..20cb1ad 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4230,6 +4230,8 @@ TclNREvalObjv(
}
}
+
+#ifdef USE_DTRACE
if (TCL_DTRACE_CMD_ARGS_ENABLED()) {
const char *a[10];
int i = 0;
@@ -4255,7 +4257,7 @@ TclNREvalObjv(
TCL_DTRACE_CMD_ENTRY(TclGetString(objv[0]), objc - 1,
(Tcl_Obj **)(objv + 1));
}
-
+#endif /* USE_DTRACE */
/*
* Fix the original callback to point to the now known cmdPtr. Insure that
* the Command struct lives until the command returns.
@@ -8109,6 +8111,7 @@ Tcl_NRCallObjProc(
int result = TCL_OK;
NRE_callback *rootPtr = TOP_CB(interp);
+#ifdef USE_DTRACE
if (TCL_DTRACE_CMD_ARGS_ENABLED()) {
const char *a[10];
int i = 0;
@@ -8135,6 +8138,7 @@ Tcl_NRCallObjProc(
TCL_DTRACE_CMD_ENTRY(TclGetString(objv[0]), objc - 1,
(Tcl_Obj **)(objv + 1));
}
+#endif /* USE_DTRACE */
result = objProc(clientData, interp, objc, objv);
return TclNRRunCallbacks(interp, result, rootPtr);
}
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index 3b50665..3751d6c 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -2689,7 +2689,6 @@ ForwardOpToOwnerThread(
Tcl_ThreadId dst = rcPtr->thread;
ForwardingEvent *evPtr;
ForwardingResult *resultPtr;
- int result;
/*
* We gather the lock early. This allows us to check the liveness of the
@@ -2793,7 +2792,6 @@ ForwardOpToOwnerThread(
Tcl_DeleteThreadExitHandler(SrcExitProc, evPtr);
- result = resultPtr->result;
ckfree((char *) resultPtr);
}
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c
index fd645f7..f888bde 100644
--- a/generic/tclIORTrans.c
+++ b/generic/tclIORTrans.c
@@ -2358,7 +2358,6 @@ ForwardOpToOwnerThread(
Tcl_ThreadId dst = rtPtr->thread;
ForwardingEvent *evPtr;
ForwardingResult *resultPtr;
- int result;
/*
* We gather the lock early. This allows us to check the liveness of the
@@ -2462,7 +2461,6 @@ ForwardOpToOwnerThread(
Tcl_DeleteThreadExitHandler(SrcExitProc, evPtr);
- result = resultPtr->result;
ckfree((char*) resultPtr);
}
diff --git a/generic/tclProc.c b/generic/tclProc.c
index d33d063..bf46a5d 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -1769,6 +1769,7 @@ TclNRInterpProcCore(
}
#endif /*TCL_COMPILE_DEBUG*/
+#ifdef USE_DTRACE
if (TCL_DTRACE_PROC_ARGS_ENABLED()) {
int l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
const char *a[10];
@@ -1798,6 +1799,15 @@ TclNRInterpProcCore(
iPtr->varFramePtr->objc - l - 1,
(Tcl_Obj **)(iPtr->varFramePtr->objv + l + 1));
}
+ if (TCL_DTRACE_PROC_ENTRY_ENABLED()) {
+ int l = iPtr->varFramePtr->isProcCallFrame & FRAME_IS_LAMBDA ? 1 : 0;
+
+ TCL_DTRACE_PROC_ENTRY(l < iPtr->varFramePtr->objc ?
+ TclGetString(iPtr->varFramePtr->objv[l]) : NULL,
+ iPtr->varFramePtr->objc - l - 1,
+ (Tcl_Obj **)(iPtr->varFramePtr->objv + l + 1));
+ }
+#endif /* USE_DTRACE */
/*
* Invoke the commands in the procedure's body.