New file.
1998-07-29 Martin Baulig <martin@home-of-linux.org> * guile/ChangeLog: New file. * features.def: New format - now includes type of return value and parameters. * lib/lib.awk: Changed to use new `features.def'. * sysdeps/guile/guile.awk: Dito; * sysdeps/guile/names/guile-names.awk: Dito. * libgtopConf.sh.in: Added `LIBGTOP_NAMES_LIBS', `LIBGTOP_NAMES_INCS', `LIBGTOP_GUILE_NAMES_LIBS', `LIBGTOP_GUILE_NAMES_INCS', `LIBGTOP_MAJOR_VERSION', `LIBGTOP_MINOR_VERSION' `LIBGTOP_VERSION', `libgtop_sysdeps_dir'. * acinclude.m4 (AC_LC_SYSDEPS): Removed since this has been replaced with `GNOME_LIBGTOP_SYSDEPS' long ago. * LIBGTOP-VERSION: New file. * */Makefile.am (INCLUDES): Removed; now defined in `configure.in'. * sysdeps/names/mountlist.c: New file. * lib/{init, open}.c (GTOP_SERVER): Renamed to `LIBGTOP_SERVER'. * configure.in (INCLUDES): Added definition. (libgtop_want_names): Always true; `libgtop_names.la' is now always created since some other programs rely upon it - but have to use `LIBGTOP_NAMES_LIBS' and `LIBGTOP_NAMES_INCS' to use it in your application. (libgtop_want_guile_names): Always true; but you have to use `LIBGTOP_GUILE_NAMES_LIBS' and `LIBGTOP_GUILE_NAMES_INCS' to use it in your application. (LIBGTOP_LIBS): Removed `-lgtop_names' and `-lgtop_guile_names'. (LIBGTOP_NAMES_LIBS): New variable. Use it to link your application with the names interface. (LIBGTOP_NAMES_INCS): New variable. Also #defines `GLIBTOP_NAMES' which is now required if your application wants to use the names interface. (LIBGTOP_GUILE_NAMES_LIBS): New variable. Use it to link your application with the guile names interface. (LIBGTOP_GUILE_NAMES_INCS): New variable. Also #defines `GLIBTOP_NAMES' and `GLIBTOP_GUILE_NAMES' which are now required if your application wants to use the guile names interface.
This commit is contained in:
Martin Baulig
committed by
Martin Baulig
Martin Baulig
parent
37eb76e767
commit
f07551a43d
@@ -1,10 +1,6 @@
|
||||
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
INCLUDES = -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
|
||||
-I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
|
||||
-DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
|
||||
|
||||
CFLAGS = -Wall -W @CFLAGS@ -DGTOP_SERVER=\""@LIBGTOP_SERVER@"\"
|
||||
CFLAGS = -Wall -W @CFLAGS@
|
||||
|
||||
lib_LTLIBRARIES = libgtop.la
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ _init_server (glibtop *server, const unsigned features)
|
||||
|
||||
if (server->server_command == NULL) {
|
||||
const char *temp = getenv ("LIBGTOP_SERVER") ?
|
||||
getenv ("LIBGTOP_SERVER") : GTOP_SERVER;
|
||||
getenv ("LIBGTOP_SERVER") : LIBGTOP_SERVER;
|
||||
|
||||
server->server_command = glibtop_strdup_r (server, temp);
|
||||
}
|
||||
|
||||
121
lib/lib.awk
121
lib/lib.awk
@@ -11,90 +11,87 @@ BEGIN {
|
||||
print "";
|
||||
}
|
||||
|
||||
function output(feature) {
|
||||
orig = feature;
|
||||
sub(/@/,"",feature);
|
||||
if (feature ~ /^proclist$/) {
|
||||
print "unsigned *";
|
||||
prefix = "return ";
|
||||
} else if (feature ~ /^mountlist$/) {
|
||||
print "glibtop_mountentry *";
|
||||
function output(line) {
|
||||
split (line, line_fields, /\|/);
|
||||
retval = line_fields[1];
|
||||
feature = line_fields[2];
|
||||
param_typ = line_fields[4];
|
||||
param = line_fields[5];
|
||||
param_size = line_fields[6];
|
||||
|
||||
if (param_typ == "") {
|
||||
param_size = "0";
|
||||
param_ptr = "NULL";
|
||||
} else {
|
||||
if (param_size == "")
|
||||
param_size = "sizeof ("param_typ")";
|
||||
|
||||
if (param_typ ~ /*/)
|
||||
param_ptr = param;
|
||||
else
|
||||
param_ptr = "&"param;
|
||||
}
|
||||
|
||||
orig = feature; sub(/^@/,"",feature);
|
||||
space = feature; gsub(/./," ",space);
|
||||
|
||||
print retval;
|
||||
if (retval !~ /^void$/) {
|
||||
prefix = "return ";
|
||||
prefix_space = " ";
|
||||
} else {
|
||||
prefix = "";
|
||||
print "void";
|
||||
prefix_space = "";
|
||||
}
|
||||
if (feature ~ /^proc_/) {
|
||||
param = ", pid_t pid";
|
||||
} else if (feature ~ /^fsusage$/) {
|
||||
param = ", const char *mountdir";
|
||||
} else if (feature ~ /^mountlist$/) {
|
||||
param = ", int all_fs";
|
||||
|
||||
if (param_typ != "") {
|
||||
print "glibtop_get_"feature"_l (glibtop *server, glibtop_"feature" *buf,";
|
||||
print " "space" "param_typ" "param")";
|
||||
} else {
|
||||
param = "";
|
||||
print "glibtop_get_"feature"_l (glibtop *server, glibtop_"feature" *buf)";
|
||||
}
|
||||
|
||||
print "glibtop_get_"feature"_l (glibtop *server, glibtop_"feature" *buf"param")";
|
||||
|
||||
print "{";
|
||||
print "\tglibtop_init_r (&server, GLIBTOP_SYSDEPS_"toupper(feature)", 0);";
|
||||
print "";
|
||||
print "\tif ((server->flags & _GLIBTOP_INIT_STATE_SERVER) &&";
|
||||
print "\t (server->features & (1 << GLIBTOP_SYSDEPS_"toupper(feature)")))";
|
||||
print "\t{";
|
||||
|
||||
if (feature ~ /^proc_/) {
|
||||
print "\t\tglibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)",";
|
||||
print "\t\t\t\tsizeof (pid_t), &pid,";
|
||||
print "\t\t\t\tsizeof (glibtop_"feature"),";
|
||||
print "\t\t\t\tbuf);";
|
||||
print "\t} else {";
|
||||
print "#if (!GLIBTOP_SUID_"toupper(feature)")";
|
||||
print "\t\tglibtop_get_"feature"_r (server, buf, pid);";
|
||||
} else if (feature ~ /^fsusage$/) {
|
||||
print "\t\tglibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)",";
|
||||
print "\t\t\t\tstrlen (mountdir) + 1, mountdir,";
|
||||
print "\t\t\t\tsizeof (glibtop_"feature"), buf);";
|
||||
print "\t} else {";
|
||||
print "#if (!GLIBTOP_SUID_"toupper(feature)")";
|
||||
print "\t\tglibtop_get_"feature"_r (server, buf, mountdir);";
|
||||
|
||||
if (param == "")
|
||||
print "\t\t"prefix"glibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)", 0, NULL,";
|
||||
else
|
||||
print "\t\t"prefix"glibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)",";
|
||||
|
||||
if (param == "") {
|
||||
print "\t\t\t\t"prefix_space"sizeof (glibtop_"feature"), buf);";
|
||||
} else {
|
||||
if (feature ~ /^mountlist$/) {
|
||||
print "\t\treturn glibtop_call_l (server, GLIBTOP_CMND_MOUNTLIST,";
|
||||
print "\t\t\t\t sizeof (all_fs), &all_fs,";
|
||||
print "\t\t\t\t sizeof (glibtop_mountlist),";
|
||||
print "\t\t\t\t buf);";
|
||||
} else if (feature ~ /^proclist$/) {
|
||||
print "\t\treturn glibtop_call_l (server, GLIBTOP_CMND_PROCLIST,";
|
||||
print "\t\t\t\t 0, NULL, sizeof (glibtop_proclist),";
|
||||
print "\t\t\t\t buf);";
|
||||
} else {
|
||||
print "\t\tglibtop_call_l (server, GLIBTOP_CMND_"toupper(feature)", 0, NULL,";
|
||||
print "\t\t\t\tsizeof (glibtop_"feature"), buf);";
|
||||
}
|
||||
print "\t} else {";
|
||||
if (orig ~ /^@/) {
|
||||
if (feature ~ /^mountlist$/) {
|
||||
print "\t\t"prefix"glibtop_get_"feature"_r (server, buf, all_fs);";
|
||||
} else {
|
||||
print "\t\t"prefix"glibtop_get_"feature"_s (server, buf);";
|
||||
}
|
||||
} else {
|
||||
print "#if (!GLIBTOP_SUID_"toupper(feature)")";
|
||||
print "\t\t"prefix"glibtop_get_"feature"_r (server, buf);";
|
||||
}
|
||||
print "\t\t\t\t"prefix_space""param_size", "param_ptr",";
|
||||
print "\t\t\t\t"prefix_space"sizeof (glibtop_"feature"),";
|
||||
print "\t\t\t\t"prefix_space"buf);";
|
||||
}
|
||||
if (!(orig ~ /^@/)) {
|
||||
|
||||
print "\t} else {";
|
||||
|
||||
if (orig !~ /^@/)
|
||||
print "#if (!GLIBTOP_SUID_"toupper(feature)")";
|
||||
|
||||
if (param == "")
|
||||
print "\t\t"prefix"glibtop_get_"feature"_r (server, buf);";
|
||||
else
|
||||
print "\t\t"prefix"glibtop_get_"feature"_r (server, buf, "param");";
|
||||
|
||||
if (orig !~ /^@/) {
|
||||
print "#else";
|
||||
print "\t\terrno = ENOSYS;";
|
||||
print "\t\tglibtop_error_io_r (server, \"glibtop_get_"feature"\");";
|
||||
print "#endif";
|
||||
}
|
||||
|
||||
print "\t}";
|
||||
print "}";
|
||||
print "";
|
||||
}
|
||||
|
||||
/^@(\w+)/ { output($1) }
|
||||
|
||||
/^(\w+)/ { output($1) }
|
||||
/^[^#]/ { output($0) }
|
||||
|
||||
|
||||
12
lib/open.c
12
lib/open.c
@@ -101,7 +101,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
|
||||
break;
|
||||
case GLIBTOP_METHOD_PIPE:
|
||||
fprintf (stderr, "Opening pipe to server (%s).\n",
|
||||
GTOP_SERVER);
|
||||
LIBGTOP_SERVER);
|
||||
|
||||
if (pipe (server->input) || pipe (server->output))
|
||||
glibtop_error_io_r (server, "cannot make a pipe");
|
||||
@@ -115,15 +115,17 @@ glibtop_open_l (glibtop *server, const char *program_name,
|
||||
close (server->input [0]); close (server->output [1]);
|
||||
dup2 (server->input [1], 1);
|
||||
dup2 (server->output [0], 0);
|
||||
execl (GTOP_SERVER, NULL);
|
||||
glibtop_error_io_r (server, "execl (%s)", GTOP_SERVER);
|
||||
execl (LIBGTOP_SERVER, NULL);
|
||||
glibtop_error_io_r (server, "execl (%s)",
|
||||
LIBGTOP_SERVER);
|
||||
_exit (2);
|
||||
}
|
||||
|
||||
close (server->input [1]);
|
||||
close (server->output [0]);
|
||||
|
||||
sprintf (version, "%s server %s ready.\n", PACKAGE, VERSION);
|
||||
sprintf (version, "Libgtop server %s ready.\n",
|
||||
LIBGTOP_VERSION);
|
||||
|
||||
glibtop_read_l (server, sizeof (nbytes), &nbytes);
|
||||
|
||||
@@ -135,7 +137,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
|
||||
|
||||
if (memcmp (version, buffer, strlen (version)))
|
||||
glibtop_error_r (server, "server version is not %s",
|
||||
VERSION);
|
||||
LIBGTOP_VERSION);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user