oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgot to change declaration on Jun 6.

Browse Source 
1998-06-12  Martin Baulig  <baulig@taurus.uni-trier.de>

	* include/glibtop/sysdeps.h (glibtop_types_sysdeps):
	Forgot to change declaration on Jun 6.

	* sysdeps/names/sysdeps.c (glibtop_types_sysdeps):
	Using numeric constants from `types.h' instead of string
	constants; forgot to change this on Jun 6. Added information
	about new `features' field of `_glibtop_sysdeps'.
This commit is contained in:
Martin Baulig
1998-06-12 00:40:17 +00:00
committed by Martin Baulig
parent 5e3d6bdf18
commit cf8068049f
20 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -1,5 +1,16 @@
1998-06-12 Martin Baulig <baulig@taurus.uni-trier.de> 1998-06-12 Martin Baulig <baulig@taurus.uni-trier.de>
* include/glibtop/sysdeps.h (glibtop_types_sysdeps):
Forgot to change declaration on Jun 6.
* sysdeps/names/sysdeps.c (glibtop_types_sysdeps):
Using numeric constants from `types.h' instead of string
constants; forgot to change this on Jun 6. Added information
about new `features' field of `_glibtop_sysdeps'.
* sysdeps/guile/names/*.c (glibtop_guile_types_*):
Using `gh_ulong2scm' instead of `gh_str02scm'.
* sysdeps/guile/proclist.c: Replaced call to * sysdeps/guile/proclist.c: Replaced call to
`gh_append2 ()' with `gh_append ()'. `gh_append2 ()' with `gh_append ()'.

4
include/glibtop/sysdeps.h
View File

@@ -27,7 +27,7 @@
__BEGIN_DECLS __BEGIN_DECLS
#define GLIBTOP_SYSDEPS_DUMMY 0 #define GLIBTOP_SYSDEPS_FEATURES 0
#define GLIBTOP_SYSDEPS_CPU 1 #define GLIBTOP_SYSDEPS_CPU 1
#define GLIBTOP_SYSDEPS_MEM 2 #define GLIBTOP_SYSDEPS_MEM 2
#define GLIBTOP_SYSDEPS_SWAP 3 #define GLIBTOP_SYSDEPS_SWAP 3
@@ -101,7 +101,7 @@ extern SCM glibtop_guile_descriptions_sysdeps __P((void));
/* You need to link with -lgtop_names to get this stuff here. */ /* You need to link with -lgtop_names to get this stuff here. */
extern const char *glibtop_names_sysdeps []; extern const char *glibtop_names_sysdeps [];
extern const char *glibtop_types_sysdeps []; extern const unsigned glibtop_types_sysdeps [];
extern const char *glibtop_labels_sysdeps []; extern const char *glibtop_labels_sysdeps [];
extern const char *glibtop_descriptions_sysdeps []; extern const char *glibtop_descriptions_sysdeps [];

2
sysdeps/guile/names/cpu.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_cpu (void)
for (i = 0; i < GLIBTOP_MAX_CPU; i++) for (i = 0; i < GLIBTOP_MAX_CPU; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_cpu [i])), gh_list (gh_ulong2scm (glibtop_types_cpu [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/loadavg.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_loadavg (void)
for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++) for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_loadavg [i])), gh_list (gh_ulong2scm (glibtop_types_loadavg [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/mem.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_mem (void)
for (i = 0; i < GLIBTOP_MAX_MEM; i++) for (i = 0; i < GLIBTOP_MAX_MEM; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_mem [i])), gh_list (gh_ulong2scm (glibtop_types_mem [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/msg_limits.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_msg_limits (void)
for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++) for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_msg_limits [i])), gh_list (gh_ulong2scm (glibtop_types_msg_limits [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/prockernel.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_proc_kernel (void)
for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++) for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proc_kernel [i])), gh_list (gh_ulong2scm (glibtop_types_proc_kernel [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/proclist.c
View File

@@ -53,7 +53,7 @@ glibtop_guile_types_proclist (void)
for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++) for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proclist [i])), gh_list (gh_ulong2scm (glibtop_types_proclist [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/procmem.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_proc_mem (void)
for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++) for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proc_mem [i])), gh_list (gh_ulong2scm (glibtop_types_proc_mem [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/procsegment.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_proc_segment (void)
for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++) for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proc_segment [i])), gh_list (gh_ulong2scm (glibtop_types_proc_segment [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/procsignal.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_proc_signal (void)
for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++) for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proc_signal [i])), gh_list (gh_ulong2scm (glibtop_types_proc_signal [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/procstate.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_proc_state (void)
for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++) for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proc_state [i])), gh_list (gh_ulong2scm (glibtop_types_proc_state [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/proctime.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_proc_time (void)
for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++) for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proc_time [i])), gh_list (gh_ulong2scm (glibtop_types_proc_time [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/procuid.c
View File

@@ -52,7 +52,7 @@ glibtop_guile_types_proc_uid (void)
for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++) for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
list = gh_append list = gh_append
(gh_list (list, (gh_list (list,
gh_list (gh_str02scm (glibtop_types_proc_uid [i])), gh_list (gh_ulong2scm (glibtop_types_proc_uid [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/sem_limits.c
View File

@@ -50,7 +50,7 @@ glibtop_guile_types_sem_limits (void)
for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++) for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
list = gh_append (gh_list (list, list = gh_append (gh_list (list,
gh_list (gh_str02scm (gettext (glibtop_types_sem_limits [i]))), gh_list (gh_ulong2scm (glibtop_types_sem_limits [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/shm_limits.c
View File

@@ -50,7 +50,7 @@ glibtop_guile_types_shm_limits (void)
for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++) for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
list = gh_append (gh_list (list, list = gh_append (gh_list (list,
gh_list (gh_str02scm (gettext (glibtop_types_shm_limits [i]))), gh_list (gh_ulong2scm (glibtop_types_shm_limits [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/swap.c
View File

@@ -50,7 +50,7 @@ glibtop_guile_types_swap (void)
for (i = 0; i < GLIBTOP_MAX_SWAP; i++) for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
list = gh_append (gh_list (list, list = gh_append (gh_list (list,
gh_list (gh_str02scm (gettext (glibtop_types_swap [i]))), gh_list (gh_ulong2scm (glibtop_types_swap [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/sysdeps.c
View File

@@ -50,7 +50,7 @@ glibtop_guile_types_sysdeps (void)
for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++) for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
list = gh_append (gh_list (list, list = gh_append (gh_list (list,
gh_list (gh_str02scm (gettext (glibtop_types_sysdeps [i]))), gh_list (gh_ulong2scm (glibtop_types_sysdeps [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

2
sysdeps/guile/names/uptime.c
View File

@@ -50,7 +50,7 @@ glibtop_guile_types_uptime (void)
for (i = 0; i < GLIBTOP_MAX_UPTIME; i++) for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
list = gh_append (gh_list (list, list = gh_append (gh_list (list,
gh_list (gh_str02scm (gettext (glibtop_types_uptime [i]))), gh_list (gh_ulong2scm (glibtop_types_uptime [i])),
SCM_UNDEFINED)); SCM_UNDEFINED));
return list; return list;

22
sysdeps/names/sysdeps.c
View File

@@ -23,22 +23,25 @@
const char *glibtop_names_sysdeps [GLIBTOP_MAX_SYSDEPS] = const char *glibtop_names_sysdeps [GLIBTOP_MAX_SYSDEPS] =
{ {
"cpu", "mem", "swap", "uptime", "loadavg", "shm_limits", "features", "cpu", "mem", "swap", "uptime", "loadavg",
"msg_limits", "sem_limits", "proclist", "proc_state", "shm_limits", "msg_limits", "sem_limits", "proclist",
"proc_uid", "proc_mem", "proc_time", "proc_signal", "proc_state", "proc_uid", "proc_mem", "proc_time",
"proc_kernel", "proc_segment" "proc_signal", "proc_kernel", "proc_segment"
}; };
const char *glibtop_types_sysdeps [GLIBTOP_MAX_SYSDEPS] = const unsigned glibtop_types_sysdeps [GLIBTOP_MAX_SYSDEPS] =
{ {
"unsigned long", "unsigned long", "unsigned long", "unsigned long", GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
"unsigned long", "unsigned long", "unsigned long", "unsigned long", GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
"unsigned long", "unsigned long", "unsigned long", "unsigned long", GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
"unsigned long", "unsigned long", "unsigned long", "unsigned long" GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
}; };
const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] = const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] =
{ {
N_("Server Features"),
N_("CPU Usage"), N_("CPU Usage"),
N_("Memory Usage"), N_("Memory Usage"),
N_("Swap Usage"), N_("Swap Usage"),
@@ -59,6 +62,7 @@ const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] =
const char *glibtop_descriptions_sysdeps [GLIBTOP_MAX_SYSDEPS] = const char *glibtop_descriptions_sysdeps [GLIBTOP_MAX_SYSDEPS] =
{ {
N_("Server Features"),
N_("CPU Usage"), N_("CPU Usage"),
N_("Memory Usage"), N_("Memory Usage"),
N_("Swap Usage"), N_("Swap Usage"),