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

Make some APIs that return struct introspectable

Browse Source 
In order to do this, we need to define some boxed types. So we need
to add a new dependency, GObject, to GTop.

https://bugzilla.gnome.org/show_bug.cgi?id=663265
This commit is contained in:
Jasper St. Pierre
2011-11-02 15:18:20 -04:00
committed by Robert Roth
parent 30d29e624b
commit 3f8f65386e
8 changed files with 171 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -91,8 +91,9 @@ GNOME_LIBGTOP_SYSDEPS
GNOME_LIBGTOP_TYPES
GLIB_REQUIRED=2.6.0
GOBJECT_REQUIRED=2.26.0
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GOBJECT_REQUIRED)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)

3
glibtop.h
View File

@@ -23,6 +23,7 @@
#define __GLIBTOP_H__
#include <glib.h>
#include <glib-object.h>
G_BEGIN_DECLS
@@ -138,6 +139,8 @@ glibtop_init_s (glibtop **server_ptr,
unsigned long features,
unsigned flags);
GType glibtop_get_type (void) G_GNUC_CONST;
G_END_DECLS
#endif

34
include/glibtop/mountlist.h
View File

@@ -53,6 +53,38 @@ struct _glibtop_mountlist
guint64 size; /* GLIBTOP_MOUNTLIST_SIZE */
};
/**
* glibtop_get_mountlist:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer full):
*/
/**
* glibtop_get_mountlist_r:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_mountlist_s:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_mountlist_l:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer none):
*/
glibtop_mountentry *
glibtop_get_mountlist(glibtop_mountlist *buf, int all_fs);
@@ -64,6 +96,8 @@ glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
glibtop_mountentry *
glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
GType glibtop_mountlist_get_type (void) G_GNUC_CONST;
GType glibtop_mountentry_get_type (void) G_GNUC_CONST;
G_END_DECLS

38
include/glibtop/procmap.h
View File

@@ -92,6 +92,42 @@ glibtop_map_entry *
glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
/**
* glibtop_get_proc_map:
* @server:
* @buf: (out):
* @pid:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_proc_map_l:
* @server:
* @buf: (out):
* @pid:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_proc_map_p:
* @server:
* @buf: (out):
* @pid:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_proc_map_s:
* @server:
* @buf: (out):
* @pid:
*
* Returns: (transfer none):
*/
#if GLIBTOP_SUID_PROC_MAP
#define glibtop_get_proc_map_r glibtop_get_proc_map_p
#else
@@ -113,6 +149,8 @@ glibtop_map_entry *
glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
#endif
GType glibtop_map_entry_get_type (void) G_GNUC_CONST;
GType glibtop_proc_map_get_type (void) G_GNUC_CONST;
G_END_DECLS

39
include/glibtop/procopenfiles.h
View File

@@ -94,6 +94,42 @@ struct _glibtop_proc_open_files
guint64 size; /* GLIBTOP_PROC_OPEN_FILES_SIZE */
};
/**
* glibtop_get_proc_open_files:
* @server:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_proc_open_files_l:
* @server:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_proc_open_files_p:
* @server:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer none):
*/
/**
* glibtop_get_proc_open_files_l:
* @server:
* @buf: (out):
* @all_fs:
*
* Returns: (transfer none):
*/
glibtop_open_files_entry *
glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
@@ -118,6 +154,9 @@ glibtop_open_files_entry *
glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
#endif
GType glibtop_open_files_entry_get_type (void) G_GNUC_CONST;
GType glibtop_proc_open_files_get_type (void) G_GNUC_CONST;
G_END_DECLS
#endif

2
lib/Makefile.am
View File

@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libgtop-2.0.la
libgtop_2_0_la_SOURCES = init.c open.c close.c command.c read.c \
read_data.c write.c lib.c parameter.c \
sysdeps.c
sysdeps.c boxed.c
libgtop_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -export-symbols $(srcdir)/libgtop.sym -no-undefined
libgtop_2_0_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)

47
lib/boxed.c Normal file
View File

@@ -0,0 +1,47 @@
/* Copyright (C) 2011 Red Hat
This file is part of LibGTop 1.0.
Contributed by Jasper St. Pierre <jstpierre@mecheye.net>, November 2011
LibGTop is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
LibGTop is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with LibGTop; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <glibtop.h>
#include <glibtop/mountlist.h>
#include <glibtop/procmap.h>
#include <glibtop/procopenfiles.h>
#define DEFINE_BOXED(type) \
static type * \
type##_copy (type *p) \
{ \
type *n = g_new (type, 1); \
memcpy (n, p, sizeof (type)); \
return n; \
} \
\
G_DEFINE_BOXED_TYPE (type, \
type, \
type##_copy, \
g_free)
DEFINE_BOXED (glibtop);
DEFINE_BOXED (glibtop_map_entry);
DEFINE_BOXED (glibtop_proc_map);
DEFINE_BOXED (glibtop_open_files_entry);
DEFINE_BOXED (glibtop_proc_open_files);
DEFINE_BOXED (glibtop_mountentry);
DEFINE_BOXED (glibtop_mountlist);

7
lib/libgtop.sym
View File

@@ -68,3 +68,10 @@ glibtop_open_l
glibtop_server_features
glibtop_set_parameter_l
glibtop_sys_siglist
glibtop_mountlist_get_type
glibtop_mountentry_get_type
glibtop_open_files_entry_get_type
glibtop_proc_open_files_get_type
glibtop_map_entry_get_type
glibtop_proc_map_get_type
glibtop_get_type