(file) Return to JMPIProvider.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / JMPI

Diff for /pegasus/src/Pegasus/ProviderManager2/JMPI/JMPIProvider.h between version 1.9 and 1.18

version 1.9, 2006/07/11 18:39:36 version 1.18, 2008/12/02 09:01:58
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; Symantec Corporation; The Open Group.  
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // Permission is hereby granted, free of charge, to any person obtaining a
 // of this software and associated documentation files (the "Software"), to  // copy of this software and associated documentation files (the "Software"),
 // deal in the Software without restriction, including without limitation the  // to deal in the Software without restriction, including without limitation
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // sell copies of the Software, and to permit persons to whom the Software is  // and/or sell copies of the Software, and to permit persons to whom the
 // furnished to do so, subject to the following conditions:  // Software is furnished to do so, subject to the following conditions:
 // //
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // The above copyright notice and this permission notice shall be included
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // in all copies or substantial portions of the Software.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 // Author: Chip Vincent (cvincent@us.ibm.com)  //////////////////////////////////////////////////////////////////////////
 //  
 // Modified By: Yi Zhou, Hewlett-Packard Company(yi_zhou@hp.com)  
 //              Mike Day, IBM (mdday@us.ibm.com)  
 //              Adrian Schuur, schuur@de.ibm.com  
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #ifndef Pegasus_JMPIProvider_h #ifndef Pegasus_JMPIProvider_h
 #define Pegasus_JMPIProvider_h #define Pegasus_JMPIProvider_h
  
 #include "JMPIImpl.h"  
 #include <Pegasus/Common/Config.h> #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/IPC.h>  
 #include <Pegasus/Provider/CIMOMHandle.h> #include <Pegasus/Provider/CIMOMHandle.h>
 #include <Pegasus/Provider/CIMInstanceProvider.h> #include <Pegasus/Provider/CIMInstanceProvider.h>
 #include <Pegasus/Provider/CIMAssociationProvider.h> #include <Pegasus/Provider/CIMAssociationProvider.h>
 #include <Pegasus/Provider/CIMMethodProvider.h> #include <Pegasus/Provider/CIMMethodProvider.h>
   #include <Pegasus/Common/AtomicInt.h>
 //#include <Pegasus/ProviderManager2/CMPI/CMPIResolverModule.h>  
  
 #include <Pegasus/Server/Linkage.h> #include <Pegasus/Server/Linkage.h>
   #include <Pegasus/ProviderManager2/JMPI/Linkage.h>
   #include <Pegasus/ProviderManager2/JMPI/JMPIImpl.h>
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 class JMPIProviderModule; class JMPIProviderModule;
 class CMPIResolverModule;  
  
 struct ProviderVector { struct ProviderVector {
    jclass jProviderClass;    jclass jProviderClass;
Line 66 
Line 56 
 // provider module. It is wrapped in a facade to stabalize the interface // provider module. It is wrapped in a facade to stabalize the interface
 // and is directly tied to a module. // and is directly tied to a module.
  
 class PEGASUS_SERVER_LINKAGE JMPIProvider :  class PEGASUS_JMPIPM_LINKAGE JMPIProvider :
                        public virtual CIMProvider                        public virtual CIMProvider
 { {
 public: public:
Line 111 
Line 101 
  
     Status getStatus(void) const;     Status getStatus(void) const;
     String getName(void) const;     String getName(void) const;
     void setResolver(CMPIResolverModule *rm) { _rm=rm; }  
  
     JMPIProviderModule *getModule(void) const;     JMPIProviderModule *getModule(void) const;
  
     Boolean operator == (const void *key) const;  
     Boolean operator == (const JMPIProvider & prov) const;  
   
 //    virtual void get_idle_timer(struct timeval *);  
 //    virtual void update_idle_timer(void);  
 //    virtual Boolean pending_operation(void);  
 //    virtual Boolean unload_ok(void); //    virtual Boolean unload_ok(void);
  
 //   force provider manager to keep in memory //   force provider manager to keep in memory
Line 199 
Line 182 
 private: private:
     friend class JMPILocalProviderManager;     friend class JMPILocalProviderManager;
     friend class JMPIProviderManager;     friend class JMPIProviderManager;
     friend class ProviderManagerService;  
     class OpProviderHolder;     class OpProviderHolder;
     friend class OpProviderHolder;     friend class OpProviderHolder;
     mutable Mutex _cimomMutex;     mutable Mutex _cimomMutex;
Line 215 
Line 197 
     void *jProviderClass,*jProvider;     void *jProviderClass,*jProvider;
     String _name;     String _name;
     AtomicInt _no_unload;     AtomicInt _no_unload;
     CMPIResolverModule *_rm;  
     Uint32 _quantum;     Uint32 _quantum;
     AtomicInt _current_operations;     AtomicInt _current_operations;
     mutable Mutex _statusMutex;     mutable Mutex _statusMutex;


Legend:
Removed from v.1.9  
changed lines
  Added in v.1.18

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2