Made gtk-doc happy in order to dist.
2006-12-03 Benoît Dejean <benoit@placenet.org> * doc/reference/libgtop-docs.xml: * glibtop.h: * include/glibtop/sysinfo.h: Made gtk-doc happy in order to dist.
This commit is contained in:
committed by
Benoît Dejean
parent
37fc9c1544
commit
63fb94127a
@@ -1,3 +1,11 @@
|
|||||||
|
2006-12-03 Benoît Dejean <benoit@placenet.org>
|
||||||
|
|
||||||
|
* doc/reference/libgtop-docs.xml:
|
||||||
|
* glibtop.h:
|
||||||
|
* include/glibtop/sysinfo.h:
|
||||||
|
|
||||||
|
Made gtk-doc happy in order to dist.
|
||||||
|
|
||||||
2006-12-03 Benoît Dejean <benoit@placenet.org>
|
2006-12-03 Benoît Dejean <benoit@placenet.org>
|
||||||
|
|
||||||
* NEWS:
|
* NEWS:
|
||||||
|
@@ -14,6 +14,7 @@
|
|||||||
<email>martin@home-of-linux.org</email>
|
<email>martin@home-of-linux.org</email>
|
||||||
</address>
|
</address>
|
||||||
</affiliation>
|
</affiliation>
|
||||||
|
</author>
|
||||||
<author>
|
<author>
|
||||||
<firstname>Germán</firstname>
|
<firstname>Germán</firstname>
|
||||||
<surname>Poó-Caamaño</surname>
|
<surname>Poó-Caamaño</surname>
|
||||||
|
0
doc/reference/libgtop-overrides.txt
Normal file
0
doc/reference/libgtop-overrides.txt
Normal file
32
glibtop.h
32
glibtop.h
@@ -69,14 +69,15 @@ LIBGTOP_MICRO_VERSION >= (micro)))
|
|||||||
|
|
||||||
#include <glibtop/close.h>
|
#include <glibtop/close.h>
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef HAVE_GLIBTOP_MACHINE_H
|
||||||
|
|
||||||
struct _glibtop
|
struct _glibtop
|
||||||
{
|
{
|
||||||
unsigned flags;
|
unsigned flags;
|
||||||
unsigned method; /* Server Method */
|
unsigned method; /* Server Method */
|
||||||
unsigned error_method; /* Error Method */
|
unsigned error_method; /* Error Method */
|
||||||
#ifdef HAVE_GLIBTOP_MACHINE_H
|
|
||||||
glibtop_machine machine; /* Machine dependent data */
|
glibtop_machine machine; /* Machine dependent data */
|
||||||
#endif
|
|
||||||
int input [2]; /* Pipe client <- server */
|
int input [2]; /* Pipe client <- server */
|
||||||
int output [2]; /* Pipe client -> server */
|
int output [2]; /* Pipe client -> server */
|
||||||
int socket; /* Accepted connection of a socket */
|
int socket; /* Accepted connection of a socket */
|
||||||
@@ -95,6 +96,33 @@ struct _glibtop
|
|||||||
pid_t pid; /* PID of the server */
|
pid_t pid; /* PID of the server */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#else /* !HAVE_GLIBTOP_MACHINE_H */
|
||||||
|
|
||||||
|
struct _glibtop
|
||||||
|
{
|
||||||
|
unsigned flags;
|
||||||
|
unsigned method; /* Server Method */
|
||||||
|
unsigned error_method; /* Error Method */
|
||||||
|
int input [2]; /* Pipe client <- server */
|
||||||
|
int output [2]; /* Pipe client -> server */
|
||||||
|
int socket; /* Accepted connection of a socket */
|
||||||
|
int ncpu; /* Number of CPUs, zero if single-processor */
|
||||||
|
int real_ncpu; /* Real number of CPUs. Only ncpu are monitored */
|
||||||
|
unsigned long os_version_code; /* Version code of the operating system */
|
||||||
|
const char *name; /* Program name for error messages */
|
||||||
|
const char *server_command; /* Command used to invoke server */
|
||||||
|
const char *server_host; /* Host the server should run on */
|
||||||
|
const char *server_user; /* Name of the user on the target host */
|
||||||
|
const char *server_rsh; /* Command used to connect to the target host */
|
||||||
|
unsigned long features; /* Server is required for this features */
|
||||||
|
unsigned long server_port; /* Port on which daemon is listening */
|
||||||
|
glibtop_sysdeps sysdeps; /* Detailed feature list */
|
||||||
|
glibtop_sysdeps required; /* Required feature list */
|
||||||
|
pid_t pid; /* PID of the server */
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* HAVE_GLIBTOP_MACHINE_H */
|
||||||
|
|
||||||
extern glibtop *glibtop_global_server;
|
extern glibtop *glibtop_global_server;
|
||||||
|
|
||||||
extern const unsigned long glibtop_server_features;
|
extern const unsigned long glibtop_server_features;
|
||||||
|
@@ -50,7 +50,8 @@ struct _glibtop_entry
|
|||||||
|
|
||||||
struct _glibtop_sysinfo
|
struct _glibtop_sysinfo
|
||||||
{
|
{
|
||||||
guint64 flags, ncpu;
|
guint64 flags;
|
||||||
|
guint64 ncpu;
|
||||||
glibtop_entry cpuinfo [GLIBTOP_NCPU];
|
glibtop_entry cpuinfo [GLIBTOP_NCPU];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user