Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Total rewrite. socket/localsocket should be much faster.

Browse Source 
* procopenfiles.c: (parse_file), (get_all), (inet_socket_parser),
	(get_all_inet_sockets), (local_socket_parser),
	(get_all_local_sockets), (glibtop_get_proc_open_files_s): Total rewrite.
	socket/localsocket should be much faster.
This commit is contained in:
Benoît Dejean
2005-01-21 23:30:54 +00:00
parent 91dda5b70d
commit 46380bf655
2 changed files with 142 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sysdeps/linux/ChangeLog
View File

@@ -1,3 +1,10 @@
2005-01-22 Benoît Dejean <TazForEver@dlfp.org>
* procopenfiles.c: (parse_file), (get_all), (inet_socket_parser),
(get_all_inet_sockets), (local_socket_parser),
(get_all_local_sockets), (glibtop_get_proc_open_files_s): Total rewrite.
socket/localsocket should be much faster.
2005-01-16 Benoît Dejean <TazForEver@dlfp.org>
* glibtop_private.c: (skip_token):

186
sysdeps/linux/procopenfiles.c
View File

@@ -50,48 +50,126 @@ glibtop_init_proc_open_files_s (glibtop *server)
struct SocketEndPoint
typedef void (*LineParser)(GHashTable *dict, const char *line);
static void
parse_file(const char *filename, LineParser parser, GHashTable *dict)
{
char host[GLIBTOP_OPEN_DEST_HOST_LEN + 1];
int port;
int sock;
};
static GArray* get_all_sockets()
{
GArray *socks;
FILE *tcp;
FILE *f;
char line[1024];
socks = g_array_new(FALSE, FALSE, sizeof(struct SocketEndPoint));
f = fopen(filename, "r");
g_return_val_if_fail((tcp = fopen("/proc/net/tcp", "r")), socks);
if(!f) {
g_warning("Cannot open '%s'", filename);
return;
}
if(!fgets(line, sizeof line, tcp)) goto eof;
/* skip the first line */
if(!fgets(line, sizeof line, f)) goto eof;
while(fgets(line, sizeof line, tcp))
while(fgets(line, sizeof line, f))
{
struct SocketEndPoint sep;
unsigned addr;
if(sscanf(line, "%*d: %*x:%*x %8x:%4x %*x %*x:%*x %*x:%*x %*d %*d %*d %d",
&addr, &sep.port, &sep.sock) != 3)
continue;
if(!inet_ntop(AF_INET, &addr, sep.host, sizeof sep.host))
continue;
g_array_append_val(socks, sep);
parser(dict, line);
}
eof:
fclose(tcp);
return socks;
fclose(f);
}
static GHashTable*
get_all(const char *filename, LineParser parser)
{
GHashTable *dict;
dict = g_hash_table_new_full(g_direct_hash, g_direct_equal,
NULL, g_free);
parse_file(filename, parser, dict);
return dict;
}
struct InetSocketEntry
{
char host[GLIBTOP_OPEN_DEST_HOST_LEN + 1];
int port;
};
static void
inet_socket_parser(GHashTable *dict, const char* line)
{
struct InetSocketEntry *se;
int sock;
unsigned addr;
se = g_malloc0(sizeof *se);
if(sscanf(line, "%*d: %*x:%*x %8x:%4x %*x %*x:%*x %*x:%*x %*d %*d %*d %d",
&addr, &se->port, &sock) != 3)
goto error;
if(!inet_ntop(AF_INET, &addr, se->host, sizeof se->host))
goto error;
g_hash_table_insert(dict, GINT_TO_POINTER(sock), se);
return;
error:
g_free(se);
}
static inline GHashTable *
get_all_inet_sockets()
{
return get_all("/proc/net/tcp", inet_socket_parser);
}
struct LocalSocketEntry
{
char name[GLIBTOP_OPEN_DEST_HOST_LEN + 1];
};
static void
local_socket_parser(GHashTable *dict, const char *line)
{
int sock;
struct LocalSocketEntry *use;
char *p;
use = g_malloc0(sizeof *use);
/* dfaf1640: 00000003 00000000 00000000 0001 03 6457 /dev/log */
p = skip_multiple_token(line, 6);
sock = strtoul(p, &p, 10);
g_strlcpy(use->name, p, sizeof use->name);
g_strstrip(use->name);
g_hash_table_insert(dict, GINT_TO_POINTER(sock), use);
}
static inline GHashTable *
get_all_local_sockets()
{
return get_all("/proc/net/unix", local_socket_parser);
}
/* Provides detailed information about a process' open files */
glibtop_open_files_entry *
@@ -99,7 +177,7 @@ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pi
{
char fn [BUFSIZ];
GArray *entries;
GArray *socks = NULL;
GHashTable *inet_sockets = NULL, *local_sockets = NULL;
struct dirent *direntry;
DIR *dir;
@@ -119,7 +197,6 @@ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pi
int rv;
glibtop_open_files_entry entry = {0};
if(direntry->d_name[0] == '.')
continue;
@@ -134,33 +211,38 @@ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pi
if(g_str_has_prefix(tgt, "socket:["))
{
unsigned i;
int sockfd;
struct InetSocketEntry *ise;
struct LocalSocketEntry *lse;
if(!socks)
socks = get_all_sockets();
entry.type = GLIBTOP_FILE_TYPE_INETSOCKET;
if(!inet_sockets) inet_sockets = get_all_inet_sockets();
if(!local_sockets) local_sockets = get_all_local_sockets();
sockfd = atoi(tgt + 8);
for(i = 0; i < socks->len; ++i)
{
const struct SocketEndPoint *sep;
ise = g_hash_table_lookup(inet_sockets,
GINT_TO_POINTER(sockfd));
sep = & g_array_index(socks,
struct SocketEndPoint,
i);
if(ise) {
entry.type = GLIBTOP_FILE_TYPE_INETSOCKET;
entry.info.sock.dest_port = ise->port;
g_strlcpy(entry.info.sock.dest_host, ise->host,
sizeof entry.info.sock.dest_host);
goto found;
}
if(sep->sock == sockfd)
{
entry.info.sock.dest_port = sep->port;
memcpy(entry.info.sock.dest_host,
sep->host,
sizeof sep->host);
break;
}
lse = g_hash_table_lookup(local_sockets,
GINT_TO_POINTER(sockfd));
if(lse) {
entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET;
g_strlcpy(entry.info.localsock.name, lse->name,
sizeof entry.info.localsock.name);
goto found;
}
found:
(void)0; /* kills warning */
}
else if(g_str_has_prefix(tgt, "pipe:["))
{
@@ -177,8 +259,8 @@ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pi
closedir (dir);
if(socks)
g_array_free(socks, TRUE);
if(inet_sockets) g_hash_table_destroy(inet_sockets);
if(local_sockets) g_hash_table_destroy(local_sockets);
buf->flags = _glibtop_sysdeps_proc_open_files;
buf->number = entries->len;