Forgot to change declaration on Jun 6.
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:
committed by
Martin Baulig
parent
5e3d6bdf18
commit
cf8068049f
11
ChangeLog
11
ChangeLog
@@ -1,5 +1,16 @@
|
||||
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
|
||||
`gh_append2 ()' with `gh_append ()'.
|
||||
|
||||
|
@@ -27,7 +27,7 @@
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
#define GLIBTOP_SYSDEPS_DUMMY 0
|
||||
#define GLIBTOP_SYSDEPS_FEATURES 0
|
||||
#define GLIBTOP_SYSDEPS_CPU 1
|
||||
#define GLIBTOP_SYSDEPS_MEM 2
|
||||
#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. */
|
||||
|
||||
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_descriptions_sysdeps [];
|
||||
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_cpu (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_CPU; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_cpu [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_cpu [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_loadavg (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_loadavg [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_loadavg [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_mem (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_MEM; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_mem [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_mem [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_msg_limits (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_msg_limits [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_msg_limits [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_kernel (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proc_kernel [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proc_kernel [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -53,7 +53,7 @@ glibtop_guile_types_proclist (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proclist [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proclist [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_mem (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proc_mem [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proc_mem [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_segment (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proc_segment [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proc_segment [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_signal (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proc_signal [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proc_signal [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_state (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proc_state [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proc_state [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_time (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proc_time [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proc_time [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -52,7 +52,7 @@ glibtop_guile_types_proc_uid (void)
|
||||
for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
|
||||
list = gh_append
|
||||
(gh_list (list,
|
||||
gh_list (gh_str02scm (glibtop_types_proc_uid [i])),
|
||||
gh_list (gh_ulong2scm (glibtop_types_proc_uid [i])),
|
||||
SCM_UNDEFINED));
|
||||
|
||||
return list;
|
||||
|
@@ -50,7 +50,7 @@ glibtop_guile_types_sem_limits (void)
|
||||
|
||||
for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
|
||||
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));
|
||||
|
||||
return list;
|
||||
|
@@ -50,7 +50,7 @@ glibtop_guile_types_shm_limits (void)
|
||||
|
||||
for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
|
||||
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));
|
||||
|
||||
return list;
|
||||
|
@@ -50,7 +50,7 @@ glibtop_guile_types_swap (void)
|
||||
|
||||
for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
|
||||
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));
|
||||
|
||||
return list;
|
||||
|
@@ -50,7 +50,7 @@ glibtop_guile_types_sysdeps (void)
|
||||
|
||||
for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
|
||||
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));
|
||||
|
||||
return list;
|
||||
|
@@ -50,7 +50,7 @@ glibtop_guile_types_uptime (void)
|
||||
|
||||
for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
|
||||
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));
|
||||
|
||||
return list;
|
||||
|
@@ -23,22 +23,25 @@
|
||||
|
||||
const char *glibtop_names_sysdeps [GLIBTOP_MAX_SYSDEPS] =
|
||||
{
|
||||
"cpu", "mem", "swap", "uptime", "loadavg", "shm_limits",
|
||||
"msg_limits", "sem_limits", "proclist", "proc_state",
|
||||
"proc_uid", "proc_mem", "proc_time", "proc_signal",
|
||||
"proc_kernel", "proc_segment"
|
||||
"features", "cpu", "mem", "swap", "uptime", "loadavg",
|
||||
"shm_limits", "msg_limits", "sem_limits", "proclist",
|
||||
"proc_state", "proc_uid", "proc_mem", "proc_time",
|
||||
"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",
|
||||
"unsigned long", "unsigned long", "unsigned long", "unsigned long",
|
||||
"unsigned long", "unsigned long", "unsigned long", "unsigned long",
|
||||
"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, GLIBTOP_TYPE_ULONG,
|
||||
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] =
|
||||
{
|
||||
N_("Server Features"),
|
||||
N_("CPU Usage"),
|
||||
N_("Memory Usage"),
|
||||
N_("Swap Usage"),
|
||||
@@ -59,6 +62,7 @@ const char *glibtop_labels_sysdeps [GLIBTOP_MAX_SYSDEPS] =
|
||||
|
||||
const char *glibtop_descriptions_sysdeps [GLIBTOP_MAX_SYSDEPS] =
|
||||
{
|
||||
N_("Server Features"),
|
||||
N_("CPU Usage"),
|
||||
N_("Memory Usage"),
|
||||
N_("Swap Usage"),
|
||||
|
Reference in New Issue
Block a user