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

Started with the big rewrite for GNOME 2.0:

Browse Source 
2000-11-20  Martin Baulig  <baulig@suse.de>

	Started with the big rewrite for GNOME 2.0:

	- split the `glibtop' structure into `glibtop_server' and
	`glibtop_client' and make `glibtop_client' a GObject.
	- cleanly separate the library and the backends.

	This stuff currently does not compile.

	* glibtop.h (glibtop_server_private, glibtop_server_info):
	Removed typedefs.
	(struct _glibtop, struct _glibtop_server_info): Removed.
	(glibtop_global_server, glibtop_server_features): Removed.
	(glibtop_server_ref, glibtop_server_unref): Removed.

	* glibtop.h (glibtop_init_s): First argument is now a
	`glibtop_server *'.

	* include/glibtop/*.h: Removed all #defines with the
	glibtop_global_server.
	(glibtop_get_*_l): First argument is now a `glibtop_client *'.
	(glibtop_get_*_s, glibtop_init_*_s): First argument is now a
	`glibtop_server *'.

	* lib/glibtop-client.c: New file.

	* sysdeps/common/xmalloc.c: Moved to lib/.
	* sysdeps/common/error.c: Moved to lib/.

	* lib/xmalloc.c: Moved here from sysdeps/common/.
	* lib/error.c: Moved here from sysdeps/common/.

	* include/glibtop/backend.h
	(glibtop_backend_open_func_t, glibtop_backend_close_func_t):
	First argument is now a `glibtop_server *'.
	(glibtop_backend_info): Added `glibtop_server *server'.
	(glibtop_open_backend_l): Returns `glibtop_backend *', first
	argument is `glibtop_client *' and added `GError **'.

	* include/glibtop/close.h (glibtop_close_s, glibtop_close_p):
	First argument is now a `glibtop_server *'.

	* include/glibtop/error.h (*):
	First argument is now a `glibtop_server *'.

	* include/glibtop/errors.h: Switched this to use GError.
This commit is contained in:
Martin Baulig
2000-11-20 22:37:15 +00:00
committed by Martin Baulig
parent c15ff3f342
commit 752d5b47d2
86 changed files with 792 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/glib-arrays.c
View File

@@ -29,14 +29,15 @@
#include <glibtop/glib-arrays.h>
GArray *
glibtop_get_proclist_as_array_l (glibtop *server, int64_t which, int64_t arg)
glibtop_get_proclist_as_array_l (glibtop_client *client, int64_t which,
int64_t arg)
{
glibtop_array array;
GArray *retval;
unsigned *ptr;
int i;
ptr = glibtop_get_proclist_l (server, &array, which, arg);
ptr = glibtop_get_proclist_l (client, &array, which, arg);
if (!ptr) return NULL;
retval = g_array_new (FALSE, TRUE, sizeof (guint));
@@ -45,20 +46,20 @@ glibtop_get_proclist_as_array_l (glibtop *server, int64_t which, int64_t arg)
for (i = 0; i < array.number; i++)
g_array_index (retval, guint, i) = ptr [i];
glibtop_free_r (server, ptr);
g_free (ptr);
return retval;
}
GPtrArray *
glibtop_get_proc_args_as_array_l (glibtop *server, pid_t pid)
glibtop_get_proc_args_as_array_l (glibtop_client *client, pid_t pid)
{
glibtop_array array;
GPtrArray *retval;
char **ptr;
int i;
ptr = glibtop_get_proc_args_l (server, &array, pid);
ptr = glibtop_get_proc_args_l (client, &array, pid);
if (!ptr) return NULL;
retval = g_ptr_array_new ();
@@ -66,23 +67,23 @@ glibtop_get_proc_args_as_array_l (glibtop *server, pid_t pid)
for (i = 0; i < array.number; i++) {
retval->pdata [i] = g_strdup (ptr [i]);
glibtop_free_r (server, ptr [i]);
g_free (ptr [i]);
}
glibtop_free_r (server, ptr);
g_free (ptr);
return retval;
}
GPtrArray *
glibtop_get_proc_map_as_array_l (glibtop *server, pid_t pid)
glibtop_get_proc_map_as_array_l (glibtop_client *client, pid_t pid)
{
glibtop_array array;
GPtrArray *retval;
glibtop_map_entry *ptr;
int i;
ptr = glibtop_get_proc_map_l (server, &array, pid);
ptr = glibtop_get_proc_map_l (client, &array, pid);
if (!ptr) return NULL;
retval = g_ptr_array_new ();
@@ -91,20 +92,20 @@ glibtop_get_proc_map_as_array_l (glibtop *server, pid_t pid)
for (i = 0; i < array.number; i++)
retval->pdata [i] = g_memdup (ptr+i, sizeof (glibtop_map_entry));
glibtop_free_r (server, ptr);
g_free (ptr);
return retval;
}
GPtrArray *
glibtop_get_mountlist_as_array_l (glibtop *server, int all_fs)
glibtop_get_mountlist_as_array_l (glibtop_client *client, int all_fs)
{
glibtop_array array;
GPtrArray *retval;
glibtop_mountentry *ptr;
int i;
ptr = glibtop_get_mountlist_l (server, &array, all_fs);
ptr = glibtop_get_mountlist_l (client, &array, all_fs);
if (!ptr) return NULL;
retval = g_ptr_array_new ();
@@ -113,7 +114,7 @@ glibtop_get_mountlist_as_array_l (glibtop *server, int all_fs)
for (i = 0; i < array.number; i++)
retval->pdata [i] = g_memdup (ptr+i, sizeof (glibtop_mountentry));
glibtop_free_r (server, ptr);
g_free (ptr);
return retval;
}