1.1 --- a/src/share/vm/services/attachListener.hpp Fri Oct 05 13:37:08 2012 -0700
1.2 +++ b/src/share/vm/services/attachListener.hpp Wed Oct 10 14:35:58 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -52,21 +52,21 @@
1.11
1.12 class AttachListener: AllStatic {
1.13 public:
1.14 - static void init() KERNEL_RETURN;
1.15 - static void abort() KERNEL_RETURN;
1.16 + static void init() NOT_SERVICES_RETURN;
1.17 + static void abort() NOT_SERVICES_RETURN;
1.18
1.19 // invoke to perform clean-up tasks when all clients detach
1.20 - static void detachall() KERNEL_RETURN;
1.21 + static void detachall() NOT_SERVICES_RETURN;
1.22
1.23 // indicates if the Attach Listener needs to be created at startup
1.24 - static bool init_at_startup() KERNEL_RETURN_(false);
1.25 + static bool init_at_startup() NOT_SERVICES_RETURN_(false);
1.26
1.27 // indicates if we have a trigger to start the Attach Listener
1.28 - static bool is_init_trigger() KERNEL_RETURN_(false);
1.29 + static bool is_init_trigger() NOT_SERVICES_RETURN_(false);
1.30
1.31 -#ifdef SERVICES_KERNEL
1.32 +#if !INCLUDE_SERVICES
1.33 static bool is_attach_supported() { return false; }
1.34 -#else // SERVICES_KERNEL
1.35 +#else
1.36 private:
1.37 static volatile bool _initialized;
1.38
1.39 @@ -94,10 +94,10 @@
1.40
1.41 // dequeue the next operation
1.42 static AttachOperation* dequeue();
1.43 -#endif // SERVICES_KERNEL
1.44 +#endif // !INCLUDE_SERVICES
1.45 };
1.46
1.47 -#ifndef SERVICES_KERNEL
1.48 +#if INCLUDE_SERVICES
1.49 class AttachOperation: public CHeapObj<mtInternal> {
1.50 public:
1.51 enum {
1.52 @@ -151,6 +151,6 @@
1.53 // complete operation by sending result code and any result data to the client
1.54 virtual void complete(jint result, bufferedStream* result_stream) = 0;
1.55 };
1.56 -#endif // SERVICES_KERNEL
1.57 +#endif // INCLUDE_SERVICES
1.58
1.59 #endif // SHARE_VM_SERVICES_ATTACHLISTENER_HPP
