[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdebase/ksysguard
From: Hasso Tepper <hasso () kde ! org>
Date: 2007-04-18 13:29:47
Message-ID: 1176902987.642215.5279.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 655456 by hasso:
Backport of the DragonFlyBSD support for ksysguard from trunk. No any change
in any other platform.
M +1 -0 configure.in.in
M +61 -1 ksysguardd/FreeBSD/CPU.c
M +30 -7 ksysguardd/FreeBSD/ProcessList.c
M +1 -1 ksysguardd/Makefile.am
M +7 -0 ksysguardd/configure.in.in
--- branches/KDE/3.5/kdebase/ksysguard/configure.in.in #655455:655456
@@ -3,6 +3,7 @@
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ *-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
*-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
--- branches/KDE/3.5/kdebase/ksysguard/ksysguardd/FreeBSD/CPU.c #655455:655456
@@ -22,7 +22,10 @@
#include <osreldate.h>
#include <sys/types.h>
-#if __FreeBSD_version < 500101
+#if defined(__DragonFly__)
+#include <sys/param.h>
+#include <kinfo.h>
+#elif __FreeBSD_version < 500101
#include <sys/dkstat.h>
#else
#include <sys/resource.h>
@@ -40,6 +43,18 @@
#include "Command.h"
#include "ksysguardd.h"
+#if defined(__DragonFly__)
+static void cputime_percentages(int[4], struct kinfo_cputime *,
+ struct kinfo_cputime *);
+static struct kinfo_cputime cp_time, cp_old;
+
+#define CPUSTATES 4
+#define CP_USER 0
+#define CP_NICE 1
+#define CP_SYS 2
+#define CP_IDLE 3
+
+#else
long percentages(int cnt, int *out, long *new, long *old, long *diffs);
unsigned long cp_time_offset;
@@ -47,6 +62,8 @@
long cp_time[CPUSTATES];
long cp_old[CPUSTATES];
long cp_diff[CPUSTATES];
+#endif
+
int cpu_states[CPUSTATES];
void
@@ -73,9 +90,14 @@
int
updateCpuInfo(void)
{
+#if defined(__DragonFly__)
+ kinfo_get_sched_cputime(&cp_time);
+ cputime_percentages(cpu_states, &cp_time, &cp_old);
+#else
size_t len = sizeof(cp_time);
sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0);
percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
+#endif
return (0);
}
@@ -148,7 +170,44 @@
* The routine assumes modulo arithmetic. This function is especially
* useful on BSD mchines for calculating cpu state percentages.
*/
+#if defined(__DragonFly__)
+static void
+cputime_percentages(int out[4], struct kinfo_cputime *new, struct kinfo_cputime * \
old) +{
+ struct kinfo_cputime diffs;
+ int i;
+ uint64_t total_change, half_total;
+ /* initialization */
+ total_change = 0;
+
+ diffs.cp_user = new->cp_user - old->cp_user;
+ diffs.cp_nice = new->cp_nice - old->cp_nice;
+ diffs.cp_sys = new->cp_sys - old->cp_sys;
+ diffs.cp_intr = new->cp_intr - old->cp_intr;
+ diffs.cp_idle = new->cp_idle - old->cp_idle;
+ total_change = diffs.cp_user + diffs.cp_nice + diffs.cp_sys +
+ diffs.cp_intr + diffs.cp_idle;
+ old->cp_user = new->cp_user;
+ old->cp_nice = new->cp_nice;
+ old->cp_sys = new->cp_sys;
+ old->cp_intr = new->cp_intr;
+ old->cp_idle = new->cp_idle;
+
+ /* avoid divide by zero potential */
+ if (total_change == 0)
+ total_change = 1;
+
+ /* calculate percentages based on overall change, rounding up */
+ half_total = total_change >> 1;
+
+ out[0] = ((diffs.cp_user * 1000LL + half_total) / total_change);
+ out[1] = ((diffs.cp_nice * 1000LL + half_total) / total_change);
+ out[2] = (((diffs.cp_sys + diffs.cp_intr) * 1000LL + half_total) / \
total_change); + out[4] = ((diffs.cp_idle * 1000LL + half_total) / \
total_change); +}
+
+#else
long percentages(cnt, out, new, old, diffs)
int cnt;
@@ -201,3 +260,4 @@
/* return the total in case the caller wants to use it */
return(total_change);
}
+#endif
--- branches/KDE/3.5/kdebase/ksysguard/ksysguardd/FreeBSD/ProcessList.c \
#655455:655456 @@ -212,28 +212,40 @@
ps->gid = p.ki_pgid;
ps->priority = p.ki_pri.pri_user;
ps->niceLevel = p.ki_nice;
+#elif defined(__DragonFly__) && __DragonFly_version >= 190000
+ ps->pid = p.kp_pid;
+ ps->ppid = p.kp_ppid;
+ ps->uid = p.kp_uid;
+ ps->gid = p.kp_pgid;
+ ps->priority = p.kp_lwp.kl_tdprio;
#else
ps->pid = p.kp_proc.p_pid;
ps->ppid = p.kp_eproc.e_ppid;
ps->uid = p.kp_eproc.e_ucred.cr_uid;
ps->gid = p.kp_eproc.e_pgid;
+#if defined(__DragonFly__)
+ ps->priority = p.kp_thread.td_pri;
+#else
ps->priority = p.kp_proc.p_priority;
+#endif
ps->niceLevel = p.kp_proc.p_nice;
#endif
/* this isn't usertime -- it's total time (??) */
#if __FreeBSD_version >= 500015
ps->userTime = p.ki_runtime / 10000;
-#elif __FreeBSD_version >= 300000
-#if defined(__DragonFly__)
+#elif defined(__DragonFly__)
+#if __DragonFly_version >= 190000
+ if (!getrusage(p.kp_pid, &pru))
+#else
if (!getrusage(p.kp_proc.p_pid, &pru))
+#endif
{
errx(1, "failed to get rusage info");
}
ps->userTime = pru.ru_utime.tv_usec / 1000; /*p_runtime / 1000*/
-#else
+#elif __FreeBSD_version >= 300000
ps->userTime = p.kp_proc.p_runtime / 10000;
-#endif
#else
ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100;
#endif
@@ -255,18 +267,25 @@
ps->vmRss = p.ki_rssize * getpagesize();
strlcpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
+#elif defined (__DragonFly__) && __DragonFly_version >= 190000
+ ps->userLoad = 100.0 * (double) p.kp_lwp.kl_pctcpu / fscale;
+ ps->vmSize = p.kp_vm_map_size;
+ ps->vmRss = p.kp_vm_rssize * getpagesize();
+ strlcpy(ps->name,p.kp_comm ? p.kp_comm : "????",
+ sizeof(ps->name));
+ strcpy(ps->status,(p.kp_stat>=1)&&(p.kp_stat<=5)? statuses[p.kp_stat-1]:"????");
#else
- ps->userLoad = 100.0 * (double) p.kp_proc.p_pctcpu / fscale;
+ ps->userLoad = 100.0 * (double) p.kp_proc.p_pctcpu / fscale;
ps->vmSize = p.kp_eproc.e_vm.vm_map.size;
ps->vmRss = p.kp_eproc.e_vm.vm_rssize * getpagesize();
#if defined (__DragonFly__)
- strlcpy(ps->name,p.kp_thread.td_comm ? p.kp_thread.td_comm : "????",
+ strlcpy(ps->name,p.kp_thread.td_comm ? p.kp_thread.td_comm : "????",
sizeof(ps->name));
#else
strlcpy(ps->name,p.kp_proc.p_comm ? p.kp_proc.p_comm : "????", sizeof(ps->name));
-#endif
strcpy(ps->status,(p.kp_proc.p_stat>=1)&&(p.kp_proc.p_stat<=5)? \
statuses[p.kp_proc.p_stat-1]:"????"); #endif
+#endif
/* process command line */
/* do a sysctl to get the command line args. */
@@ -366,8 +385,12 @@
#if __FreeBSD_version >= 500015
updateProcess(p[num].ki_pid);
#else
+#if __DragonFly_version >= 190000
+ updateProcess(p[num].kp_pid);
+#else
updateProcess(p[num].kp_proc.p_pid);
#endif
+#endif
free(p);
cleanupProcessList();
--- branches/KDE/3.5/kdebase/ksysguard/ksysguardd/Makefile.am #655455:655456
@@ -32,4 +32,4 @@
ksysguardd_SOURCES = Command.c conf.c ksysguardd.c PWUIDCache.c
ksysguardd_LDFLAGS = $(all_libraries)
-ksysguardd_LDADD = $(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a \
../CContLib/libccont.a -lkdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) +ksysguardd_LDADD = \
$(top_builddir)/ksysguard/ksysguardd/$(UNAME)/libksysguardd.a ../CContLib/libccont.a \
-lkdefakes_nonpic $(LIBHOSTS) $(LIB_DNSSD) $(LIB_KINFO)
--- branches/KDE/3.5/kdebase/ksysguard/ksysguardd/configure.in.in #655455:655456
@@ -34,5 +34,12 @@
LDFLAGS=$save_dnssdtest_LDFLAGS
LIBS=$save_dnssdtest_LIBS
fi
+
+case $host_os in
+ dragonfly*) LIB_KINFO="-lkinfo" ;;
+ *) LIB_KINFO="" ;;
+esac
+
AC_SUBST(LIB_DNSSD)
+AC_SUBST(LIB_KINFO)
AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic