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

New global variable. (_open_server, _close_server): Use the quark.

Browse Source 
2000-11-27  Martin Baulig  <martin@home-of-linux.org>

	* backend-server.c (backend_server_quark): New global variable.
	(_open_server, _close_server): Use the quark.
	* commands.c: Likewise.
This commit is contained in:
Martin Baulig
2000-11-26 23:08:04 +00:00
committed by Martin Baulig
parent 622eb0ea5b
commit 8a78a93e0c
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backends/server/ChangeLog
View File

@@ -1,3 +1,9 @@
2000-11-27 Martin Baulig <martin@home-of-linux.org>
* backend-server.c (backend_server_quark): New global variable.
(_open_server, _close_server): Use the quark.
* commands.c: Likewise.
2000-11-26 Martin Baulig <martin@home-of-linux.org> 2000-11-26 Martin Baulig <martin@home-of-linux.org>
* backend-server.h: New file. * backend-server.h: New file.

13
backends/server/backend-server.c
View File

@@ -31,6 +31,9 @@ _open_server (glibtop_server *, glibtop_backend *, u_int64_t, const char **);
static int static int
_close_server (glibtop_server *, glibtop_backend *); _close_server (glibtop_server *, glibtop_backend *);
static int backend_server_initialized = 0;
GQuark backend_server_quark;
extern glibtop_call_vector glibtop_backend_server_call_vector; extern glibtop_call_vector glibtop_backend_server_call_vector;
#ifdef LIBGTOP_USE_GMODULE #ifdef LIBGTOP_USE_GMODULE
@@ -51,9 +54,15 @@ _open_server (glibtop_server *server, glibtop_backend *backend,
{ {
backend_server_private *priv; backend_server_private *priv;
if (!backend_server_initialized) {
backend_server_quark = g_quark_from_string ("backend-server-private");
backend_server_initialized = 1;
}
priv = glibtop_calloc_r (server, 1, sizeof (backend_server_private)); priv = glibtop_calloc_r (server, 1, sizeof (backend_server_private));
g_object_set_data (G_OBJECT (backend), BACKEND_DATA_KEY, priv); g_object_set_qdata (G_OBJECT (backend), backend_server_quark, priv);
#ifdef DEBUG #ifdef DEBUG
fprintf (stderr, "open_server - %p, %p, %p\n", server, backend, priv); fprintf (stderr, "open_server - %p, %p, %p\n", server, backend, priv);
@@ -97,7 +106,7 @@ _close_server (glibtop_server *server, glibtop_backend *backend)
{ {
backend_server_private *priv; backend_server_private *priv;
priv = g_object_steal_data (G_OBJECT (backend), BACKEND_DATA_KEY); priv = g_object_steal_qdata (G_OBJECT (backend), backend_server_quark);
g_assert (priv != NULL); g_assert (priv != NULL);
kill (priv->pid, SIGKILL); kill (priv->pid, SIGKILL);

4
backends/server/backend-server.h
View File

@@ -36,8 +36,6 @@
typedef struct _backend_server_private backend_server_private; typedef struct _backend_server_private backend_server_private;
#define BACKEND_DATA_KEY "backend-server-private"
struct _backend_server_private struct _backend_server_private
{ {
u_int64_t flags; u_int64_t flags;
@@ -48,6 +46,8 @@ struct _backend_server_private
glibtop_server *server; glibtop_server *server;
}; };
extern GQuark backend_server_quark;
void * void *
glibtop_call_i (glibtop_server *server, glibtop_backend *backend, glibtop_call_i (glibtop_server *server, glibtop_backend *backend,
unsigned command, size_t send_size, const void *send_ptr, unsigned command, size_t send_size, const void *send_ptr,

2
backends/server/command.c
View File

@@ -44,7 +44,7 @@ glibtop_call_i (glibtop_server *server, glibtop_backend *backend,
memset (&cmnd, 0, sizeof (glibtop_command)); memset (&cmnd, 0, sizeof (glibtop_command));
memset (&resp, 0, sizeof (glibtop_response)); memset (&resp, 0, sizeof (glibtop_response));
priv = g_object_get_data (G_OBJECT (backend), BACKEND_DATA_KEY); priv = g_object_get_qdata (G_OBJECT (backend), backend_server_quark);
g_assert (priv != NULL); g_assert (priv != NULL);
cmnd.command = command; cmnd.command = command;