fix: #1690 unable to identify shebang when it has initial spaces #1696
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
namhyung
reviewed
May 10, 2023
There was a problem hiding this comment.
Can you please squash the commits into one and rewrite the commit message like this?
record: skip whitespaces after shebang for scripts
Python tracing won't work when the shebang line has a space like below:
#! /usr/bin/python3
Fixed: #1690
Signed-off-by: ...
cmds/record.c
Outdated
| @@ -19,6 +19,7 @@ | |||
| #include <sys/wait.h> | |||
| #include <unistd.h> | |||
|
|
|||
| #include "libtraceevent/event-utils.h" | |||
There was a problem hiding this comment.
I don't want to include libtraceevent headers just because of this. Maybe we can implement strim() instead.
There was a problem hiding this comment.
will do this tonight
of course |
gcc -std=gnu11 -D_GNU_SOURCE -iquote /localdisk/uftrace -iquote /localdisk/uftrace \
-iquote /localdisk/uftrace/arch/x86_64 -Wdeclaration-after-statement -W -Wall \
-Wno-unused-parameter -Wno-missing-field-initializers -O0 -g3 -DDEBUG_MODE=1 \
-DHAVE_CXA_DEMANGLE -DHAVE_LIBPYTHON3 -I/usr/include/python3.6m \
-DLIBPYTHON_VERSION=3.6 -DHAVE_PERF_CLOCKID -DHAVE_PERF_CTXSW -DHAVE_LIBNCURSES \
-DHAVE_LIBELF -DHAVE_LIBDW -DHAVE_LIBUNWIND -DHAVE_LIBCAPSTONE -I/usr/include/capstone \
-fPIC -c -o /localdisk/uftrace/python/trace-python.op /localdisk/uftrace/python/trace-python.c
/localdisk/uftrace/python/trace-python.c: In function ‘get_python_funcname’:
/localdisk/uftrace/python/trace-python.c:760:7: warning: ‘main’ is usually a function [-Wmain]
bool main = false;
^
Reported-by: Clément Guidi <[email protected]>
Signed-off-by: Namhyung Kim <[email protected]>
It should return NULL if it fails to get the symbol address. And it needs to check the return value before using symbol. Signed-off-by: Namhyung Kim <[email protected]>
C functions get the code object from the argument not from the frame. Also it overwrote the code after getting the reference. Signed-off-by: Namhyung Kim <[email protected]>
It keeps the code objects to find a matching symbol for the given function. Let's handle them properly for GC to check references. Likewise, it should clear the reference in the tp_clear callback. Signed-off-by: Namhyung Kim <[email protected]>
Python tracing won't work when the shebang line has a space like below:
#! /usr/bin/python3
Fixed: #1690
Signed-off-by: yihong0618 <[email protected]>
|
Next time, you can reuse this PR instead of creating a new one. You don't need to create a new PR whenever you update the code. Just force-push is fine. |
|
copy that, thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix: #1690
Signed-off-by: yihong0618 [email protected]