uproctrace

@@ -5,8 +5,25 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -fPIC")

 enable_testing()

-add_subdirectory(dump)

+add_custom_command(

+  OUTPUT

+  ${CMAKE_CURRENT_BINARY_DIR}/exports

+  DEPENDS

+  ${CMAKE_CURRENT_SOURCE_DIR}/exports

+  COMMAND

+  cp -a ${CMAKE_CURRENT_SOURCE_DIR}/exports ${CMAKE_CURRENT_BINARY_DIR}/exports

+)

+

+add_custom_target(

+  copy_exports

+  ALL

+  DEPENDS

+  exports

+)

+

 add_subdirectory(libuptev)

 add_subdirectory(libuptpl)

+add_subdirectory(python3)

+add_subdirectory(upt-dump)

 add_subdirectory(upt-trace)

 add_subdirectory(tests)

@@ -50,6 +50,12 @@ Run tests:

 ctest

 ```

+Set up for direct usage from build directory (to be done in each shell):

+

+```

+source exports

+```

+

 ## Tracing Applications

 To trace an application, prefix the command with `upt-trace` and the

@@ -59,12 +65,12 @@ file name for the trace.  For example, to trace the command

 ```

 run the following command:

 ```

-<build dir>/bin/upt-trace mytrace.proto /usr/bin/printf "trace me"

+upt-trace mytrace.proto /usr/bin/printf "trace me"

 ```

 To show the recorded events, run:

 ```

-<build dir>/dump/dump.py mytrace.proto

+upt-dump mytrace.proto

 ```

 ## Example: Trace Build Process

@@ -77,7 +83,7 @@ Change to the build directory.

 Start a new shell to be traced:

 ```

-bin/upt-trace mytrace.proto bash

+upt-trace mytrace.proto bash

 ```

 Configure another build directory for this tracing example and run the build:

@@ -97,6 +103,6 @@ exit

 Show traced information:

 ```

-dump/dump.py mytrace.proto

+upt-dump mytrace.proto

 ```

@@ -1,27 +0,0 @@

-add_custom_command(

-  OUTPUT

-  ${CMAKE_CURRENT_BINARY_DIR}/uproctrace_pb2.py

-  DEPENDS

-  ${CMAKE_SOURCE_DIR}/uproctrace.proto

-  COMMAND

-  protoc --proto_path ${CMAKE_SOURCE_DIR}

-         --python_out ${CMAKE_CURRENT_BINARY_DIR}

-         uproctrace.proto

-)

-

-add_custom_command(

-  OUTPUT

-  ${CMAKE_CURRENT_BINARY_DIR}/dump.py

-  DEPENDS

-  ${CMAKE_CURRENT_SOURCE_DIR}/dump.py

-  COMMAND

-  cp -a ${CMAKE_CURRENT_SOURCE_DIR}/dump.py ${CMAKE_CURRENT_BINARY_DIR}/dump.py

-)

-

-add_custom_target(

-  dump

-  ALL

-  DEPENDS

-  ${CMAKE_CURRENT_BINARY_DIR}/uproctrace_pb2.py

-  ${CMAKE_CURRENT_BINARY_DIR}/dump.py

-)

@@ -0,0 +1,8 @@

+if [[ -z ${BASH_SOURCE[0]:-} ]]

+then

+  echo "BASH_SOURCE is not net, unsupported shell" >&2

+  return 2

+fi

+export UPT_HOME="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"

+export PATH="$UPT_HOME/bin${PATH:+:${PATH}}"

+export PYTHONPATH="$UPT_HOME/python3${PYTHONPATH:+:${PYTHONPATH}}"

@@ -0,0 +1 @@

+add_subdirectory(uproctrace)

@@ -0,0 +1,35 @@

+add_custom_command(

+  OUTPUT

+  ${CMAKE_CURRENT_BINARY_DIR}/uproctrace_pb2.py

+  DEPENDS

+  ${CMAKE_SOURCE_DIR}/uproctrace.proto

+  COMMAND

+  protoc --proto_path ${CMAKE_SOURCE_DIR}

+         --python_out ${CMAKE_CURRENT_BINARY_DIR}

+         uproctrace.proto

+)

+

+function(pyfile NAME)

+  add_custom_command(

+    OUTPUT

+    ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.py

+    DEPENDS

+    ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}.py

+    COMMAND

+    cp -a ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}.py

+          ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.py

+  )

+  list(APPEND PYFILES ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.py)

+  set(PYFILES ${PYFILES} PARENT_SCOPE)

+endfunction(pyfile)

+

+pyfile(__init__)

+pyfile(dump)

+

+add_custom_target(

+  python3_uproctrace

+  ALL

+  DEPENDS

+  ${CMAKE_CURRENT_BINARY_DIR}/uproctrace_pb2.py

+  ${PYFILES}

+)

@@ -1,18 +1,12 @@

-#! /usr/bin/env python3

-

-import argparse

-import uproctrace_pb2

+import uproctrace.uproctrace_pb2 as pb2

 import struct

-def parse_args():

-    parser = argparse.ArgumentParser(description='dump uproctrace trace')

-    parser.add_argument('trace', help='trace file')

-    args = parser.parse_args()

-    return args

-

-

-def dump_event(f):

+def dump_event(f, out):

+    """

+    Read the first event from f and dump it to out.

+    Return True if an event could be found and dumped, False otherwise.

+    """

     # skip till after magic

     magic = f.read(4)

     while magic != b'upt0':

@@ -29,22 +23,11 @@ def dump_event(f):

     if len(data) < size:

         return False  # EOF

     # unpack event

-    event = uproctrace_pb2.event.FromString(data)

+    event = pb2.event.FromString(data)

     # dump event

-    print('event {')

+    print('event {', file=out)

     for line in repr(event).split('\n'):

         if line != '':

-            print('  ' + line)

-    print('}')

+            print('  ' + line, file=out)

+    print('}', file=out)

     return True

-

-

-def main():

-    args = parse_args()

-    with open(args.trace, 'rb') as f:

-        while dump_event(f):

-            pass

-

-

-if __name__ == '__main__':

-    main()

@@ -11,12 +11,14 @@ UPT_HOME="$1"

 SCRIPT_DIR="$(dirname "$0")"

+source "$UPT_HOME/exports"

+

 rm -rf out.proto

-"$UPT_HOME/bin/upt-trace" out.proto "$SCRIPT_DIR/traceme.bash"

+upt-trace out.proto "$SCRIPT_DIR/traceme.bash"

 ls -l out.proto

-"$UPT_HOME/dump/dump.py" out.proto | tee out.dump

+upt-dump out.proto | tee out.dump

 grep '^ *event *{ *$' out.dump | wc -l | tee out.event_cnt

 grep '^6$' out.event_cnt

@@ -12,13 +12,15 @@ UPT_HOME="$(readlink -f "$2")"

 SCRIPT_DIR="$(dirname "$0")"

+source "$UPT_HOME/exports"

+

 rm -rf out.proto build

-"$UPT_HOME/bin/upt-trace" out.proto "$SCRIPT_DIR/run_build.bash" "$SOURCE_DIR"

+upt-trace out.proto "$SCRIPT_DIR/run_build.bash" "$SOURCE_DIR"

 ls -l out.proto

-"$UPT_HOME/dump/dump.py" out.proto | tee out.dump

+upt-dump out.proto | tee out.dump

 grep -A 1 '^ *cmdline {$' out.dump | grep '^ *s: "mkdir"$'

 grep '^ *s: "proc_begin.c"$' out.dump

 grep '^ *s: "libuptpl.so"$' out.dump

@@ -0,0 +1,16 @@

+add_custom_command(

+  OUTPUT

+  ${CMAKE_BINARY_DIR}/bin/upt-dump

+  DEPENDS

+  ${CMAKE_CURRENT_SOURCE_DIR}/upt-dump.py

+  COMMAND

+  cp -a ${CMAKE_CURRENT_SOURCE_DIR}/upt-dump.py

+        ${CMAKE_BINARY_DIR}/bin/upt-dump

+)

+

+add_custom_target(

+  upt-dump

+  ALL

+  DEPENDS

+  ${CMAKE_BINARY_DIR}/bin/upt-dump

+)

@@ -0,0 +1,23 @@

+#! /usr/bin/env python3

+

+import argparse

+import sys

+import uproctrace.dump

+

+

+def parse_args():

+    parser = argparse.ArgumentParser(description='dump uproctrace trace')

+    parser.add_argument('trace', help='trace file')

+    args = parser.parse_args()

+    return args

+

+

+def main():

+    args = parse_args()

+    with open(args.trace, 'rb') as f:

+        while uproctrace.dump.dump_event(f, sys.stdout):

+            pass

+

+

+if __name__ == '__main__':

+    main()