FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Well s/jiffles/jiffies/

Browse Source 
I was quite sure I had a typo but didn't concider it.
This commit is contained in:
Mike Massonnet
2010-05-05 16:39:51 +02:00
parent 074f5039e1
commit 3cd86dca3d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/task-manager-linux.c
View File

@@ -147,11 +147,11 @@ get_task_cmdline (Task *task)
} }
static void static void
get_cpu_percent (guint pid, gulong jiffles_user, gfloat *cpu_user, gulong jiffles_system, gfloat *cpu_system) get_cpu_percent (guint pid, gulong jiffies_user, gfloat *cpu_user, gulong jiffies_system, gfloat *cpu_system)
{ {
static GHashTable *hash_cpu_user = NULL; static GHashTable *hash_cpu_user = NULL;
static GHashTable *hash_cpu_system = NULL; static GHashTable *hash_cpu_system = NULL;
gulong jiffles_user_old, jiffles_system_old; gulong jiffies_user_old, jiffies_system_old;
if (hash_cpu_user == NULL) if (hash_cpu_user == NULL)
{ {
@@ -159,15 +159,15 @@ get_cpu_percent (guint pid, gulong jiffles_user, gfloat *cpu_user, gulong jiffle
hash_cpu_system = g_hash_table_new (NULL, NULL); hash_cpu_system = g_hash_table_new (NULL, NULL);
} }
jiffles_user_old = GPOINTER_TO_UINT (g_hash_table_lookup (hash_cpu_user, GUINT_TO_POINTER (pid))); jiffies_user_old = GPOINTER_TO_UINT (g_hash_table_lookup (hash_cpu_user, GUINT_TO_POINTER (pid)));
jiffles_system_old = GPOINTER_TO_UINT (g_hash_table_lookup (hash_cpu_system, GUINT_TO_POINTER (pid))); jiffies_system_old = GPOINTER_TO_UINT (g_hash_table_lookup (hash_cpu_system, GUINT_TO_POINTER (pid)));
g_hash_table_insert (hash_user, GUINT_TO_POINTER (pid), GUINT_TO_POINTER (jiffles_cpu_user)); g_hash_table_insert (hash_user, GUINT_TO_POINTER (pid), GUINT_TO_POINTER (jiffies_cpu_user));
g_hash_table_insert (hash_system, GUINT_TO_POINTER (pid), GUINT_TO_POINTER (jiffles_cpu_system)); g_hash_table_insert (hash_system, GUINT_TO_POINTER (pid), GUINT_TO_POINTER (jiffies_cpu_system));
if (_cpu_count > 0) if (_cpu_count > 0)
{ {
*cpu_user = (jiffles_user_old > 0) ? (jiffles_user - jiffles_user_old) / (gfloat)_cpu_count : 0; *cpu_user = (jiffies_user_old > 0) ? (jiffies_user - jiffies_user_old) / (gfloat)_cpu_count : 0;
*cpu_system = (jiffles_system_old > 0) ? (jiffles_system - jiffles_system_old) / (gfloat)_cpu_count : 0; *cpu_system = (jiffies_system_old > 0) ? (jiffies_system - jiffies_system_old) / (gfloat)_cpu_count : 0;
} }
else else
{ {
@@ -192,7 +192,7 @@ get_task_details (guint pid, Task *task)
{ {
gchar dummy[255]; gchar dummy[255];
gint idummy; gint idummy;
gulong jiffles_user, jiffles_system; gulong jiffies_user, jiffies_system;
struct passwd *pw; struct passwd *pw;
struct stat sstat; struct stat sstat;
@@ -212,8 +212,8 @@ get_task_details (guint pid, Task *task)
dummy, // cminflt dummy, // cminflt
dummy, // majflt dummy, // majflt
dummy, // cmajflt dummy, // cmajflt
&jiffles_user, // utime the number of jiffies that this process has scheduled in user mode &jiffies_user, // utime the number of jiffies that this process has scheduled in user mode
&jiffles_system,// stime " system mode &jiffies_system,// stime " system mode
&idummy, // cutime " waited for children in user mode &idummy, // cutime " waited for children in user mode
&idummy, // cstime " system mode &idummy, // cstime " system mode
@@ -249,7 +249,7 @@ get_task_details (guint pid, Task *task)
); );
task->rss *= get_pagesize (); task->rss *= get_pagesize ();
get_cpu_percent (task->pid, jiffles_user, &task->cpu_user, jiffles_system, &task->cpu_system); get_cpu_percent (task->pid, jiffies_user, &task->cpu_user, jiffies_system, &task->cpu_system);
stat (filename, &sstat); stat (filename, &sstat);
pw = getpwuid (sstat.st_uid); pw = getpwuid (sstat.st_uid);