bughz/sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sigar_t already has a handle to advapi32.dll, use it

Browse Source
This commit is contained in:
Doug MacEachern 2005-10-10 20:15:12 +00:00
parent d5558f8487
commit 77df863144
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bindings/java/src/jni/javasigar.c
View File

@ -2,6 +2,8 @@
#include "sigar.h"
#include "sigar_fileinfo.h"
#include "sigar_log.h"
#include "sigar_private.h"
#include "sigar_os.h"
#include <string.h>
@ -1184,6 +1186,11 @@ JNIEXPORT jlong SIGAR_JNI(Sigar_getServicePid)
SC_HANDLE mgr;
dSIGAR(0);
if (!sigar->adv_handle) {
sigar_throw_notimpl(env, "advapi32.dll not available");
return 0;
}
name = JENV->GetStringUTFChars(env, jname, &is_copy);
mgr = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE,
@ -1195,28 +1202,19 @@ JNIEXPORT jlong SIGAR_JNI(Sigar_getServicePid)
if (svc) {
SERVICE_STATUS_PROCESS status;
DWORD bytes;
HANDLE lib;
QueryServiceStatusExFunc status_query =
(QueryServiceStatusExFunc)
GetProcAddress(sigar->adv_handle,
"QueryServiceStatusEx");
if ((lib = LoadLibrary("advapi32.dll"))) {
QueryServiceStatusExFunc status_query;
status_query =
(QueryServiceStatusExFunc)
GetProcAddress(lib, "QueryServiceStatusEx");
if (!status_query) {
err = SIGAR_ENOTIMPL;
}
else if (status_query(svc,
SC_STATUS_PROCESS_INFO,
(LPBYTE)&status, sizeof(status), &bytes))
{
pid = status.dwProcessId;
}
else {
err = GetLastError();
}
FreeLibrary(lib);
if (!status_query) {
err = SIGAR_ENOTIMPL;
}
else if (status_query(svc,
SC_STATUS_PROCESS_INFO,
(LPBYTE)&status, sizeof(status), &bytes))
{
pid = status.dwProcessId;
}
else {
err = GetLastError();

1
bindings/java/src/net/hyperic/sigar/test/TestPTQL.java
View File

@ -45,6 +45,7 @@ public class TestPTQL extends SigarTestCase {
"Pid.PidFile.eq=pid.file",
"Pid.Pid.eq=1",
"Pid.Service.eq=Eventlog",
"Pid.Service.eq=NOSUCHSERVICE",
"Pid.Service.eq=Hyperic HQ Agent",
"State.Name.eq=java,Pid.Pid.ne=$$", //all java procs cept this one
"Cpu.Percent.ge=0.2",