2011-08-26 Pedro Alves <pedro@codesourcery.com>

	gdb/
	* common/linux-osdata.c (get_cores_used_by_process): Don't assume
	opening /proc/PID/task always succeeds.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5179af7f4ade57e2904cf39a2559dec588b8e3b2..140b3c68ba341a9d0c9349ab52b40b720321ef71 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-26  Pedro Alves  <pedro@codesourcery.com>
+
+       * common/linux-osdata.c (get_cores_used_by_process): Don't assume
+       opening /proc/PID/task always succeeds.
+
 2011-08-26  Aleksandar Ristovski <aristovski@qnx.com>
 
        * linespec.c (symtab_from_filename): Check for the end of string.

diff --git a/gdb/common/linux-osdata.c b/gdb/common/linux-osdata.c
index 78659d4d947e9d3c3f97f0c745f31836b17d0fdc..a356bb86d36ff4de7802eaba34ec21c267037d5b 100644 (file)
--- a/gdb/common/linux-osdata.c
+++ b/gdb/common/linux-osdata.c
@@ -259,27 +259,29 @@ get_cores_used_by_process (pid_t pid, int *cores)
 
   sprintf (taskdir, "/proc/%d/task", pid);
   dir = opendir (taskdir);
-
-  while ((dp = readdir (dir)) != NULL)
+  if (dir)
     {
-      pid_t tid;
-      int core;
+      while ((dp = readdir (dir)) != NULL)
+       {
+         pid_t tid;
+         int core;
 
-      if (!isdigit (dp->d_name[0])
-         || NAMELEN (dp) > sizeof ("4294967295") - 1)
-       continue;
+         if (!isdigit (dp->d_name[0])
+             || NAMELEN (dp) > sizeof ("4294967295") - 1)
+           continue;
 
-      tid = atoi (dp->d_name);
-      core = linux_common_core_of_thread (ptid_build (pid, tid, 0));
+         tid = atoi (dp->d_name);
+         core = linux_common_core_of_thread (ptid_build (pid, tid, 0));
 
-      if (core >= 0)
-       {
-         ++cores[core];
-         ++task_count;
+         if (core >= 0)
+           {
+             ++cores[core];
+             ++task_count;
+           }
        }
-    }
 
-  closedir (dir);
+      closedir (dir);
+    }
 
   return task_count;
 }