← Back to branch summary

~ubuntu-branches/ubuntu/trusty/htop/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch

  • Committer: Bazaar Package Importer
  • Author(s): Eugene V. Lyubimkin
  • Date: 2009-04-05 11:51:34 UTC
  • mfrom: (1.1.13 upstream) (7.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090405115134-xyuzxp308k5qos0k
Tags: 0.8.1+svn149-1
http://bugs.debian.org/521861
* New upstream development snapshot:
  - Allow building withough PLPA support. (Closes: #521861)
* debian/patches:
  - 010-make-desktop-file-valid.patch: deleted, merged upstream.
  - 100-upstream-sort-by-processor-and-session.patch: deleted, merged
    upstream.
  - 110-upstream-fix-page-size-on-BSD.patch: deleted, merged upstream.
  - 120-upstream-explain-cpu-bars-in-monochrome-mode.patch: deleted, merged
    upstream.
  - 200-filter-non-printable-characters.patch: deleted, upstream has own
    version of this patch.
  - 610-rename-veid-to-ctid.patch: deleted, merged upstream.
  - 600-openvz-veid-on-kernels-gt-2.6.18.patch: refreshed.
  - 800-tree-view-without-userland-threads.patch: deleted, merged upstream.
  - 700-ltrace-support.patch: refreshed, added the description.
* debian/rules:
  - Deal more robustly with config.{sub,guess} files, thanks to Roger Leigh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/600-openvz-veid-on-kernels-gt-2.6.18.patch
1
 
diff -Naur htop-0.8.1.orig/ProcessList.c htop-0.8.1/ProcessList.c
2
 
--- htop-0.8.1.orig/ProcessList.c       2008-09-23 08:23:14.000000000 +0200
3
 
+++ htop-0.8.1/ProcessList.c    2009-02-24 00:09:37.000000000 +0100
4
 
@@ -625,20 +625,28 @@
 
1
Fix determining OpenVZ VEID on Linux kernels >= 2.6.18.
 
2
Index: htop/ProcessList.c
 
3
===================================================================
 
4
--- htop.orig/ProcessList.c     2009-04-05 11:48:46.340045591 +0300
 
5
+++ htop/ProcessList.c  2009-04-05 12:22:08.819047243 +0300
 
6
@@ -623,20 +623,28 @@
5
7
                process->vpid = process->pid;
6
 
                process->veid = 0;
 
8
                process->ctid = 0;
7
9
             } else {
8
10
-               snprintf(statusfilename, MAX_NAME, "%s/%s/stat", dirname, name);
9
11
+               snprintf(statusfilename, MAX_NAME, "%s/%s/status", dirname, name);
17
19
-                  "%*u %*u %*u %*u %*u %*u %*u %*u "
18
20
-                  "%*u %*u %*u %*u %*u %*u %*u %*u "
19
21
-                  "%*u %*u %*u %*u %*u %*u %*u "
20
 
-                  "%u %u",
21
 
-                  &process->vpid, &process->veid);
 
22
-                  "%*u %*u %u %u",
 
23
-                  &process->vpid, &process->ctid);
22
24
-               fclose(status);
23
 
+               else {
24
 
+                  char buffer[256];
25
 
+                  process->veid = 0;
26
 
+                  while (!feof(status)) {
27
 
+                     char* ok = fgets(buffer, 255, status);
28
 
+                     if (!ok)
29
 
+                        break;
 
25
+                          else {
 
26
+                                  char buffer[256];
 
27
+                                  process->ctid = 0;
 
28
+                                  while (!feof(status)) {
 
29
+                                          char* ok = fgets(buffer, 255, status);
 
30
+                                          if (!ok)
 
31
+                                                  break;
30
32
+
31
 
+                     if (String_startsWith(buffer, "envID:")) {
32
 
+                        int veid;
33
 
+                        int ok = ProcessList_read(this, buffer, "envID:\t%d", &veid);
34
 
+                        if (ok >= 1) {
35
 
+                           process->veid = veid;
36
 
+                        }
37
 
+                     }
38
 
+                  }
39
 
+                  fclose(status);
40
 
+               }
 
33
+                                          if (String_startsWith(buffer, "envID:")) {
 
34
+                                                  int ctid;
 
35
+                                                  int ok = ProcessList_read(this, buffer, "envID:\t%d", &ctid);
 
36
+                                                  if (ok >= 1) {
 
37
+                                                          process->ctid = ctid;
 
38
+                                                  }
 
39
+                                          }
 
40
+                                  }
 
41
+                                  fclose(status);
 
42
+                          }
41
43
             }
42
44
             #endif
43
45