Date: Fri, 26 Dec 2003 17:52:57 +0100 From: Franz Klammer <klammer@webonaut.com> To: Jeremy Messenger <mezz7@cox.net> Cc: freebsd-gnome@freebsd.org Subject: Re: Need the help to test on new gDesklets 0.25 on Gnome 2.4.x. Message-ID: <3FEC6769.6030301@webonaut.com> In-Reply-To: <opr0p7qwmu8ckrg5@smtp.central.cox.net> References: <opr0p7qwmu8ckrg5@smtp.central.cox.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Jeremy Messenger wrote: > Hello people, > > I need someone to do the test on new gDesklets 0.25 on Gnome 2.4.x, > before I submit it to PR. Because, gDesklets causes the libgtop run > 100% CPU at all the time on libgtop 2.5.x (Gnome 2.5.x) and cause > itself refresh slow too. If it doesn't cause on Gnome 2.4.x, then it's > safe for me to submit to PR. :-) But, it will be need to be address > before Gnome 2.6 release in the next few months. Of course, I will ask > for help and report to gDesklets bugzilla about this issue on > gDesklets+libgtop 2.5.x. > hi jeremy! the seems to be still the good old libc_r/libkse - problem. on my pc (-current from Dec 23th, gnome 2.5) with libc_r the cpu-usage of libgtop_server grows up to 60% with libkse i didn't see it if i hide idle processes in top. this was with sched_ule. with sched_4bsd and libc_r the utilization stops at 40-50%. also unlike gdesklets-0.24.1 it seems to run with libc_r without hanging and the startup is much slower. but my pc is currently not very representative if we talk about speed. :-) franz. > Here's an attach of gdesklets.diff. > > # cd /usr/ports/deskutils > # patch -p0 < /path/to/gdesklets.diff > # find /usr/ports/deskutils/gdesklets -name '*.orig' -delete > # portupgrade -f gdesklets > > Thanks and Merry X-Mas! > > Note: I don't think I will be able to check my email until 26th. > > Cheers, > Mezz > > >------------------------------------------------------------------------ > >diff -urN gdesklets.orig/Makefile gdesklets/Makefile >--- gdesklets.orig/Makefile Tue Nov 18 14:04:47 2003 >+++ gdesklets/Makefile Thu Dec 25 00:06:09 2003 >@@ -6,8 +6,7 @@ > # > > PORTNAME= gdesklets >-PORTVERSION= 0.24.1 >-PORTREVISION= 2 >+PORTVERSION= 0.25 > CATEGORIES= deskutils gnome > MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/ > DISTNAME= gDesklets-${PORTVERSION} >diff -urN gdesklets.orig/distinfo gdesklets/distinfo >--- gdesklets.orig/distinfo Mon Nov 10 17:24:01 2003 >+++ gdesklets/distinfo Thu Dec 25 00:06:18 2003 >@@ -1 +1 @@ >-MD5 (gDesklets-0.24.1.tar.bz2) = 2187806b52bb81b1a88f6caf6197a4d1 >+MD5 (gDesklets-0.25.tar.bz2) = 5ff9bc2cfce49a65403f80019c6dbe4b >diff -urN gdesklets.orig/files/patch-configure gdesklets/files/patch-configure >--- gdesklets.orig/files/patch-configure Sat Oct 18 00:51:26 2003 >+++ gdesklets/files/patch-configure Thu Dec 25 00:10:44 2003 >@@ -1,6 +1,6 @@ >---- configure.orig Fri Oct 17 22:42:52 2003 >-+++ configure Fri Oct 17 22:42:57 2003 >-@@ -7798,6 +7798,7 @@ >+--- configure.orig Thu Dec 25 00:10:19 2003 >++++ configure Thu Dec 25 00:10:30 2003 >+@@ -18395,6 +18395,7 @@ > > # This can be used to rebuild libtool when needed > LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" >diff -urN gdesklets.orig/files/patch-data::Makefile.in gdesklets/files/patch-data::Makefile.in >--- gdesklets.orig/files/patch-data::Makefile.in Sat Oct 18 00:51:26 2003 >+++ gdesklets/files/patch-data::Makefile.in Thu Dec 25 00:12:56 2003 >@@ -1,6 +1,6 @@ >---- data/Makefile.in.orig Fri Oct 17 22:44:59 2003 >-+++ data/Makefile.in Fri Oct 17 22:45:03 2003 >-@@ -195,7 +195,7 @@ >+--- data/Makefile.in.orig Thu Dec 25 00:12:02 2003 >++++ data/Makefile.in Thu Dec 25 00:12:32 2003 >+@@ -208,7 +208,7 @@ > @USERINST_TRUE@mimedir = ~/.gnome/mime-info > mime_in_files = gdesklets.keys.in > mime_DATA = $(mime_in_files:.keys.in=.keys) gdesklets.mime >diff -urN gdesklets.orig/files/patch-display::TargetLabel.py gdesklets/files/patch-display::TargetLabel.py >--- gdesklets.orig/files/patch-display::TargetLabel.py Sat Oct 25 15:52:20 2003 >+++ gdesklets/files/patch-display::TargetLabel.py Thu Dec 25 00:15:07 2003 >@@ -1,6 +1,6 @@ >---- display/TargetLabel.py.orig Sat Oct 25 02:15:56 2003 >-+++ display/TargetLabel.py Sat Oct 25 02:21:05 2003 >-@@ -76,7 +76,14 @@ >+--- display/TargetLabel.py.orig Thu Dec 25 00:14:06 2003 >++++ display/TargetLabel.py Thu Dec 25 00:14:42 2003 >+@@ -90,7 +90,14 @@ > > # determine the locale > import commands >diff -urN gdesklets.orig/files/patch-libdesklets::CPU.py gdesklets/files/patch-libdesklets::CPU.py >--- gdesklets.orig/files/patch-libdesklets::CPU.py Mon Nov 10 11:21:37 2003 >+++ gdesklets/files/patch-libdesklets::CPU.py Wed Dec 31 18:00:00 1969 >@@ -1,59 +0,0 @@ >-# 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 @@ >- >- 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() >diff -urN gdesklets.orig/files/patch-libdesklets::Disk.py gdesklets/files/patch-libdesklets::Disk.py >--- gdesklets.orig/files/patch-libdesklets::Disk.py Mon Nov 17 17:15:22 2003 >+++ gdesklets/files/patch-libdesklets::Disk.py Thu Dec 25 00:32:57 2003 >@@ -2,12 +2,15 @@ > # Franz Klammer <klammer@webonaut.com> for help and create > # those patches. > # >-# Note that, this is for now. One of us still need to fix the >-# libgtop to correct read the partition so this patch can be >-# remove. >+# Note that, this is for now. It will be remove when the >+# libgtop is update to 2.6 or maybe I can ask gnome@freebsd.org >+# if they won't mind to add a patch in libgtop 2.4 to get this >+# patch remove. >+# >+# Joe has fixed it in the libgtop 2.5.x and isn't in ports yet. > >---- libdesklets/Disk.py.orig Mon Nov 17 13:59:20 2003 >-+++ libdesklets/Disk.py Mon Nov 17 14:05:34 2003 >+--- libdesklets/Disk.py.orig Thu Dec 25 00:19:45 2003 >++++ libdesklets/Disk.py Thu Dec 25 00:21:28 2003 > @@ -1,6 +1,6 @@ > import glibtop > import polling >@@ -16,23 +19,22 @@ > > class Disk: > >-@@ -13,18 +13,22 @@ >+@@ -14,18 +14,22 @@ > > def __poll_partitions(self): > > - data = glibtop.get_mountlist(0) >-- partitions = [] >++ fd = os.popen("mount -p") >++ data = fd.readlines() >++ fd.close() >++ >+ partitions = [] > - for size, device, mpoint, fstype in data: > - if (fstype in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs" > - "jfs", "reiserfs", "xfs", "qnx4", "adfs", "ffs", > - "hfs", "befs", "bfs", "efs", "iso9660", "minix", > - "sysv", "coda", "nfs", "udf", "ufs", "xiafs")): > - partitions.append((device, mpoint)) >-+ fd = os.popen("mount -p") >-+ data = fd.readlines() >-+ fd.close() >-+ >-+ partitions = [] > + for lines in data: > + fields = lines.strip().replace("\t", " ").split() > + if (fields[2] in ("ext2", "ext3", "msdos", "vfat", "ntfs", "hpfs" >diff -urN gdesklets.orig/files/patch-libdesklets::Memory.py gdesklets/files/patch-libdesklets::Memory.py >--- gdesklets.orig/files/patch-libdesklets::Memory.py Mon Nov 17 17:15:22 2003 >+++ gdesklets/files/patch-libdesklets::Memory.py Wed Dec 31 18:00:00 1969 >@@ -1,15 +0,0 @@ >-# Many thanks to Alexander Leidinger <netchild@FreeBSD.org> and >-# Franz Klammer <klammer@webonaut.com> for help and create >-# those patches. >- >---- libdesklets/Memory.py.orig Sun Nov 16 17:02:45 2003 >-+++ libdesklets/Memory.py Sun Nov 16 17:03:19 2003 >-@@ -49,7 +49,7 @@ >- >- # Swap >- elif (mode == 1): >-- total, used, free = glibtop.get_mem()[:3] >-+ total, used, free = glibtop.get_swap()[:3] >- #for l in lines: >- # if (l.startswith("SwapTotal:")): >- # value = l.split() >diff -urN gdesklets.orig/files/patch-locale::install_locales.py gdesklets/files/patch-locale::install_locales.py >--- gdesklets.orig/files/patch-locale::install_locales.py Tue Sep 2 01:24:00 2003 >+++ gdesklets/files/patch-locale::install_locales.py Wed Dec 31 18:00:00 1969 >@@ -1,11 +0,0 @@ >---- locale/install_locales.py.orig Sun Aug 31 23:07:07 2003 >-+++ locale/install_locales.py Sun Aug 31 23:07:33 2003 >-@@ -17,7 +17,7 @@ >- file = os.path.basename(source) >- lang, ext = os.path.splitext(file) >- fulltargetpath = os.path.join(targetpath, lang, "LC_MESSAGES") >-- os.system("mkdir --parents " + fulltargetpath) >-+ os.system("mkdir -p " + fulltargetpath) >- >- print (source) >- mofile = os.path.join(fulltargetpath, domain + ".mo") >diff -urN gdesklets.orig/files/patch-sensor::Sensor.py gdesklets/files/patch-sensor::Sensor.py >--- gdesklets.orig/files/patch-sensor::Sensor.py Tue Nov 18 14:04:47 2003 >+++ gdesklets/files/patch-sensor::Sensor.py Wed Dec 31 18:00:00 1969 >@@ -1,13 +0,0 @@ >-# Yay! Many thanks to Franz Klammer <klammer@webonaut.com>, >-# the theads is now work. That make a lot of desklets work now. >- >---- sensor/Sensor.py.orig Tue Nov 18 13:32:10 2003 >-+++ sensor/Sensor.py Tue Nov 18 13:33:39 2003 >-@@ -346,3 +346,7 @@ >- def __on_quit(self, src): >- >- gtk.main_quit() >-+ >-+ >-+# FreeBSD needs this; Linux doesn't but it's cleaner to use it >-+gtk.threads_init() >diff -urN gdesklets.orig/pkg-plist gdesklets/pkg-plist >--- gdesklets.orig/pkg-plist Mon Nov 17 17:15:22 2003 >+++ gdesklets/pkg-plist Thu Dec 25 00:59:01 2003 >@@ -12,6 +12,7 @@ > share/gnome/gdesklets/config/DummyBackend.py > share/gnome/gdesklets/config/GConfBackend.py > share/gnome/gdesklets/config/__init__.py >+share/gnome/gdesklets/config/migration.py > share/gnome/gdesklets/config/settings.py > share/gnome/gdesklets/data/gdesklets.png > share/gnome/gdesklets/desktop/BGWatcher.py >@@ -21,11 +22,13 @@ > share/gnome/gdesklets/display/DataTarget.py > share/gnome/gdesklets/display/Display.py > share/gnome/gdesklets/display/DisplayConfigurator.py >+share/gnome/gdesklets/display/DisplayContainer.py > share/gnome/gdesklets/display/DisplayTarget.py > share/gnome/gdesklets/display/TargetAlignment.py > share/gnome/gdesklets/display/TargetArray.py > share/gnome/gdesklets/display/TargetBonoboControl.py > share/gnome/gdesklets/display/TargetCanvas.py >+share/gnome/gdesklets/display/TargetExpander.py > share/gnome/gdesklets/display/TargetFrame.py > share/gnome/gdesklets/display/TargetGauge.py > share/gnome/gdesklets/display/TargetGroup.py >@@ -34,6 +37,8 @@ > share/gnome/gdesklets/display/TargetLabel.py > share/gnome/gdesklets/display/TargetPlotter.py > share/gnome/gdesklets/display/TargetPopup.py >+share/gnome/gdesklets/display/Window.py >+share/gnome/gdesklets/display/WindowSnapper.py > share/gnome/gdesklets/display/__init__.py > share/gnome/gdesklets/display/layouters.py > share/gnome/gdesklets/display/targetregistry.py >@@ -53,17 +58,23 @@ > 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/ca/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/eu/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/it/LC_MESSAGES/gdesklets.mo >+share/gnome/gdesklets/locale/ja/LC_MESSAGES/gdesklets.mo > share/gnome/gdesklets/locale/ko/LC_MESSAGES/gdesklets.mo >+share/gnome/gdesklets/locale/lt/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/locale/pt_BR/LC_MESSAGES/gdesklets.mo >+share/gnome/gdesklets/locale/ru/LC_MESSAGES/gdesklets.mo > share/gnome/gdesklets/locale/sq/LC_MESSAGES/gdesklets.mo > share/gnome/gdesklets/locale/sr/LC_MESSAGES/gdesklets.mo > share/gnome/gdesklets/locale/sr@Latn/LC_MESSAGES/gdesklets.mo >@@ -78,6 +89,7 @@ > share/gnome/gdesklets/sensor/Sensor.py > share/gnome/gdesklets/sensor/SensorConfigurator.py > share/gnome/gdesklets/sensor/__init__.py >+share/gnome/gdesklets/utils/BinTree.py > share/gnome/gdesklets/utils/FileWatcher.py > share/gnome/gdesklets/utils/GConfWatcher.py > share/gnome/gdesklets/utils/Hash2D.py >@@ -111,6 +123,10 @@ > @dirrm share/gnome/gdesklets/locale/sr > @dirrm share/gnome/gdesklets/locale/sq/LC_MESSAGES > @dirrm share/gnome/gdesklets/locale/sq >+@dirrm share/gnome/gdesklets/locale/ru/LC_MESSAGES >+@dirrm share/gnome/gdesklets/locale/ru >+@dirrm share/gnome/gdesklets/locale/pt_BR/LC_MESSAGES >+@dirrm share/gnome/gdesklets/locale/pt_BR > @dirrm share/gnome/gdesklets/locale/pt/LC_MESSAGES > @dirrm share/gnome/gdesklets/locale/pt > @dirrm share/gnome/gdesklets/locale/pl/LC_MESSAGES >@@ -119,20 +135,28 @@ > @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/lt/LC_MESSAGES >+@dirrm share/gnome/gdesklets/locale/lt > @dirrm share/gnome/gdesklets/locale/ko/LC_MESSAGES > @dirrm share/gnome/gdesklets/locale/ko >+@dirrm share/gnome/gdesklets/locale/ja/LC_MESSAGES >+@dirrm share/gnome/gdesklets/locale/ja >+@dirrm share/gnome/gdesklets/locale/it/LC_MESSAGES >+@dirrm share/gnome/gdesklets/locale/it > @dirrm share/gnome/gdesklets/locale/he/LC_MESSAGES > @dirrm share/gnome/gdesklets/locale/he > @dirrm share/gnome/gdesklets/locale/fr/LC_MESSAGES > @dirrm share/gnome/gdesklets/locale/fr >+@dirrm share/gnome/gdesklets/locale/eu/LC_MESSAGES >+@dirrm share/gnome/gdesklets/locale/eu > @dirrm share/gnome/gdesklets/locale/es/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/ca/LC_MESSAGES >+@dirrm share/gnome/gdesklets/locale/ca > @dirrm share/gnome/gdesklets/locale/az/LC_MESSAGES > @dirrm share/gnome/gdesklets/locale/az > @dirrm share/gnome/gdesklets/locale/ar/LC_MESSAGES > > >------------------------------------------------------------------------ > >_______________________________________________ >freebsd-gnome@freebsd.org mailing list >http://lists.freebsd.org/mailman/listinfo/freebsd-gnome >To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" > > -- webonaut.com :: web technology klammer@webonaut.com :: http://webonaut.com/ fon +43-664-3434708 -- MIG_media intelligence group > agentur für werbung & neue medien A-5020 Salzburg > Linzergasse 21 Fon +43-662-453091-0 > Fax -99 office@mig.co.at > http://www.mig.co.at --
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3FEC6769.6030301>