diff options
author | Martin Baulig <baulig@suse.de> | 2000-11-20 22:37:15 +0000 |
---|---|---|
committer | Martin Baulig <martin@src.gnome.org> | 2000-11-20 22:37:15 +0000 |
commit | 752d5b47d2134cd6e76465943aadcdcb0ea5e777 (patch) | |
tree | 062defcfdaa4a83273e1c0112025f725a74f4332 /glibtop.h | |
parent | c15ff3f342e7f5eb74a5f5867ebe87c89d9a5cb0 (diff) | |
download | libgtop-752d5b47d2134cd6e76465943aadcdcb0ea5e777.tar.gz |
Started with the big rewrite for GNOME 2.0:
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.
Diffstat (limited to 'glibtop.h')
-rw-r--r-- | glibtop.h | 48 |
1 files changed, 5 insertions, 43 deletions
@@ -32,71 +32,33 @@ #include <glibtop/global.h> #include <glibtop/limits.h> - -#include <glibtop_server.h> #include <glibtop/types.h> +#include <glibtop/glibtop-client.h> + BEGIN_LIBGTOP_DECLS typedef struct _glibtop glibtop; -typedef struct _glibtop_server_private glibtop_server_private; -typedef struct _glibtop_server_info glibtop_server_info; #include <glibtop/sysdeps.h> #include <glibtop/errors.h> -#include <glibtop/parameter.h> +#include <glibtop/glibtop-server.h> #ifdef _IN_LIBGTOP #include <glibtop-server-private.h> #endif -struct _glibtop_server_info -{ - int ncpu; /* Number of CPUs, zero if single-processor */ - unsigned long features; /* Server is required for this features */ - glibtop_sysdeps sysdeps; /* Detailed feature list */ - glibtop_sysdeps required; /* Required feature list */ - glibtop_sysdeps wanted; /* We only want this features */ -}; - -struct _glibtop -{ - int refcount; /* Reference count */ - unsigned flags; - unsigned long os_version_code; /* Version code of the operating system */ - const char *name; /* Program name for error messages */ - unsigned long server_port; /* Port on which daemon is listening */ - glibtop_parameter _param; /* Server parameter */ - glibtop_server_private *_priv; /* Private data */ - glibtop_server_info *info; /* Server Info */ - unsigned glibtop_errno; -}; - -extern glibtop *glibtop_global_server; - -extern const unsigned long glibtop_server_features; - -#define glibtop_init() glibtop_init_r(&glibtop_global_server, 0, 0); - -#define glibtop_close() glibtop_close_r(glibtop_global_server); - glibtop * glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags); -glibtop * -glibtop_init_s (glibtop **server_ptr, +void +glibtop_init_s (glibtop_server *server_ptr, unsigned long features, unsigned flags); -void -glibtop_server_ref (glibtop *server); - -void -glibtop_server_unref (glibtop *server); - END_LIBGTOP_DECLS #endif |