components/desktop/mate/mate-applets/patches/01-make-multiload-network-available.patch

   1
   2 Modified this patch to
   3 - add the /src/ directory into the path, for the source reorganization
   4   at 1.25.x
   5 - move the netlist.flags = 1; chunk to
   6   02-make-multiload-network-available-part2.patch because of changes to
   7   that section of the file.
   8
   9 --- mate-applets-1.26.1/multiload/src/linux-proc.c.orig
  10 +++ mate-applets-1.26.1/multiload/src/linux-proc.c
  11 @@ -153,6 +153,13 @@
  12      }
  13      else
  14      {
  15 +
  16 +        /*
  17 +          At the moment, Solaris can't get the read/write information for filesystem
  18 +          so we would like to use disk to get them, later when some unstable interfaces
  19 +          become stable or public, will use them
  20 +        */
  21 +        /*
  22          glibtop_mountlist mountlist;
  23          glibtop_mountentry *mountentries;
  24
  25 @@ -182,6 +189,10 @@
  26          }
  27
  28          g_free(mountentries);
  29 +        */
  30 +        glibtop_fsusage fsusage;
  31 +        glibtop_get_fsusage(&fsusage,"/"); /* "/" will not use, just as a input */
  32 +        read = fsusage.read; write = fsusage.write;
  33      }
  34
  35      readdiff  = read - lastread;
  36 @@ -381,7 +392,12 @@
  37
  38          glibtop_get_netload(&netload, devices[i]);
  39
  40 -        g_return_if_fail((netload.flags & needed_netload_flags) == needed_netload_flags);
  41 +        /* this is not correct, because after run get netlist, there are lots of net devices,
  42 +           not all of them meet the requirement of needed_netload_flags, but we don't need to
  43 +           exit, we can just ignore them, and try to continue with the next one */
  44 +        if ((netload.flags & needed_netload_flags) != needed_netload_flags)
  45 +            continue;
  46 +
  47
  48          if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
  49              continue;