Index: /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py =================================================================== --- /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (revision 30344) +++ /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (revision 30345) @@ -426,4 +426,24 @@ pass vbox.unregisterCallback(cb) + +def monitorVBox2(ctx, dur): + vbox = ctx['vb'] + print vbox.eventSource + listener = vbox.eventSource.createListener() + if dur == -1: + # not infinity, but close enough + dur = 100000 + try: + vbox.eventSource.registerListener(listener, [ctx['global'].constants.VBoxEventType_All], False) + end = time.time() + dur + while time.time() < end: + ev = vbox.eventSource.getEvent(500) + if ev: + print "got event: %s %s" %(ev, str(ev.type)) + # We need to catch all exceptions here, otherwise callback will never be unregistered + except: + traceback.print_exc() + pass + vbox.eventSource.unregisterListener(listener) @@ -1387,4 +1407,14 @@ dur = float(args[1]) monitorVBox(ctx, dur) + return 0 + +def monitorVBox2Cmd(ctx, args): + if (len(args) > 2): + print "usage: monitorVBox2 (duration)" + return 0 + dur = 5 + if len(args) > 1: + dur = float(args[1]) + monitorVBox2(ctx, dur) return 0 @@ -2856,4 +2886,5 @@ 'monitorGuest':['Monitor what happens with the guest for some time: monitorGuest Win32 10', monitorGuestCmd, 0], 'monitorVBox':['Monitor what happens with Virtual Box for some time: monitorVBox 10', monitorVBoxCmd, 0], + 'monitorVBox2':['(temp)Monitor what happens with Virtual Box for some time: monitorVBox2 10', monitorVBox2Cmd, 0], 'portForward':['Setup permanent port forwarding for a VM, takes adapter number host port and guest port: portForward Win32 0 8080 80', portForwardCmd, 0], 'showLog':['Show log file of the VM, : showLog Win32', showLogCmd, 0], Index: /trunk/src/VBox/Main/EventImpl.cpp =================================================================== --- /trunk/src/VBox/Main/EventImpl.cpp (revision 30344) +++ /trunk/src/VBox/Main/EventImpl.cpp (revision 30345) @@ -61,4 +61,9 @@ HRESULT rc = S_OK; + AssertReturn(aSource != NULL, E_INVALIDARG); + + AutoInitSpan autoInitSpan(this); + AssertReturn(autoInitSpan.isOk(), E_FAIL); + m->mSource = aSource; m->mType = aType; @@ -74,10 +79,12 @@ { AssertFailed (); - rc = setError(E_FAIL, - tr("Internal error (%Rrc)"), vrc); - break; + return setError(E_FAIL, + tr("Internal error (%Rrc)"), vrc); } } } while (0); + + /* Confirm a successful initialization */ + autoInitSpan.setSucceeded(); return rc; @@ -231,5 +238,7 @@ return TRUE; case VBoxEventType_MachineEvent: - return (what == VBoxEventType_OnMachineStateChange) || (what == VBoxEventType_OnMachineDataChange); + return (what == VBoxEventType_OnMachineStateChange) + || (what == VBoxEventType_OnMachineDataChange) + || (what == VBoxEventType_OnMachineRegistered); case VBoxEventType_Invalid: return FALSE; @@ -262,6 +271,9 @@ } - ::RTCritSectInitEx(&mcsQLock, 0, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL); - ::RTSemEventCreate (&mQEvent); + if (!mActive) + { + ::RTCritSectInitEx(&mcsQLock, 0, NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY, NULL); + ::RTSemEventCreate (&mQEvent); + } } @@ -275,6 +287,9 @@ } - ::RTCritSectDelete(&mcsQLock); - ::RTSemEventDestroy(mQEvent); + if (!mActive) + { + ::RTCritSectDelete(&mcsQLock); + ::RTSemEventDestroy(mQEvent); + } } @@ -343,4 +358,11 @@ } + +EventSource::EventSource() +{} + +EventSource::~EventSource() +{} + HRESULT EventSource::FinalConstruct() { @@ -355,8 +377,13 @@ } - -HRESULT EventSource::init() +HRESULT EventSource::init(IUnknown * aParent) { HRESULT rc = S_OK; + + AutoInitSpan autoInitSpan(this); + AssertReturn(autoInitSpan.isOk(), E_FAIL); + + /* Confirm a successful initialization */ + autoInitSpan.setSucceeded(); return rc; } @@ -366,4 +393,21 @@ m->mListeners.clear(); // m->mEvMap shall be cleared at this point too by destructors +} + +STDMETHODIMP EventSource::CreateListener(IEventListener ** aListener) +{ + CheckComArgOutPointerValid(aListener); + + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + ComPtr listener; + + HRESULT rc = listener.createLocalObject(CLSID_CallbackWrapper); + ComAssertMsgRet(SUCCEEDED(rc), ("Could not create wrapper object (%Rrc)", rc), + E_FAIL); + + listener.queryInterfaceTo(aListener); + return S_OK; } @@ -487,12 +531,8 @@ if (it != m->mListeners.end()) - { rc = it->second.dequeue(aEvent, aTimeout); - } - else - { + else rc = setError(VBOX_E_OBJECT_NOT_FOUND, tr("Listener was never registered")); - } return rc; Index: /trunk/src/VBox/Main/VirtualBoxCallbackImpl.cpp =================================================================== --- /trunk/src/VBox/Main/VirtualBoxCallbackImpl.cpp (revision 30344) +++ /trunk/src/VBox/Main/VirtualBoxCallbackImpl.cpp (revision 30345) @@ -18,4 +18,5 @@ #include "VirtualBoxCallbackImpl.h" #include "Logging.h" +#include "AutoCaller.h" HRESULT CallbackWrapper::FinalConstruct() @@ -31,4 +32,8 @@ HRESULT CallbackWrapper::init() { + AutoInitSpan autoInitSpan(this); + AssertReturn(autoInitSpan.isOk(), E_FAIL); + /* Confirm a successful initialization */ + autoInitSpan.setSucceeded(); return S_OK; } @@ -316,2 +321,8 @@ return mConsoleCallback->OnShowWindow(winId); } + +STDMETHODIMP CallbackWrapper::HandleEvent(IEvent * aEvent) +{ + ComAssertMsgRet(false, ("HandleEvent() of wrapper shall never be called"), + E_FAIL); +} Index: /trunk/src/VBox/Main/VirtualBoxImpl.cpp =================================================================== --- /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 30344) +++ /trunk/src/VBox/Main/VirtualBoxImpl.cpp (revision 30345) @@ -67,4 +67,5 @@ #include "PerformanceImpl.h" #endif /* VBOX_WITH_RESOURCE_USAGE_API */ +#include "EventImpl.h" #include "AutoCaller.h" @@ -355,4 +356,5 @@ ComEventsHelper mComEvHelper; #endif + const ComObjPtr pEventSource; }; @@ -532,4 +534,10 @@ if (FAILED(rc)) throw rc; } + + /* events */ + if (SUCCEEDED(rc = unconst(m->pEventSource).createObject())) + rc = m->pEventSource->init(this); + if (FAILED(rc)) throw rc; + } catch (HRESULT err) @@ -595,5 +603,4 @@ rc = m->mComEvHelper.init(IID_IVirtualBoxCallback); #endif - /* Confirm a successful initialization when it's the case */ if (SUCCEEDED(rc)) @@ -736,4 +743,11 @@ m->pHost->uninit(); unconst(m->pHost).setNull(); + } + + LogFlowThisFunc(("Releasing event source...\n")); + if (m->pEventSource) + { + m->pEventSource->uninit(); + unconst(m->pEventSource).setNull(); } @@ -1041,4 +1055,18 @@ SafeIfaceArray svrs(m->ollDHCPServers.getList()); svrs.detachTo(ComSafeArrayOutArg(aDHCPServers)); + + return S_OK; +} + +STDMETHODIMP +VirtualBox::COMGETTER(EventSource)(IEventSource ** aEventSource) +{ + CheckComArgOutPointerValid(aEventSource); + + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + /* event source is const, no need to lock */ + m->pEventSource.queryInterfaceTo(aEventSource); return S_OK; Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 30344) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 30345) @@ -1605,5 +1605,5 @@ @@ -1738,4 +1738,11 @@ + + + + Event source for VirtualBox events. + + + @@ -13979,5 +13986,5 @@ - + @@ -14595,6 +14602,41 @@ - - + + + IVirtualBoxCallback::onMediumRegistered + + + + + IVirtualBoxCallback::onMachineRegistered + + + + + IVirtualBoxCallback::onSessionStateChange + + + + + IVirtualBoxCallback::onSnapshotTaken + + + + + IVirtualBoxCallback::onSnapshotDeleted + + + + + IVirtualBoxCallback::onSnapshotChange + + + + + IVirtualBoxCallback::onGuestPropertyChange + + + + Must be last event, used for iterations. @@ -14617,4 +14659,12 @@ + + + Creates new listener object, useful for passive mode. + IEventListener + + + + @@ -14644,5 +14694,5 @@ - Unregister an event listener. If listener is passive, and some waitable events are still + Unregister an event listener. If listener is passive, and some waitable events are still in queue they are marked as processed automatically. @@ -14688,6 +14738,6 @@ - Must be called for waitable events when particular listener finished event processing. - When all listeners who this event was aimed to call eventProcessed() event source + Must be called for waitable events when particular listener finished event processing. + When all listeners who this event was aimed to call eventProcessed() event source can call event's setProcessed(). @@ -14773,6 +14823,20 @@ + + Base interface for all machine events. + + + ID of the machine this event relates to. + + + + + Machine state change event. - - ID of the machine this event relates to. - - - - New execution state. - + + New execution state. + - - - ID of the machine this event relates to. - - + + + + + The given machine was registered or unregistered + within this VirtualBox installation. + + + + + If @c true, the machine was registered, otherwise it was + unregistered. + + + + + + + The state of the session for the given machine was changed. + IMachine::sessionState + + + + + New session state. + + + + + + + Notification when a guest property has changed. + + + + + The name of the property that has changed. + + + + + + The new property value. + + + + + + The new property flags. + + + + + + + Base interface for all snapshot events. + + + ID of the snapshot this event relates to. + + + + + + + A new snapshot of the machine has been taken. + ISnapshot + + + + + + Snapshot of the given machine has been deleted. + + + This notification is delivered after the snapshot + object has been uninitialized on the server (so that any + attempt to call its methods will return an error). + + + ISnapshot + + + + + + Snapshot properties (name and/or description) have been changed. + ISnapshot + @@ -14851,9 +15023,10 @@ - + Index: /trunk/src/VBox/Main/include/EventImpl.h =================================================================== --- /trunk/src/VBox/Main/include/EventImpl.h (revision 30344) +++ /trunk/src/VBox/Main/include/EventImpl.h (revision 30345) @@ -69,7 +69,7 @@ class ATL_NO_VTABLE EventSource : + public VirtualBoxBase, public VirtualBoxSupportErrorInfoImpl, public VirtualBoxSupportTranslation, - public VirtualBoxBase, VBOX_SCRIPTABLE_IMPL(IEventSource) { @@ -88,6 +88,5 @@ END_COM_MAP() - EventSource() {} - virtual ~EventSource() {} + DECLARE_EMPTY_CTOR_DTOR (EventSource) HRESULT FinalConstruct(); @@ -95,8 +94,9 @@ // public initializer/uninitializer for internal purposes only - HRESULT init (); + HRESULT init (IUnknown * aParent); void uninit(); // IEventSource methods + STDMETHOD(CreateListener)(IEventListener ** aListener); STDMETHOD(RegisterListener)(IEventListener * aListener, ComSafeArrayIn(VBoxEventType_T, aInterested), Index: /trunk/src/VBox/Main/include/VirtualBoxCallbackImpl.h =================================================================== --- /trunk/src/VBox/Main/include/VirtualBoxCallbackImpl.h (revision 30344) +++ /trunk/src/VBox/Main/include/VirtualBoxCallbackImpl.h (revision 30345) @@ -25,5 +25,6 @@ VBOX_SCRIPTABLE_IMPL(ILocalOwner), VBOX_SCRIPTABLE_IMPL(IConsoleCallback), - VBOX_SCRIPTABLE_IMPL(IVirtualBoxCallback) + VBOX_SCRIPTABLE_IMPL(IVirtualBoxCallback), + VBOX_SCRIPTABLE_IMPL(IEventListener) #ifdef RT_OS_WINDOWS , public CComCoClass @@ -45,4 +46,5 @@ COM_INTERFACE_ENTRY(IVirtualBoxCallback) COM_INTERFACE_ENTRY(IConsoleCallback) + COM_INTERFACE_ENTRY(IEventListener) END_COM_MAP() @@ -95,4 +97,7 @@ STDMETHOD(OnShowWindow)(ULONG64 *winId); + // IEventListener + STDMETHOD(HandleEvent)(IEvent *aEvent); + // for VirtualBoxSupportErrorInfoImpl static const wchar_t *getComponentName() { return L"CallbackWrapper"; } Index: /trunk/src/VBox/Main/include/VirtualBoxImpl.h =================================================================== --- /trunk/src/VBox/Main/include/VirtualBoxImpl.h (revision 30344) +++ /trunk/src/VBox/Main/include/VirtualBoxImpl.h (revision 30345) @@ -96,5 +96,5 @@ CONNECTION_POINT_ENTRY(IID_IVirtualBoxCallback) END_CONNECTION_POINT_MAP() - + typedef CComDynamicUnkArray EventListenersList; #endif @@ -130,4 +130,5 @@ STDMETHOD(COMGETTER(PerformanceCollector)) (IPerformanceCollector **aPerformanceCollector); STDMETHOD(COMGETTER(DHCPServers)) (ComSafeArrayOut (IDHCPServer *, aDHCPServers)); + STDMETHOD(COMGETTER(EventSource)) (IEventSource ** aEventSource); /* IVirtualBox methods */ Index: /trunk/src/VBox/Main/xpcom/module.cpp =================================================================== --- /trunk/src/VBox/Main/xpcom/module.cpp (revision 30344) +++ /trunk/src/VBox/Main/xpcom/module.cpp (revision 30345) @@ -46,4 +46,5 @@ #include "ConsoleVRDPServer.h" #include "VirtualBoxCallbackImpl.h" +#include "EventImpl.h" #include "Logging.h" @@ -73,4 +74,6 @@ NS_DECL_CLASSINFO(RemoteDisplayInfo) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(RemoteDisplayInfo, IRemoteDisplayInfo) +NS_DECL_CLASSINFO(EventSource) +NS_IMPL_THREADSAFE_ISUPPORTS1_CI(EventSource, IEventSource) NS_DECL_CLASSINFO(Session) @@ -80,4 +83,5 @@ NS_DECL_CLASSINFO(CallbackWrapper) NS_IMPL_THREADSAFE_ISUPPORTS3_CI(CallbackWrapper, IVirtualBoxCallback, IConsoleCallback, ILocalOwner) + /** * Singleton class factory that holds a reference to the created instance Index: /trunk/src/VBox/Main/xpcom/server.cpp =================================================================== --- /trunk/src/VBox/Main/xpcom/server.cpp (revision 30344) +++ /trunk/src/VBox/Main/xpcom/server.cpp (revision 30345) @@ -87,4 +87,5 @@ #include #include +#include /* implement nsISupports parts of our objects with support for nsIClassInfo */ @@ -197,4 +198,7 @@ NS_DECL_CLASSINFO(BIOSSettings) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(BIOSSettings, IBIOSSettings) + +NS_DECL_CLASSINFO(EventSource) +NS_IMPL_THREADSAFE_ISUPPORTS1_CI(EventSource, IEventSource) ////////////////////////////////////////////////////////////////////////////////