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

cleanup control stuff

This commit is contained in:
Doug MacEachern 2005-06-26 05:27:35 +00:00
parent bf281b55b6
commit 7f2451aa76
2 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bindings/java/src/jni/win32/service.cpp
View File

@ -67,6 +67,9 @@ JNIEXPORT jboolean SIGAR_JNI(win32_Service_ControlService)
(JNIEnv *, jclass, jlong handle, jint control) (JNIEnv *, jclass, jlong handle, jint control)
{ {
SERVICE_STATUS status; SERVICE_STATUS status;
if (control == 0) {
return StartService((SC_HANDLE)handle, 0, NULL);
}
return ControlService((SC_HANDLE)handle, control, &status); return ControlService((SC_HANDLE)handle, control, &status);
} }
@ -200,20 +203,6 @@ SIGAR_JNI(win32_Service_QueryServiceStatus)
return iResult; return iResult;
} }
JNIEXPORT jboolean SIGAR_JNI(win32_Service_StartService)
(JNIEnv *, jclass, jlong handle)
{
return StartService((SC_HANDLE)handle, 0, NULL);
}
JNIEXPORT jboolean SIGAR_JNI(win32_Service_StopService)
(JNIEnv *, jclass, jlong handle)
{
SERVICE_STATUS status;
return ControlService((SC_HANDLE)handle, SERVICE_CONTROL_STOP, &status);
}
JNIEXPORT jobject SIGAR_JNI(win32_Service_getServiceNames) JNIEXPORT jobject SIGAR_JNI(win32_Service_getServiceNames)
(JNIEnv *env, jclass) (JNIEnv *env, jclass)
{ {

47
bindings/java/src/net/hyperic/sigar/win32/Service.java
View File

@ -25,21 +25,10 @@ public class Service extends Win32 {
}; };
// Service Controls // Service Controls
private static final int SERVICE_CONTROL_STOP = 0x00000001; private static final int CONTROL_START = 0x00000000;
private static final int SERVICE_CONTROL_PAUSE = 0x00000002; private static final int CONTROL_STOP = 0x00000001;
private static final int SERVICE_CONTROL_CONTINUE = 0x00000003; private static final int CONTROL_PAUSE = 0x00000002;
private static final int SERVICE_CONTROL_INTERROGATE = 0x00000004; private static final int CONTROL_RESUME = 0x00000003;
private static final int SERVICE_CONTROL_SHUTDOWN = 0x00000005;
private static final int SERVICE_CONTROL_PARAMCHANGE = 0x00000006;
private static final int SERVICE_CONTROL_NETBINDADD = 0x00000007;
private static final int SERVICE_CONTROL_NETBINDREMOVE = 0x00000008;
private static final int SERVICE_CONTROL_NETBINDENABLE = 0x00000009;
private static final int SERVICE_CONTROL_NETBINDDISABLE = 0x0000000A;
private static final int SERVICE_CONTROL_DEVICEEVENT = 0x0000000B;
private static final int SERVICE_CONTROL_HARDWAREPROFILECHANGE
= 0x0000000C;
private static final int SERVICE_CONTROL_POWEREVENT = 0x0000000D;
private static final int SERVICE_CONTROL_SESSIONCHANGE = 0x0000000E;
// Service Control Manager object specific access types // Service Control Manager object specific access types
private static final int STANDARD_RIGHTS_REQUIRED = (int)0x000F0000L; private static final int STANDARD_RIGHTS_REQUIRED = (int)0x000F0000L;
@ -170,14 +159,6 @@ public class Service extends Win32 {
DeleteService(this.service); DeleteService(this.service);
} }
public void control(int control)
throws Win32Exception
{
if (!ControlService(this.service, control)) {
throw getLastErrorException();
}
}
public void setDescription(String description) public void setDescription(String description)
{ {
ChangeServiceDescription(this.service, description); ChangeServiceDescription(this.service, description);
@ -202,13 +183,6 @@ public class Service extends Win32 {
return STATUS[getStatus()]; return STATUS[getStatus()];
} }
public void stop() throws Win32Exception
{
if (StopService(this.service) == false) {
throw getLastErrorException();
}
}
private static class Waiter { private static class Waiter {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
Service service; Service service;
@ -250,6 +224,13 @@ public class Service extends Win32 {
} }
} }
public void stop() throws Win32Exception
{
if (ControlService(this.service, CONTROL_STOP) == false) {
throw getLastErrorException();
}
}
public void stop(long timeout) throws Win32Exception public void stop(long timeout) throws Win32Exception
{ {
long status; long status;
@ -266,7 +247,7 @@ public class Service extends Win32 {
public void start() throws Win32Exception public void start() throws Win32Exception
{ {
if (StartService(this.service) == false) { if (ControlService(this.service, CONTROL_START) == false) {
throw getLastErrorException(); throw getLastErrorException();
} }
} }
@ -331,10 +312,6 @@ public class Service extends Win32 {
private static native int QueryServiceStatus(long handle); private static native int QueryServiceStatus(long handle);
private static native boolean StartService(long handle);
private static native boolean StopService(long handle);
private static native boolean QueryServiceConfig(long handle, private static native boolean QueryServiceConfig(long handle,
ServiceConfig config); ServiceConfig config);