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

Can't get cpu_stat_kstat, didn't close kstat, this will make other program

Browse Source 
2006-06-24  Benoît Dejean  <benoit@placenet.org>

	* open.c: (glibtop_get_kstats), (glibtop_open_s):

	Can't get cpu_stat_kstat, didn't close kstat, this will make other
	program used kstat wrong.
	Patch by hua.zhang@sun.com.
	Closes #345814.
This commit is contained in:
Benoît Dejean
2006-06-24 17:39:49 +00:00
committed by Benoît Dejean
parent 1826be8ef6
commit bc6ff2cb59
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sysdeps/solaris/ChangeLog
View File

@@ -1,3 +1,12 @@
2006-06-24 Benoît Dejean <benoit@placenet.org>
* open.c: (glibtop_get_kstats), (glibtop_open_s):
Can't get cpu_stat_kstat, didn't close kstat, this will make other
program used kstat wrong.
Patch by hua.zhang@sun.com.
Closes #345814.
2006-06-24 Benoît Dejean <benoit@placenet.org> 2006-06-24 Benoît Dejean <benoit@placenet.org>
* netlist.c: (glibtop_get_netlist_s): * netlist.c: (glibtop_get_netlist_s):

10
sysdeps/solaris/open.c
View File

@@ -83,7 +83,8 @@ glibtop_get_kstats(glibtop *server)
char cpu[20]; char cpu[20];
for(i = 0, checked = 0; i < GLIBTOP_NCPU || checked == new_ncpu; ++i) for(i = 0, checked = 0; i < GLIBTOP_NCPU || checked == new_ncpu; ++i)
if(server->machine.cpu_stat_kstat[i]) if(!server->machine.cpu_stat_kstat[i])
{ {
sprintf(cpu, "cpu_stat%d", i); sprintf(cpu, "cpu_stat%d", i);
if(!(server->machine.cpu_stat_kstat[i] = if(!(server->machine.cpu_stat_kstat[i] =
@@ -145,6 +146,8 @@ glibtop_open_s (glibtop *server, const char *program_name,
for(i = 0; page; ++i, page >>= 1); for(i = 0; page; ++i, page >>= 1);
server->machine.pagesize = i - 1; server->machine.pagesize = i - 1;
server->machine.ticks = sysconf(_SC_CLK_TCK); server->machine.ticks = sysconf(_SC_CLK_TCK);
if(server->machine.kc)
kstat_close(server->machine.kc);
server->machine.kc = kc = kstat_open (); server->machine.kc = kc = kstat_open ();
#if 0 #if 0
@@ -210,9 +213,11 @@ glibtop_open_s (glibtop *server, const char *program_name,
/* Now let's have a bit of magic dust... */ /* Now let's have a bit of magic dust... */
#if GLIBTOP_SOLARIS_RELEASE >= 560 #if GLIBTOP_SOLARIS_RELEASE >= 50600
dl = dlopen("/usr/lib/libproc.so", RTLD_LAZY); dl = dlopen("/usr/lib/libproc.so", RTLD_LAZY);
if(server->machine.libproc)
dlclose(server->machine.libproc);
server->machine.libproc = dl; server->machine.libproc = dl;
if(dl) if(dl)
{ {
@@ -226,6 +231,7 @@ glibtop_open_s (glibtop *server, const char *program_name,
server->machine.pgrab = (struct ps_prochandle *(*)(pid_t, int, int *)) server->machine.pgrab = (struct ps_prochandle *(*)(pid_t, int, int *))
dlsym(dl, "Pgrab"); dlsym(dl, "Pgrab");
server->machine.pfree = (void (*)(void *))dlsym(dl, "Pfree"); server->machine.pfree = (void (*)(void *))dlsym(dl, "Pfree");
} }
else else
{ {