Use main_thread for set_cwd/get_cwd

Luca Marturana · luca3m · commit 411ac7c27241 · 2016-11-10T14:37:56.000-08:00
diff --git 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)
 	{

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,12 @@ sinsp_threadinfo* sinsp_threadinfo::get_cwd_root()`
`630`	`630`
`631`	`631`	`string sinsp_threadinfo::get_cwd()`
`632`	`632`	`{`
`633`		`- sinsp_threadinfo* tinfo = get_cwd_root();`
	`633`	`+ // Ideally we should use get_cwd_root()`
	`634`	`+ // but scap does not read CLONE_FS from /proc`
	`635`	`+ // Also glibc and muslc use always`
	`636`	`+ // CLONE_THREAD\|CLONE_FS so let's use`
	`637`	`+ // get_main_thread() for now`
	`638`	`+ sinsp_threadinfo* tinfo = get_main_thread();`
`634`	`639`
`635`	`640`	`if(tinfo)`
`636`	`641`	`{`
`@@ -646,7 +651,7 @@ string sinsp_threadinfo::get_cwd()`
`646`	`651`	`void sinsp_threadinfo::set_cwd(const char* cwd, uint32_t cwdlen)`
`647`	`652`	`{`
`648`	`653`	`char tpath[SCAP_MAX_PATH_SIZE];`
`649`		`- sinsp_threadinfo* tinfo = get_cwd_root();`
	`654`	`+ sinsp_threadinfo* tinfo = get_main_thread();`
`650`	`655`
`651`	`656`	`if(tinfo)`
`652`	`657`	`{`