From 411ac7c27241d2248031875e40eefeec1b546a1c Mon Sep 17 00:00:00 2001 From: Luca Marturana Date: Thu, 10 Nov 2016 11:36:35 -0800 Subject: [PATCH] Use main_thread for set_cwd/get_cwd --- userspace/libsinsp/threadinfo.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/userspace/libsinsp/threadinfo.cpp b/userspace/libsinsp/threadinfo.cpp index 8d02da35c4..1aeb98813b 100644 --- a/userspace/libsinsp/threadinfo.cpp +++ b/userspace/libsinsp/threadinfo.cpp @@ -630,7 +630,12 @@ sinsp_threadinfo* sinsp_threadinfo::get_cwd_root() string sinsp_threadinfo::get_cwd() { - sinsp_threadinfo* tinfo = get_cwd_root(); + // Ideally we should use get_cwd_root() + // but scap does not read CLONE_FS from /proc + // Also glibc and muslc use always + // CLONE_THREAD|CLONE_FS so let's use + // get_main_thread() for now + sinsp_threadinfo* tinfo = get_main_thread(); if(tinfo) { @@ -646,7 +651,7 @@ string sinsp_threadinfo::get_cwd() void sinsp_threadinfo::set_cwd(const char* cwd, uint32_t cwdlen) { char tpath[SCAP_MAX_PATH_SIZE]; - sinsp_threadinfo* tinfo = get_cwd_root(); + sinsp_threadinfo* tinfo = get_main_thread(); if(tinfo) {