patches/gnome-applets-03-make-multiload-network-available.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 8937 580bdff6b114
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8937
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
     1
--- gnome-applets-2.17.1/multiload/linux-proc.c	2006-12-31 10:07:39.000000000 +0800
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
     2
+++ gnome-applets-2.17.1.mod/multiload/linux-proc.c	2007-01-09 19:15:24.881474000 +0800
8181
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
     3
@@ -115,6 +115,13 @@ GetDiskLoad (int Maximum, int data [3], 
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
     4
 
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
     5
 	read = write = 0;
7953
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
     6
 
8181
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
     7
+
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
     8
+        /*
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
     9
+          At the moment, Solaris can't get the read/write information for filesystem
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    10
+          so we would like to use disk to get them, later when some unstable interfaces
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    11
+          become statble or public, will use them
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    12
+        */
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    13
+        /*
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    14
 	mountentries = glibtop_get_mountlist (&mountlist, FALSE);
7953
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
    15
 
8181
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    16
 	for (i = 0; i < mountlist.number; i++)
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    17
@@ -131,6 +138,10 @@ GetDiskLoad (int Maximum, int data [3], 
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    18
 	}
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    19
 
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    20
 	g_free(mountentries);
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    21
+        */
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    22
+        glibtop_fsusage fsusage;
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    23
+        glibtop_get_fsusage(&fsusage,"/"); /* "/" will not use, just as a input */
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    24
+        read = fsusage.read; write = fsusage.write;
7953
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset
    25
 
8181
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    26
 	readdiff  = read - lastread;
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    27
 	writediff = write - lastwrite;
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    28
@@ -300,7 +311,7 @@ GetNet (int Maximum, int data [5], LoadG
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    29
 	autoscaler_init(&scaler, 60, 501);
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    30
     }
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    31
 
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    32
-
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    33
+    netlist.flags = 1;
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    34
     devices = glibtop_get_netlist(&netlist);
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    35
 
4565c28a04fd 2006-09-22 Henry Zhang <[email protected]>
hz159841
parents: 8155
diff changeset
    36
     for(i = 0; i < netlist.number; ++i)
8937
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    37
@@ -310,7 +321,12 @@ GetNet (int Maximum, int data [5], LoadG
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    38
 
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    39
 	glibtop_get_netload(&netload, devices[i]);
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    40
 
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    41
-	g_return_if_fail((netload.flags & needed_netload_flags) == needed_netload_flags);
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    42
+        /* this is not correct, because after run get netlist, there are lots of net devices,
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    43
+           not all of them meet the requirement of needed_netload_flags, but we don't need to
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    44
+           exit, we can just ignore them, and try to continue with the next one */
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    45
+        if ((netload.flags & needed_netload_flags) != needed_netload_flags)
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    46
+            continue;
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    47
+
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    48
 
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    49
 	if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
580bdff6b114 +2007-01-09 Henry Zhang <[email protected]>
henryz
parents: 8904
diff changeset
    50
 	    continue;