Skip to content

Commit 89dc0cc

Browse files
Make tracing trait opt-out via env only
1 parent 86085f3 commit 89dc0cc

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
SWIFT_SDK_ID ?=
2+
ifeq ($(JAVASCRIPTKIT_DISABLE_TRACING_TRAIT),1)
3+
TRACING_ARGS :=
4+
else
5+
TRACING_ARGS := --traits Tracing
6+
endif
27

38
.PHONY: bootstrap
49
bootstrap:
@@ -11,11 +16,6 @@ unittest:
1116
echo "SWIFT_SDK_ID is not set. Run 'swift sdk list' and pass a matching SDK, e.g. 'make unittest SWIFT_SDK_ID=<id>'."; \
1217
exit 2; \
1318
}
14-
ifeq ($(JAVASCRIPTKIT_DISABLE_TRACING_TRAIT),1)
15-
TRACING_ARGS :=
16-
else
17-
TRACING_ARGS := --traits Tracing
18-
endif
1919
env JAVASCRIPTKIT_EXPERIMENTAL_BRIDGEJS=1 swift package --swift-sdk "$(SWIFT_SDK_ID)" \
2020
$(TRACING_ARGS) \
2121
--disable-sandbox \

Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,18 +338,18 @@ func _call_host_function_impl(
338338
guard let entry = JSClosure.sharedClosures.wrappedValue[hostFuncRef] else {
339339
return true
340340
}
341-
#if Tracing
341+
#if Tracing
342342
let traceEnd = JSTracingHooks.beginJSClosureCall(
343343
JSTracing.JSClosureCallInfo(fileID: entry.fileID, line: UInt(entry.line))
344344
)
345-
#endif
345+
#endif
346346
var arguments: [JSValue] = []
347347
for i in 0..<Int(argc) {
348348
arguments.append(argv[i].jsValue)
349349
}
350-
#if Tracing
350+
#if Tracing
351351
defer { traceEnd?() }
352-
#endif
352+
#endif
353353
let result = entry.body(arguments)
354354
let callbackFuncRef = JSObject(id: callbackFuncRef)
355355
_ = callbackFuncRef(result)

0 commit comments

Comments
 (0)