handle exit only for main thread

.github/workflows/test.yml

@@ -1,12 +1,9 @@
 name: test
 
 on:
-  push:
+  pull_request:
     branches:
       - "**"
-      - "!dependabot/**"
-  pull_request:
-    branches: [master]
   workflow_call:
 
 jobs:

e2e/examples/lock.rs

@@ -38,4 +38,5 @@ fn main() {
             state.inc(sleep_duration);
         });
     });
+    sleep(sleep_duration);
 }

e2e/src/main.rs

@@ -145,12 +145,10 @@ impl Locker {
 
         let rst = OffcpuDataFrame(dfctx.sql(&query).await.unwrap().collect().await.unwrap());
 
-        // find task with tgid == pid, offcpu >= 2 * sleep_after_lock and futex_wait in stacks
-        let parent = rst.iter().find(|item| {
-            item.tgid == item.pid
-                && item.offcpu >= 2 * self.sleep_after_lock
-                && item.stacks().any(|stack| stack.contains("futex_wait"))
-        });
+        // find task with tgid == pid and futex_wait in stacks
+        let parent = rst
+            .iter()
+            .find(|item| item.tgid == item.pid && item.stacks().any(|stack| stack.contains("futex_wait")));
         assert!(
             parent.is_some(),
             "parent events always should wait for 2 sleep durations for child threads"
@@ -165,14 +163,14 @@ impl Locker {
             })
             .count();
         assert_eq!(nanosleeps, 2, "two threads should wait in nanosleep for sleep duration");
-        // find 3 tasks with do_exit stack and 0 offcpu
+        // find 2 tasks with do_exit stack and 0 offcpu
         let exits = rst
             .iter()
             .filter(|item| {
                 item.stacks().any(|stack| stack.contains("do_exit")) && item.offcpu == Duration::from_nanos(0)
             })
             .count();
-        assert_eq!(exits, 3, "three threads should exit");
+        assert!(exits >= 2, "should capture childs atleast 2 exits, found {}", exits);
     }
 }
 

past/src/bpf/past.bpf.c

@@ -259,6 +259,10 @@ SEC("tp_btf/sched_process_exit")
 int handle__sched_process_exit(u64 *ctx)
 {
     struct task_struct *p = (void *)ctx[0];
+    if (p->tgid != p->pid) 
+    {
+        return 0;
+    }
     u64 tgid = p->tgid;
     if (apply_tgid_filter(tgid) > 0)
     {
@@ -281,6 +285,10 @@ SEC("tp_btf/sched_process_exec")
 int handle__sched_process_exec(u64 *ctx)
 {
     struct task_struct *p = (void *)ctx[0];
+    if (p->tgid != p->pid) 
+    {
+        return 0;
+    }
     if (apply_filters(p) > 0)
     {
         return 0;