Attachment #37030 for bug #59096

View | Details | Raw Unified | Return to bug 59096
Collapse All | Expand All

Lines 6-13 Link Here

(-)gdesklets/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= gdesklets	8	PORTNAME= gdesklets
9	PORTVERSION= 0.23	9	PORTVERSION= 0.24
10	PORTREVISION= 1
11	CATEGORIES= deskutils gnome	10	CATEGORIES= deskutils gnome
12	MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/	11	MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/
13	DISTNAME= gDesklets-${PORTVERSION}	12	DISTNAME= gDesklets-${PORTVERSION}
Lines 16-21 Link Here
16	COMMENT= A framework for Gnome 2.x for desktop applets	15	COMMENT= A framework for Gnome 2.x for desktop applets
17		16
18	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2	17	BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
		18	LIB_DEPENDS= gtop-2.0.2:${PORTSDIR}/devel/libgtop2
19	RUN_DEPENDS= ${PYXML} \	19	RUN_DEPENDS= ${PYXML} \
20	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2	20	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
21		21

Line 1 Link Here

(-)gdesklets/distinfo (-1 / +1 lines)
1	MD5 (gDesklets-0.23.tar.bz2) = 14beb76893e1f7f8f90b8a0b37a6856a	1	MD5 (gDesklets-0.24.tar.bz2) = aa4fb8576bd9a98e95f78fbd1fba0ac3




# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
# help and create those patches.

--- libdesklets/CPU.py	Thu Nov  6 14:50:47 2003
+++ libdesklets/CPU.py	Sun Nov  9 01:34:27 2003
@@ -1,6 +1,8 @@
 import polling
 import glibtop
 
+import os
+import libdesklets as lib
 
 #
 # TODO: support SMP
@@ -35,20 +37,36 @@
 
         self.get_load = polling.wrap(self.__poll_load, 0.2)
 
+        platform = lib.sys.get_os()
+
         try:
-            fd = open("/proc/cpuinfo", "r")
+            if platform == "FreeBSD":
+                fd = os.popen("grep -3 CPU /var/run/dmesg.boot | head -7 | tail -4", "r")
+            elif platform == "Linux":
+                fd = open("/proc/cpuinfo", "r")
+            else:
+                print "Unknown OS, strange things may happen."
+                return
         except IOError, e:
             import traceback; traceback.print_exc()
             print e
@@ -40,15 +50,24 @@
 
     def __poll_cpu(self):
 
-        import libdesklets as lib
+        import re
 
-        fd = open("/proc/cpuinfo", "r")
+        platform = lib.sys.get_os()
+
+        if platform == "FreeBSD":
+            fd = os.popen("grep -3 CPU /var/run/dmesg.boot | head -7 | tail -4", "r")
+        elif platform == "Linux":
+            fd = open("/proc/cpuinfo", "r")
+        else:
+            print "Unknown OS, strange things may happen."
+            return
         lines = fd.readlines()
         fd.close()
 
         arch = lib.sys.get_arch()
         if (arch in ["i386", "i486", "i586", "i686"]):
-            fields = lines[4].split()
-            model_name = " ".join(fields[3:])
-            fields = lines[6].split()
-            cpu_mhz = fields[3]
-            fields = lines[7].split()
-            cpu_cache = " ".join(fields[3:5])
+            if ("FreeBSD" == platform):
+                m = re.search('^CPU: (.*) \(([0-9]+.*)-MHz [0-9]+-class CPU\)', lines[0])
+                model_name = m.group(1)           # or sysctl hw.model
+                cpu_mhz = m.group(2)              # or sysctl hw.clockrate
+                cpu_cache = " "                   # not available by default
+            elif ("Linux" == platform):
+                fields = lines[4].split()
+                model_name = " ".join(fields[3:])
+                fields = lines[6].split()
+                cpu_mhz = fields[3]
+                fields = lines[7].split()
+                cpu_cache = " ".join(fields[3:5])
+            else:
+                pass
 
         elif (arch == "ppc"):
             fields = lines[0].split()
@@ -68,17 +87,34 @@
 
     def __poll_load(self):
 
-        fd = open("/proc/stat", "r")
+        platform = lib.sys.get_os()
+
+        if ("FreeBSD" == platform):
+            fd = os.popen("iostat -n 0", "r")
+            line = 2
+        elif ("Linux" == platform):
+            fd = open("/proc/stat", "r")
+            line = 0
+        else:
+            return
         data = fd.read()
         fd.close()
 
         data = data.splitlines()
-        fields = data[0].split()
+        fields = data[line].split()
 
-        u = float(fields[1])
-        s = float(fields[2])
-        n = float(fields[3])
-        i = float(fields[4])
+        if ("FreeBSD" == platform):
+            u = float(fields[2]) + float(fields[3])
+            s = float(fields[4])
+            n = float(fields[5])
+            i = float(fields[6])
+        elif ("Linux" == platform):
+            u = float(fields[1])
+            s = float(fields[2])
+            n = float(fields[3])
+            i = float(fields[4])
+        else:
+            pass
 
         total = ((u - self.__uT) + (s - self.__sT) + (n - self.__nT) +
                 (i - self.__iT))




# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
# help and create those patches.

--- libdesklets/Disk.py.orig	Mon Sep 22 12:25:18 2003
+++ libdesklets/Disk.py	Mon Sep 22 12:28:28 2003
@@ -3,7 +3,7 @@
 import time
 import os
 import statvfs
-
+import libdesklets as lib
 
 class Disk:
 
@@ -19,21 +19,33 @@
 
     def __poll_partitions(self):
 
+        platform = lib.sys.get_os()
+
         # we don't have to reread the file if it hasn't changed
-        if (self.__partitions_last_read >= os.path.getmtime("/etc/mtab")):
+        if (platform == "Linux" and self.__partitions_last_read >= os.path.getmtime("/etc/mtab")):
             return self.__partitions
         else:
             self.__partitions_last_read = time.time()
 
         # /etc/mtab is more portable than /proc/mount, so we use it
-        fd = open("/etc/mtab", "r")
+        if (platform == "Linux"):
+            fd = open("/etc/mtab", "r")
+        else:
+            fd = os.popen("mount", "r")
         lines = fd.readlines()
         fd.close()
 
         partitions = []
         for l in lines:
             parts = l.split()
-            device, mpoint, fstype = parts[:3]
+            if (platform == "Linux"):
+                device, mpoint, fstype = parts[:3]
+            elif (platform == "FreeBSD"):
+                device = parts[0]
+                mpoint = parts[2]
+                import re
+                m = re.search('\(([a-zA-Z]+)[,)]', parts[3])
+                fstype = m.group(0)
             # FIXME: is this OK? it might be better to check if the device
             #        actually is a file in /dev
             if (fstype in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs"




# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
# help and create those patches.

--- libdesklets/Memory.py.orig	Fri Oct 17 22:57:33 2003
+++ libdesklets/Memory.py	Fri Oct 17 23:01:14 2003
@@ -1,7 +1,7 @@
 import polling
 
 import os, stat
-
+import libdesklets as lib
 
 class Memory:
 
@@ -16,41 +16,85 @@
 
     def __poll_total_ram(self):
 
-        memtotal = os.stat("/proc/kcore")[stat.ST_SIZE]
+        platform = lib.sys.get_os()
+        
+        if ("FreeBSD" == platform):
+            fd = os.popen("sysctl hw.physmem")
+            physmem = fd.readline()
+            fd.close()
+            lines = physmem.splitlines()
+            memtotal = int(lines[0].split()[1])
+        elif ("Linux" == platform):
+            memtotal = os.stat("/proc/kcore")[stat.ST_SIZE]
+        else:
+            memtotal = 0
+
         return memtotal
 
 
 
     def __poll_mem(self, mode):
 
-        fd = open("/proc/meminfo", "r")
-        mem = fd.read()
-        fd.close()
-        lines = mem.splitlines()
+        platform = lib.sys.get_os()
 
         # RAM
         if (mode == 0):
-            total = int(self.__get_total_ram()/1024)
-            for l in lines:
-                if (l.startswith("MemFree:")):
-                    value = l.split()
-                    free = int(value[1])
-                elif (l.startswith("Cached:")):
-                    value = l.split()
-                    free = free + int(value[1])
-                    break
-            used = total - free
+            if ("FreeBSD" == platform):
+                fd = os.popen("vmstat -n 0", "r")
+            elif ("Linux" == platform):
+                fd = open("/proc/meminfo", "r")
+            else:
+                return (0, 0)
+            mem = fd.read()
+            fd.close()
+            lines = mem.splitlines()
+
+            if ("FreeBSD" == platform):
+                # this may be larger than total, as this is the active virtual
+                # memory, not the active physical memory
+                used = int(lines[2].split()[3])/1024
+                total = int(self.__get_total_ram()/1024)
+            elif ("Linux" == platform):
+                total = int(self.__get_total_ram()/1024)
+                for l in lines:
+                    if (l.startswith("MemFree:")):
+                        value = l.split()
+                        free = int(value[1])
+                    elif (l.startswith("Cached:")):
+                        value = l.split()
+                        free = free + int(value[1])
+                        break
+                used = total - free
+            else:
+                pass
 
         # Swap
         elif (mode == 1):
-            for l in lines:
-                if (l.startswith("SwapTotal:")):
-                    value = l.split()
-                    total = int(value[1])
-                elif (l.startswith("SwapFree:")):
-                    value = l.split()
-                    free = int(value[1])
-                    break
-            used = total - free
+            if ("FreeBSD" == platform):
+                fd = os.popen("pstat -T", "r")
+            elif ("Linux" == platform):
+                fd = open("/proc/meminfo", "r")
+            else:
+                return (0, 0)
+            mem = fd.read()
+            fd.close()
+            lines = mem.splitlines()
+
+            if ("FreeBSD" == platform):
+                used, total = lines[1].split()[0].split("/")
+                used = int(used[0:-2]) * 1024 * 1024
+                total = int(total[0:-2]) * 1024 * 1024
+            elif ("Linux" == platform):
+                for l in lines:
+                    if (l.startswith("SwapTotal:")):
+                        value = l.split()
+                        total = int(value[1])
+                    elif (l.startswith("SwapFree:")):
+                        value = l.split()
+                        free = int(value[1])
+                        break
+                used = total - free
+            else:
+                pass
 
         return (total, used)




# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
# help and create those patches.

--- libdesklets/Network.py.orig	Sun Nov  9 00:52:39 2003
+++ libdesklets/Network.py	Sun Nov  9 00:53:05 2003
@@ -1,8 +1,8 @@
 import polling
 import glibtop
-
+import os
 import time
-
+import libdesklets as lib
 
 class Network:
 
@@ -27,21 +27,40 @@
 
     def __poll_devices(self):
 

-            l = lines.strip()
-            l = l.replace(":", " ")
-            fields = l.split()
-
-            if (fields[0] == "lo"):
-                continue
-            else:

+
+                if (fields[0] == "lo"):
+                    continue
+                else:
+                    device = fields[0]
+                    devices.append(device)
+            #end for
+        else:
+            pass
 
         return devices
 
@@ -48,14 +71,15 @@
 
     def __poll_ipaddr(self, dev):
 
-        data = commands.getoutput("/sbin/ifconfig " + dev)
-        lines = data.splitlines()
-        for l in lines:
+        fd = os.popen("/sbin/ifconfig " + dev, "r")
+        data = fd.readlines()
+        fd.close()
+        for l in data:
             l = l.strip()
             fields = l.split()
 
             if (fields[0] == "inet"):
-                return fields[1].split(":")[1]
+                return fields[1]
 
         return ("xxx.xxx.xxx.xxx")
 
@@ -63,6 +87,8 @@
 
     def __poll_in_out(self, dev):
 
+        platform = lib.sys.get_os()
+
         t = time.time()
         interval = t - self.__time
         self.__time = t
@@ -73,24 +99,40 @@
         speed_in = 0
         speed_out = 0
 
-        fd = open("/proc/net/dev", "r")
+        if ("FreeBSD" == platform):
+            fd = os.popen("netstat -b -I " + dev + " | grep Link", "r")
+        elif ("Linux" == platform):
+            fd = open("/proc/net/dev", "r")
+        else:
+            return (bytes_in, bytes_out, pack_in, pack_out, speed_in, speed_out)
         data = fd.read()
         fd.close()
         lines = data.splitlines()
 
         # look for the device
         found = 0
-        for l in lines:
-            l.strip()
-            l = l.replace(":", " ")
-            fields = l.split()
-            if (fields[0] == dev):
-                bytes_in, pack_in, bytes_out, pack_out = \
-                long(fields[1]), long(fields[2]), \
-                long(fields[9]), long(fields[10])
+        if ("FreeBSD" == platform):
+            for l in lines:
                 found = 1
+                fields = l.strip().split()
+                bytes_in, pack_in, bytes_out, pack_out = \
+                long(fields[6]), long(fields[4]), \
+                long(fields[9]), long(fields[7])
                 break
-        #end for
+        elif ("Linux" == platform):
+            for l in lines:
+                l.strip()
+                l = l.replace(":", " ")
+                fields = l.split()
+                if (fields[0] == dev):
+                    bytes_in, pack_in, bytes_out, pack_out = \
+                    long(fields[1]), long(fields[2]), \
+                    long(fields[9]), long(fields[10])
+                    found = 1
+                    break
+            #end for
+        else:
+            pass
 
         # warn if we didn't find the device
         if (not found): print ("WARNING:: Device %(dev)s not found!") % vars()




# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
# help and create those patches.

--- libdesklets/Sys.py.orig	Mon Sep 22 13:06:41 2003
+++ libdesklets/Sys.py	Mon Sep 22 13:13:11 2003
@@ -2,7 +2,8 @@
 
 import commands
 import time
-
+import os
+import libdesklets as lib
 
 class Sys:
 
@@ -31,17 +32,25 @@
 
     def __poll_os(self):
 
-        os = commands.getoutput("uname -o")
-        return os
+        platform = commands.getoutput("uname -s")
+        return platform
 
 
     def __poll_uptime(self, mode):
 
-        fd = open("/proc/uptime", "r")
-        data = fd.readlines()
-        fd.close()
-        
-        uptime, idletime = data[0].split()
+        platform = lib.sys.get_os()
+
+        if ("FreeBSD" == platform):
+            bt = commands.getoutput("sysctl kern.boottime")
+            boottime = int(bt.strip().split()[4].strip(","))
+            uptime = int(time.time() - float(boottime))
+            idletime = 0
+        elif ("Linux" == platform):
+            fd = open("/proc/uptime", "r")
+            data = fd.readlines()
+            fd.close()
+            uptime, idletime = data[0].split()
+            boottime = int(time.time() - float(uptime))
 
         # uptime
         if (mode == 0):
@@ -51,16 +60,32 @@
             return int(float(idletime))
         # sys start
         elif (mode == 2):
-            now = time.time()
-            return int(now - float(uptime))
+            return boottime
 
 
     def __poll_load_avg(self, mode):
 
-        fd = open("/proc/loadavg", "r")
+        import re
+        platform = lib.sys.get_os()
+
+        if ("FreeBSD" == platform):
+            fd = os.popen("uptime")
+        elif ("Linux" == platform):
+            fd = open("/proc/loadavg", "r")
+        else:
+            return float(0.0)
         data = fd.readlines()
         fd.close()
-        load1, load5, load15, t, d = data[0].split()
+
+        if ("FreeBSD" == platform):
+            m = re.search('load averages: ([0-9]\.[0-9]+), ([0-9]\.[0-9]+), ([0-9]\.[0-9]+)', data[0])
+            load1  = m.group(1)
+            load5  = m.group(2)
+            load15 = m.group(3)
+        elif ("Linux" == platform):
+            load1, load5, load15, t, d = data[0].split()
+        else:
+            pass
 
         # avg over 1 minute
         if (mode == 0):
@@ -76,11 +101,25 @@
 
     def __poll_tasks(self):
 
-        fd = open("/proc/loadavg", "r")
+        platform = lib.sys.get_os()
+
+        if ("FreeBSD" == platform):
+            fd = os.popen("vmstat -n 0")
+        elif ("Linux" == platform):
+            fd = open("/proc/loadavg", "r")
+        else:
+            return (int(0), int(0))
         data = fd.readlines()
         fd.close()
 
-        parts = data[0].split()
-        running, tasks = parts[3].split("/")
+        if ("FreeBSD" == platform):
+            parts = data[2].split()
+            running = parts[0]
+            tasks = parts[0] + parts[1] + parts[2]
+        elif ("Linux" == platform):
+            parts = data[0].split()
+            running, tasks = parts[3].split("/")
+        else:
+            pass
 
         return (int(tasks), int(running))




# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
# help and create those patches.

--- libdesklets/__init__.py.orig	Fri Oct 17 23:16:45 2003
+++ libdesklets/__init__.py	Fri Oct 17 23:17:09 2003
@@ -51,11 +51,10 @@
 from Network import Network
 from Sys import Sys
 
-
+sys = Sys()
 convert = Convert()
 cpu = CPU()
 disk = Disk()
 memory = Memory()
 net = Network()
-sys = Sys()
 print "INIT libdesklets (should happen only once)"




share/gnome/gdesklets/libdesklets/Network.py
share/gnome/gdesklets/libdesklets/Sys.py
share/gnome/gdesklets/libdesklets/__init__.py
share/gnome/gdesklets/libdesklets/_glibtopmodule.so
share/gnome/gdesklets/libdesklets/glibtop.py
share/gnome/gdesklets/libdesklets/polling.py
share/gnome/gdesklets/locale/ar/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/az/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/de/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/de_BY/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/el/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/es/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/fr/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/he/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/ko/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/ms/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/nl/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/pl/LC_MESSAGES/gdesklets.mo
share/gnome/gdesklets/locale/pt/LC_MESSAGES/gdesklets.mo

share/gnome/gdesklets/utils/datatypes.py
share/gnome/gdesklets/utils/dialog.py
share/gnome/gdesklets/utils/i18n.py
share/gnome/gdesklets/utils/installer.py
share/gnome/gdesklets/utils/pwstore.py
share/gnome/gdesklets/utils/singleton.py
share/gnome/gdesklets/utils/vfs.py

@dirrm share/gnome/gdesklets/locale/pl
@dirrm share/gnome/gdesklets/locale/nl/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/nl
@dirrm share/gnome/gdesklets/locale/ms/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/ms
@dirrm share/gnome/gdesklets/locale/ko/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/ko
@dirrm share/gnome/gdesklets/locale/he/LC_MESSAGES

@dirrm share/gnome/gdesklets/locale/es
@dirrm share/gnome/gdesklets/locale/el/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/el
@dirrm share/gnome/gdesklets/locale/de_BY/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/de_BY
@dirrm share/gnome/gdesklets/locale/de/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/de
@dirrm share/gnome/gdesklets/locale/az/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/az
@dirrm share/gnome/gdesklets/locale/ar/LC_MESSAGES
@dirrm share/gnome/gdesklets/locale/ar
@dirrm share/gnome/gdesklets/locale

Return to bug 59096

Lines 1-104 Link Here

(-)gdesklets/files/patch-libdesklets::CPU.py (-72 / +27 lines)
1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for	1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
2	# help and create those patches.	2	# help and create those patches.
3		3
4	--- libdesklets/CPU.py.orig Fri Oct 17 22:47:02 2003	4	--- libdesklets/CPU.py Thu Nov 6 14:50:47 2003
5	+++ libdesklets/CPU.py Fri Oct 17 22:53:05 2003	5	+++ libdesklets/CPU.py Sun Nov 9 01:34:27 2003
6	@@ -1,5 +1,7 @@	6	@@ -1,6 +1,8 @@
7	import polling	7	import polling
		8	import glibtop
8		9
9	+import os	10	+import os
10	+import libdesklets as lib	11	+import libdesklets as lib
11		12
12	#	13	#
13	# TODO: support SMP	14	# TODO: support SMP
14	@@ -21,8 +23,16 @@	15	@@ -35,20 +37,36 @@
15
16	self.get_load = polling.wrap(self.__poll_load, 0.2)
17
18	+ platform = lib.sys.get_os()
19	+
20	try:
21	- fd = open("/proc/cpuinfo", "r")
22	+ if platform == "FreeBSD":
23	+ fd = os.popen("grep -3 CPU /var/run/dmesg.boot \| head -7 \| tail -4", "r")
24	+ elif platform == "Linux":
25	+ fd = open("/proc/cpuinfo", "r")
26	+ else:
27	+ print "Unknown OS, strange things may happen."
28	+ return
29	except IOError, e:
30	import traceback; traceback.print_exc()
31	print e
32	@@ -40,15 +50,24 @@
33		16
34	def __poll_cpu(self):	17	def __poll_cpu(self):
35		18
36	- import libdesklets as lib	19	- import libdesklets as lib
37	+ import re	20	+ import re
38	arch = lib.sys.get_arch()	21
		22	- fd = open("/proc/cpuinfo", "r")
39	+ platform = lib.sys.get_os()	23	+ platform = lib.sys.get_os()
		24	+
		25	+ if platform == "FreeBSD":
		26	+ fd = os.popen("grep -3 CPU /var/run/dmesg.boot \| head -7 \| tail -4", "r")
		27	+ elif platform == "Linux":
		28	+ fd = open("/proc/cpuinfo", "r")
		29	+ else:
		30	+ print "Unknown OS, strange things may happen."
		31	+ return
		32	lines = fd.readlines()
		33	fd.close()
		34
		35	arch = lib.sys.get_arch()
40	if (arch in ["i386", "i486", "i586", "i686"]):	36	if (arch in ["i386", "i486", "i586", "i686"]):
41	- fields = self.__lines[4].split()	37	- fields = lines[4].split()
42	- model_name = " ".join(fields[3:])	38	- model_name = " ".join(fields[3:])
43	- fields = self.__lines[6].split()	39	- fields = lines[6].split()
44	- cpu_mhz = fields[3]	40	- cpu_mhz = fields[3]
45	- fields = self.__lines[7].split()	41	- fields = lines[7].split()
46	- cpu_cache = " ".join(fields[3:5])	42	- cpu_cache = " ".join(fields[3:5])
47	+ if ("FreeBSD" == platform):	43	+ if ("FreeBSD" == platform):
48	+ m = re.search('^CPU: (.) \(([0-9]+.)-MHz [0-9]+-class CPU\)', self.__lines[0])	44	+ m = re.search('^CPU: (.) \(([0-9]+.)-MHz [0-9]+-class CPU\)', lines[0])
49	+ model_name = m.group(1) # or sysctl hw.model	45	+ model_name = m.group(1) # or sysctl hw.model
50	+ cpu_mhz = m.group(2) # or sysctl hw.clockrate	46	+ cpu_mhz = m.group(2) # or sysctl hw.clockrate
51	+ cpu_cache = " " # not available by default	47	+ cpu_cache = " " # not available by default
52	+ elif ("Linux" == platform):	48	+ elif ("Linux" == platform):
53	+ fields = self.__lines[4].split()	49	+ fields = lines[4].split()
54	+ model_name = " ".join(fields[3:])	50	+ model_name = " ".join(fields[3:])
55	+ fields = self.__lines[6].split()	51	+ fields = lines[6].split()
56	+ cpu_mhz = fields[3]	52	+ cpu_mhz = fields[3]
57	+ fields = self.__lines[7].split()	53	+ fields = lines[7].split()
58	+ cpu_cache = " ".join(fields[3:5])	54	+ cpu_cache = " ".join(fields[3:5])
59	+ else:	55	+ else:
60	+ pass	56	+ pass
61		57
62	elif (arch == "ppc"):	58	elif (arch == "ppc"):
63	fields = self.__lines[0].split()	59	fields = lines[0].split()
64	@@ -68,17 +87,34 @@
65
66	def __poll_load(self):
67
68	- fd = open("/proc/stat", "r")
69	+ platform = lib.sys.get_os()
70	+
71	+ if ("FreeBSD" == platform):
72	+ fd = os.popen("iostat -n 0", "r")
73	+ line = 2
74	+ elif ("Linux" == platform):
75	+ fd = open("/proc/stat", "r")
76	+ line = 0
77	+ else:
78	+ return
79	data = fd.read()
80	fd.close()
81
82	data = data.splitlines()
83	- fields = data[0].split()
84	+ fields = data[line].split()
85
86	- u = float(fields[1])
87	- s = float(fields[2])
88	- n = float(fields[3])
89	- i = float(fields[4])
90	+ if ("FreeBSD" == platform):
91	+ u = float(fields[2]) + float(fields[3])
92	+ s = float(fields[4])
93	+ n = float(fields[5])
94	+ i = float(fields[6])
95	+ elif ("Linux" == platform):
96	+ u = float(fields[1])
97	+ s = float(fields[2])
98	+ n = float(fields[3])
99	+ i = float(fields[4])
100	+ else:
101	+ pass
102
103	total = ((u - self.__uT) + (s - self.__sT) + (n - self.__nT) +
104	(i - self.__iT))

Lines 1-51 Link Here

(-)gdesklets/files/patch-libdesklets::Disk.py (-51 lines)
1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
2	# help and create those patches.
3
4	--- libdesklets/Disk.py.orig Mon Sep 22 12:25:18 2003
5	+++ libdesklets/Disk.py Mon Sep 22 12:28:28 2003
6	@@ -3,7 +3,7 @@
7	import time
8	import os
9	import statvfs
10	-
11	+import libdesklets as lib
12
13	class Disk:
14
15	@@ -19,21 +19,33 @@
16
17	def __poll_partitions(self):
18
19	+ platform = lib.sys.get_os()
20	+
21	# we don't have to reread the file if it hasn't changed
22	- if (self.__partitions_last_read >= os.path.getmtime("/etc/mtab")):
23	+ if (platform == "Linux" and self.__partitions_last_read >= os.path.getmtime("/etc/mtab")):
24	return self.__partitions
25	else:
26	self.__partitions_last_read = time.time()
27
28	# /etc/mtab is more portable than /proc/mount, so we use it
29	- fd = open("/etc/mtab", "r")
30	+ if (platform == "Linux"):
31	+ fd = open("/etc/mtab", "r")
32	+ else:
33	+ fd = os.popen("mount", "r")
34	lines = fd.readlines()
35	fd.close()
36
37	partitions = []
38	for l in lines:
39	parts = l.split()
40	- device, mpoint, fstype = parts[:3]
41	+ if (platform == "Linux"):
42	+ device, mpoint, fstype = parts[:3]
43	+ elif (platform == "FreeBSD"):
44	+ device = parts[0]
45	+ mpoint = parts[2]
46	+ import re
47	+ m = re.search('\(([a-zA-Z]+)[,)]', parts[3])
48	+ fstype = m.group(0)
49	# FIXME: is this OK? it might be better to check if the device
50	# actually is a file in /dev
51	if (fstype in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs"

Lines 1-124 Link Here

(-)gdesklets/files/patch-libdesklets::Memory.py (-124 lines)
1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
2	# help and create those patches.
3
4	--- libdesklets/Memory.py.orig Fri Oct 17 22:57:33 2003
5	+++ libdesklets/Memory.py Fri Oct 17 23:01:14 2003
6	@@ -1,7 +1,7 @@
7	import polling
8
9	import os, stat
10	-
11	+import libdesklets as lib
12
13	class Memory:
14
15	@@ -16,41 +16,85 @@
16
17	def __poll_total_ram(self):
18
19	- memtotal = os.stat("/proc/kcore")[stat.ST_SIZE]
20	+ platform = lib.sys.get_os()
21	+
22	+ if ("FreeBSD" == platform):
23	+ fd = os.popen("sysctl hw.physmem")
24	+ physmem = fd.readline()
25	+ fd.close()
26	+ lines = physmem.splitlines()
27	+ memtotal = int(lines[0].split()[1])
28	+ elif ("Linux" == platform):
29	+ memtotal = os.stat("/proc/kcore")[stat.ST_SIZE]
30	+ else:
31	+ memtotal = 0
32	+
33	return memtotal
34
35
36
37	def __poll_mem(self, mode):
38
39	- fd = open("/proc/meminfo", "r")
40	- mem = fd.read()
41	- fd.close()
42	- lines = mem.splitlines()
43	+ platform = lib.sys.get_os()
44
45	# RAM
46	if (mode == 0):
47	- total = int(self.__get_total_ram()/1024)
48	- for l in lines:
49	- if (l.startswith("MemFree:")):
50	- value = l.split()
51	- free = int(value[1])
52	- elif (l.startswith("Cached:")):
53	- value = l.split()
54	- free = free + int(value[1])
55	- break
56	- used = total - free
57	+ if ("FreeBSD" == platform):
58	+ fd = os.popen("vmstat -n 0", "r")
59	+ elif ("Linux" == platform):
60	+ fd = open("/proc/meminfo", "r")
61	+ else:
62	+ return (0, 0)
63	+ mem = fd.read()
64	+ fd.close()
65	+ lines = mem.splitlines()
66	+
67	+ if ("FreeBSD" == platform):
68	+ # this may be larger than total, as this is the active virtual
69	+ # memory, not the active physical memory
70	+ used = int(lines[2].split()[3])/1024
71	+ total = int(self.__get_total_ram()/1024)
72	+ elif ("Linux" == platform):
73	+ total = int(self.__get_total_ram()/1024)
74	+ for l in lines:
75	+ if (l.startswith("MemFree:")):
76	+ value = l.split()
77	+ free = int(value[1])
78	+ elif (l.startswith("Cached:")):
79	+ value = l.split()
80	+ free = free + int(value[1])
81	+ break
82	+ used = total - free
83	+ else:
84	+ pass
85
86	# Swap
87	elif (mode == 1):
88	- for l in lines:
89	- if (l.startswith("SwapTotal:")):
90	- value = l.split()
91	- total = int(value[1])
92	- elif (l.startswith("SwapFree:")):
93	- value = l.split()
94	- free = int(value[1])
95	- break
96	- used = total - free
97	+ if ("FreeBSD" == platform):
98	+ fd = os.popen("pstat -T", "r")
99	+ elif ("Linux" == platform):
100	+ fd = open("/proc/meminfo", "r")
101	+ else:
102	+ return (0, 0)
103	+ mem = fd.read()
104	+ fd.close()
105	+ lines = mem.splitlines()
106	+
107	+ if ("FreeBSD" == platform):
108	+ used, total = lines[1].split()[0].split("/")
109	+ used = int(used[0:-2]) * 1024 * 1024
110	+ total = int(total[0:-2]) * 1024 * 1024
111	+ elif ("Linux" == platform):
112	+ for l in lines:
113	+ if (l.startswith("SwapTotal:")):
114	+ value = l.split()
115	+ total = int(value[1])
116	+ elif (l.startswith("SwapFree:")):
117	+ value = l.split()
118	+ free = int(value[1])
119	+ break
120	+ used = total - free
121	+ else:
122	+ pass
123
124	return (total, used)

Lines 1-19 Link Here

(-)gdesklets/files/patch-libdesklets::Network.py (-89 / +9 lines)
1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for	1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
2	# help and create those patches.	2	# help and create those patches.
3		3
4	--- libdesklets/Network.py.orig Fri Oct 17 23:02:41 2003	4	--- libdesklets/Network.py.orig Sun Nov 9 00:52:39 2003
5	+++ libdesklets/Network.py Fri Oct 17 23:24:47 2003	5	+++ libdesklets/Network.py Sun Nov 9 00:53:05 2003
6	@@ -1,7 +1,9 @@	6	@@ -1,8 +1,8 @@
7	import polling	7	import polling
8		8	import glibtop
9	import commands	9	-
10	+import os	10	+import os
11	import time	11	import time
		12	-
12	+import libdesklets as lib	13	+import libdesklets as lib
13		14
14	class Network:	15	class Network:
15		16
16	@@ -26,21 +28,42 @@	17	@@ -27,21 +27,40 @@
17		18
18	def __poll_devices(self):	19	def __poll_devices(self):
19		20
Lines 34-40 Link Here
34	- l = lines.strip()	35	- l = lines.strip()
35	- l = l.replace(":", " ")	36	- l = l.replace(":", " ")
36	- fields = l.split()	37	- fields = l.split()
37		38	-
38	- if (fields[0] == "lo"):	39	- if (fields[0] == "lo"):
39	- continue	40	- continue
40	- else:	41	- else:
Lines 57-148 Link Here
57	+	58	+
58	+ if (fields[0] == "lo"):	59	+ if (fields[0] == "lo"):
59	+ continue	60	+ continue
60	+ else: # (fields[0].startswith("eth")):	61	+ else:
61	+ device = fields[0]	62	+ device = fields[0]
62	+ devices.append(device)	63	+ devices.append(device)
63	+ #end for
64	+ else:	64	+ else:
65	+ pass	65	+ pass
66		66
67	return devices	67	return devices
68		68
69	@@ -48,14 +71,15 @@
70
71	def __poll_ipaddr(self, dev):
72
73	- data = commands.getoutput("/sbin/ifconfig " + dev)
74	- lines = data.splitlines()
75	- for l in lines:
76	+ fd = os.popen("/sbin/ifconfig " + dev, "r")
77	+ data = fd.readlines()
78	+ fd.close()
79	+ for l in data:
80	l = l.strip()
81	fields = l.split()
82
83	if (fields[0] == "inet"):
84	- return fields[1].split(":")[1]
85	+ return fields[1]
86
87	return ("xxx.xxx.xxx.xxx")
88
89	@@ -63,6 +87,8 @@
90
91	def __poll_in_out(self, dev):
92
93	+ platform = lib.sys.get_os()
94	+
95	t = time.time()
96	interval = t - self.__time
97	self.__time = t
98	@@ -73,24 +99,40 @@
99	speed_in = 0
100	speed_out = 0
101
102	- fd = open("/proc/net/dev", "r")
103	+ if ("FreeBSD" == platform):
104	+ fd = os.popen("netstat -b -I " + dev + " \| grep Link", "r")
105	+ elif ("Linux" == platform):
106	+ fd = open("/proc/net/dev", "r")
107	+ else:
108	+ return (bytes_in, bytes_out, pack_in, pack_out, speed_in, speed_out)
109	data = fd.read()
110	fd.close()
111	lines = data.splitlines()
112
113	# look for the device
114	found = 0
115	- for l in lines:
116	- l.strip()
117	- l = l.replace(":", " ")
118	- fields = l.split()
119	- if (fields[0] == dev):
120	- bytes_in, pack_in, bytes_out, pack_out = \
121	- long(fields[1]), long(fields[2]), \
122	- long(fields[9]), long(fields[10])
123	+ if ("FreeBSD" == platform):
124	+ for l in lines:
125	found = 1
126	+ fields = l.strip().split()
127	+ bytes_in, pack_in, bytes_out, pack_out = \
128	+ long(fields[6]), long(fields[4]), \
129	+ long(fields[9]), long(fields[7])
130	break
131	- #end for
132	+ elif ("Linux" == platform):
133	+ for l in lines:
134	+ l.strip()
135	+ l = l.replace(":", " ")
136	+ fields = l.split()
137	+ if (fields[0] == dev):
138	+ bytes_in, pack_in, bytes_out, pack_out = \
139	+ long(fields[1]), long(fields[2]), \
140	+ long(fields[9]), long(fields[10])
141	+ found = 1
142	+ break
143	+ #end for
144	+ else:
145	+ pass
146
147	# warn if we didn't find the device
148	if (not found): print ("WARNING:: Device %(dev)s not found!") % vars()

Lines 1-114 Link Here

(-)gdesklets/files/patch-libdesklets::Sys.py (-114 lines)
1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
2	# help and create those patches.
3
4	--- libdesklets/Sys.py.orig Mon Sep 22 13:06:41 2003
5	+++ libdesklets/Sys.py Mon Sep 22 13:13:11 2003
6	@@ -2,7 +2,8 @@
7
8	import commands
9	import time
10	-
11	+import os
12	+import libdesklets as lib
13
14	class Sys:
15
16	@@ -31,17 +32,25 @@
17
18	def __poll_os(self):
19
20	- os = commands.getoutput("uname -o")
21	- return os
22	+ platform = commands.getoutput("uname -s")
23	+ return platform
24
25
26	def __poll_uptime(self, mode):
27
28	- fd = open("/proc/uptime", "r")
29	- data = fd.readlines()
30	- fd.close()
31	-
32	- uptime, idletime = data[0].split()
33	+ platform = lib.sys.get_os()
34	+
35	+ if ("FreeBSD" == platform):
36	+ bt = commands.getoutput("sysctl kern.boottime")
37	+ boottime = int(bt.strip().split()[4].strip(","))
38	+ uptime = int(time.time() - float(boottime))
39	+ idletime = 0
40	+ elif ("Linux" == platform):
41	+ fd = open("/proc/uptime", "r")
42	+ data = fd.readlines()
43	+ fd.close()
44	+ uptime, idletime = data[0].split()
45	+ boottime = int(time.time() - float(uptime))
46
47	# uptime
48	if (mode == 0):
49	@@ -51,16 +60,32 @@
50	return int(float(idletime))
51	# sys start
52	elif (mode == 2):
53	- now = time.time()
54	- return int(now - float(uptime))
55	+ return boottime
56
57
58	def __poll_load_avg(self, mode):
59
60	- fd = open("/proc/loadavg", "r")
61	+ import re
62	+ platform = lib.sys.get_os()
63	+
64	+ if ("FreeBSD" == platform):
65	+ fd = os.popen("uptime")
66	+ elif ("Linux" == platform):
67	+ fd = open("/proc/loadavg", "r")
68	+ else:
69	+ return float(0.0)
70	data = fd.readlines()
71	fd.close()
72	- load1, load5, load15, t, d = data[0].split()
73	+
74	+ if ("FreeBSD" == platform):
75	+ m = re.search('load averages: ([0-9]\.[0-9]+), ([0-9]\.[0-9]+), ([0-9]\.[0-9]+)', data[0])
76	+ load1 = m.group(1)
77	+ load5 = m.group(2)
78	+ load15 = m.group(3)
79	+ elif ("Linux" == platform):
80	+ load1, load5, load15, t, d = data[0].split()
81	+ else:
82	+ pass
83
84	# avg over 1 minute
85	if (mode == 0):
86	@@ -76,11 +101,25 @@
87
88	def __poll_tasks(self):
89
90	- fd = open("/proc/loadavg", "r")
91	+ platform = lib.sys.get_os()
92	+
93	+ if ("FreeBSD" == platform):
94	+ fd = os.popen("vmstat -n 0")
95	+ elif ("Linux" == platform):
96	+ fd = open("/proc/loadavg", "r")
97	+ else:
98	+ return (int(0), int(0))
99	data = fd.readlines()
100	fd.close()
101
102	- parts = data[0].split()
103	- running, tasks = parts[3].split("/")
104	+ if ("FreeBSD" == platform):
105	+ parts = data[2].split()
106	+ running = parts[0]
107	+ tasks = parts[0] + parts[1] + parts[2]
108	+ elif ("Linux" == platform):
109	+ parts = data[0].split()
110	+ running, tasks = parts[3].split("/")
111	+ else:
112	+ pass
113
114	return (int(tasks), int(running))

Lines 1-18 Link Here

(-)gdesklets/files/patch-libdesklets::__init__.py (-18 lines)
1	# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> for
2	# help and create those patches.
3
4	--- libdesklets/__init__.py.orig Fri Oct 17 23:16:45 2003
5	+++ libdesklets/__init__.py Fri Oct 17 23:17:09 2003
6	@@ -51,11 +51,10 @@
7	from Network import Network
8	from Sys import Sys
9
10	-
11	+sys = Sys()
12	convert = Convert()
13	cpu = CPU()
14	disk = Disk()
15	memory = Memory()
16	net = Network()
17	-sys = Sys()
18	print "INIT libdesklets (should happen only once)"

Lines 50-63 Link Here

(-)gdesklets/pkg-plist (+12 lines)
50	share/gnome/gdesklets/libdesklets/Network.py	50	share/gnome/gdesklets/libdesklets/Network.py
51	share/gnome/gdesklets/libdesklets/Sys.py	51	share/gnome/gdesklets/libdesklets/Sys.py
52	share/gnome/gdesklets/libdesklets/__init__.py	52	share/gnome/gdesklets/libdesklets/__init__.py
		53	share/gnome/gdesklets/libdesklets/_glibtopmodule.so
		54	share/gnome/gdesklets/libdesklets/glibtop.py
53	share/gnome/gdesklets/libdesklets/polling.py	55	share/gnome/gdesklets/libdesklets/polling.py
54	share/gnome/gdesklets/locale/ar/LC_MESSAGES/gdesklets.mo	56	share/gnome/gdesklets/locale/ar/LC_MESSAGES/gdesklets.mo
		57	share/gnome/gdesklets/locale/az/LC_MESSAGES/gdesklets.mo
55	share/gnome/gdesklets/locale/de/LC_MESSAGES/gdesklets.mo	58	share/gnome/gdesklets/locale/de/LC_MESSAGES/gdesklets.mo
		59	share/gnome/gdesklets/locale/de_BY/LC_MESSAGES/gdesklets.mo
56	share/gnome/gdesklets/locale/el/LC_MESSAGES/gdesklets.mo	60	share/gnome/gdesklets/locale/el/LC_MESSAGES/gdesklets.mo
57	share/gnome/gdesklets/locale/es/LC_MESSAGES/gdesklets.mo	61	share/gnome/gdesklets/locale/es/LC_MESSAGES/gdesklets.mo
58	share/gnome/gdesklets/locale/fr/LC_MESSAGES/gdesklets.mo	62	share/gnome/gdesklets/locale/fr/LC_MESSAGES/gdesklets.mo
59	share/gnome/gdesklets/locale/he/LC_MESSAGES/gdesklets.mo	63	share/gnome/gdesklets/locale/he/LC_MESSAGES/gdesklets.mo
60	share/gnome/gdesklets/locale/ko/LC_MESSAGES/gdesklets.mo	64	share/gnome/gdesklets/locale/ko/LC_MESSAGES/gdesklets.mo
		65	share/gnome/gdesklets/locale/ms/LC_MESSAGES/gdesklets.mo
61	share/gnome/gdesklets/locale/nl/LC_MESSAGES/gdesklets.mo	66	share/gnome/gdesklets/locale/nl/LC_MESSAGES/gdesklets.mo
62	share/gnome/gdesklets/locale/pl/LC_MESSAGES/gdesklets.mo	67	share/gnome/gdesklets/locale/pl/LC_MESSAGES/gdesklets.mo
63	share/gnome/gdesklets/locale/pt/LC_MESSAGES/gdesklets.mo	68	share/gnome/gdesklets/locale/pt/LC_MESSAGES/gdesklets.mo
Lines 87-92 Link Here
87	share/gnome/gdesklets/utils/datatypes.py	92	share/gnome/gdesklets/utils/datatypes.py
88	share/gnome/gdesklets/utils/dialog.py	93	share/gnome/gdesklets/utils/dialog.py
89	share/gnome/gdesklets/utils/i18n.py	94	share/gnome/gdesklets/utils/i18n.py
		95	share/gnome/gdesklets/utils/installer.py
90	share/gnome/gdesklets/utils/pwstore.py	96	share/gnome/gdesklets/utils/pwstore.py
91	share/gnome/gdesklets/utils/singleton.py	97	share/gnome/gdesklets/utils/singleton.py
92	share/gnome/gdesklets/utils/vfs.py	98	share/gnome/gdesklets/utils/vfs.py
Lines 113-118 Link Here
113	@dirrm share/gnome/gdesklets/locale/pl	119	@dirrm share/gnome/gdesklets/locale/pl
114	@dirrm share/gnome/gdesklets/locale/nl/LC_MESSAGES	120	@dirrm share/gnome/gdesklets/locale/nl/LC_MESSAGES
115	@dirrm share/gnome/gdesklets/locale/nl	121	@dirrm share/gnome/gdesklets/locale/nl
		122	@dirrm share/gnome/gdesklets/locale/ms/LC_MESSAGES
		123	@dirrm share/gnome/gdesklets/locale/ms
116	@dirrm share/gnome/gdesklets/locale/ko/LC_MESSAGES	124	@dirrm share/gnome/gdesklets/locale/ko/LC_MESSAGES
117	@dirrm share/gnome/gdesklets/locale/ko	125	@dirrm share/gnome/gdesklets/locale/ko
118	@dirrm share/gnome/gdesklets/locale/he/LC_MESSAGES	126	@dirrm share/gnome/gdesklets/locale/he/LC_MESSAGES
Lines 123-130 Link Here
123	@dirrm share/gnome/gdesklets/locale/es	131	@dirrm share/gnome/gdesklets/locale/es
124	@dirrm share/gnome/gdesklets/locale/el/LC_MESSAGES	132	@dirrm share/gnome/gdesklets/locale/el/LC_MESSAGES
125	@dirrm share/gnome/gdesklets/locale/el	133	@dirrm share/gnome/gdesklets/locale/el
		134	@dirrm share/gnome/gdesklets/locale/de_BY/LC_MESSAGES
		135	@dirrm share/gnome/gdesklets/locale/de_BY
126	@dirrm share/gnome/gdesklets/locale/de/LC_MESSAGES	136	@dirrm share/gnome/gdesklets/locale/de/LC_MESSAGES
127	@dirrm share/gnome/gdesklets/locale/de	137	@dirrm share/gnome/gdesklets/locale/de
		138	@dirrm share/gnome/gdesklets/locale/az/LC_MESSAGES
		139	@dirrm share/gnome/gdesklets/locale/az
128	@dirrm share/gnome/gdesklets/locale/ar/LC_MESSAGES	140	@dirrm share/gnome/gdesklets/locale/ar/LC_MESSAGES
129	@dirrm share/gnome/gdesklets/locale/ar	141	@dirrm share/gnome/gdesklets/locale/ar
130	@dirrm share/gnome/gdesklets/locale	142	@dirrm share/gnome/gdesklets/locale