-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include "SALOMEconfig.h"
#include CORBA_SERVER_HEADER(SALOME_SDS)
+#include "SALOMESDS_RequestSwitcher.hxx"
#include "SALOMESDS_RefCountServ.hxx"
#include "SALOMESDS_AutoRefCountPtr.hxx"
#include "SALOMESDS_BasicDataServer.hxx"
+#include "SALOMESDS_Auto.hxx"
#include "SALOMESDS_Defines.hxx"
+#include "SALOME_CPythonHelper.hxx"
#include <Python.h>
#include <vector>
#include <list>
+class SALOME_NamingService_Container_Abstract;
+
namespace SALOMESDS
{
class SALOMESDS_EXPORT DataScopeKiller : public POA_SALOME::DataScopeKiller
private:
CORBA::ORB_var _orb;
};
+
+ class DataScopeServerTransaction;
+ /*!
+ * Servant activated by a specific POA (single thread) having itself its specific POA_manager.
+ * This class is able to hold/active the default POA_manager shared by other POA than this.
+ */
+ class SALOMESDS_EXPORT RequestSwitcher : public RequestSwitcherBase, public virtual POA_SALOME::RequestSwitcher
+ {
+ public:
+ RequestSwitcher(CORBA::ORB_ptr orb, DataScopeServerTransaction *ds);
+ SALOME::StringVec *listVars();
+ SALOME::ByteVec *fetchSerializedContent(const char *varName);
+ void fetchAndGetAccessOfVar(const char *varName, CORBA::String_out access, SALOME::ByteVec_out data);
+ private:
+ //! handle on its creator to give access to services when _poa_manager_under_control is in hold mode.
+ DataScopeServerTransaction *_ds;
+ };
+
class KeyWaiter;
class PickelizedPyObjServer;
class SALOMESDS_EXPORT DataScopeServerBase : public virtual POA_SALOME::DataScopeServerBase, public POAHolder
{
public:
- DataScopeServerBase(CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName);
+ DataScopeServerBase(const SALOME_CPythonHelper *pyHelper, CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName, SALOME_NamingService_Container_Abstract *ns);
DataScopeServerBase(const DataScopeServerBase& other);
+ public: // remote access methods
void ping();
char *getScopeName();
SALOME::StringVec *listVars();
CORBA::Boolean shutdownIfNotHostedByDSM(SALOME::DataScopeKiller_out killer);
SALOME::ByteVec *fetchSerializedContent(const char *varName);
SALOME::SeqOfByteVec *getAllKeysOfVarWithTypeDict(const char *varName);
- ~DataScopeServerBase();
+ SALOME::ByteVec *getValueOfVarWithTypeDict(const char *varName, const SALOME::ByteVec& constKey);
+ void takeANap(CORBA::Double napDurationInSec);
public:
+ ~DataScopeServerBase();
BasicDataServer *retrieveVarInternal2(const std::string& varName);
- void initializePython(int argc, char *argv[]);
void registerToSalomePiDict() const;
void setPOA(PortableServer::POA_var poa);
void registerInNS(SALOME::DataScopeServerBase_ptr ptr);
- PyObject *getGlobals() const { return _globals; }
- PyObject *getLocals() const { return _locals; }
- PyObject *getPickler() const { return _pickler; }
+ PyObject *getGlobals() const { return _pyHelper->getGlobals(); }
+ PyObject *getLocals() const { return _pyHelper->getLocals(); }
+ PyObject *getPickler() const { return _pyHelper->getPickler(); }
PortableServer::POA_var getPOA() const { return _poa; }
CORBA::ORB_var getORB() { return _orb; }
std::string getScopeNameCpp() const { return _name; }
static std::string BuildTmpVarNameFrom(const std::string& varName);
public:
std::vector< std::string> getAllVarNames() const;
+ bool isExistingVar(const std::string& varName) const;
void checkNotAlreadyExistingVar(const std::string& varName) const;
void checkExistingVar(const std::string& varName) const;
PickelizedPyObjServer *checkVarExistingAndDict(const std::string& varName);
public:
void moveStatusOfVarFromRdWrToRdOnly(const std::string& varName);
void moveStatusOfVarFromRdOnlyToRdWr(const std::string& varName);
- void moveStatusOfVarFromRdExtToRdExtInit(const std::string& varName);
- void moveStatusOfVarFromRdExtInitToRdExt(const std::string& varName);
+ void moveStatusOfVarFromRdExtOrRdExtInitToRdExtInit(const std::string& varName);
+ void moveStatusOfVarFromRdExtOrRdExtInitToRdExt(const std::string& varName);
protected:
std::list< std::pair< SALOME::BasicDataServer_var, BasicDataServer * > >::const_iterator retrieveVarInternal3(const std::string& varName) const;
std::list< std::pair< SALOME::BasicDataServer_var, BasicDataServer * > >::iterator retrieveVarInternal4(const std::string& varName);
protected:
- PyObject *_globals;
- PyObject *_locals;
- PyObject *_pickler;
+ SALOME_NamingService_Container_Abstract *_ns = nullptr;
+ const SALOME_CPythonHelper *_pyHelper = nullptr;
PortableServer::POA_var _poa;
CORBA::ORB_var _orb;
std::string _name;
class SALOMESDS_EXPORT DataScopeServer : public DataScopeServerBase, public virtual POA_SALOME::DataScopeServer
{
public:
- DataScopeServer(CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName);
+ DataScopeServer(const SALOME_CPythonHelper *pyHelper, CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName, SALOME_NamingService_Container_Abstract *ns);
DataScopeServer(const DataScopeServer& other);
SALOME::BasicDataServer_ptr retrieveVar(const char *varName) { return retrieveVarInternal(varName); }
SALOME::PickelizedPyObjRdOnlyServer_ptr createRdOnlyVar(const char *varName, const SALOME::ByteVec& constValue);
class SALOMESDS_EXPORT DataScopeServerTransaction : public DataScopeServerBase, public virtual POA_SALOME::DataScopeServerTransaction
{
public://not remotely callable
- DataScopeServerTransaction(CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName);
+ DataScopeServerTransaction(const SALOME_CPythonHelper *pyHelper, CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName, SALOME_NamingService_Container_Abstract *ns);
DataScopeServerTransaction(const DataScopeServerTransaction& other);
~DataScopeServerTransaction();
void createRdOnlyVarInternal(const std::string& varName, const SALOME::ByteVec& constValue);
void createRdExtVarInternal(const std::string& varName, const SALOME::ByteVec& constValue);
+ void createRdExtVarFreeStyleInternal(const std::string& varName, const SALOME::ByteVec& constValue, std::string&& compareFuncContent, SALOME::AutoPyRef&& compareFunc);
+ void createRdExtInitVarInternal(const std::string& varName, const SALOME::ByteVec& constValue);
void createRdWrVarInternal(const std::string& varName, const SALOME::ByteVec& constValue);
PortableServer::POA_var getPOA4KeyWaiter() const { return _poa_for_key_waiter; }
void addWaitKey(KeyWaiter *kw);
void pingKey(PyObject *keyObj);
void notifyKey(const std::string& varName, PyObject *keyObj, PyObject *valueObj);
SALOME::ByteVec *waitForMonoThrRev(SALOME::KeyWaiter_ptr kw);
+ SALOME::ByteVec *waitForAndKill(SALOME::KeyWaiter_ptr kw);
public://remotely callable
char *getAccessOfVar(const char *varName);
+ void fetchAndGetAccessOfVar(const char *varName, CORBA::String_out access, SALOME::ByteVec_out data);
SALOME::Transaction_ptr createRdOnlyVarTransac(const char *varName, const SALOME::ByteVec& constValue);
SALOME::Transaction_ptr createRdExtVarTransac(const char *varName, const SALOME::ByteVec& constValue);
+ SALOME::Transaction_ptr createRdExtVarFreeStyleTransac(const char *varName, const SALOME::ByteVec& constValue, const char *compareFuncContent);
+ SALOME::Transaction_ptr createRdExtInitVarTransac(const char *varName, const SALOME::ByteVec& constValue);
SALOME::Transaction_ptr createRdWrVarTransac(const char *varName, const SALOME::ByteVec& constValue);
SALOME::Transaction_ptr addKeyValueInVarHard(const char *varName, const SALOME::ByteVec& key, const SALOME::ByteVec& value);
SALOME::Transaction_ptr addKeyValueInVarErrorIfAlreadyExisting(const char *varName, const SALOME::ByteVec& key, const SALOME::ByteVec& value);
SALOME::TransactionMultiKeyAddSession_ptr addMultiKeyValueSession(const char *varName);
SALOME::Transaction_ptr removeKeyInVarErrorIfNotAlreadyExisting(const char *varName, const SALOME::ByteVec& key);
SALOME::TransactionRdWrAccess_ptr createWorkingVarTransac(const char *varName, const SALOME::ByteVec& constValue);
+ SALOME::Transaction_ptr killVarTransac(const char *varName);
SALOME::KeyWaiter_ptr waitForKeyInVar(const char *varName, const SALOME::ByteVec& keyVal);
SALOME::KeyWaiter_ptr waitForKeyInVarAndKillIt(const char *varName, const SALOME::ByteVec& keyVal, SALOME::Transaction_out transac);
void atomicApply(const SALOME::ListOfTransaction& transactions);
- private:
- PyObject *getPyCmpFunc();
+ SALOME::RequestSwitcher_ptr getRequestSwitcher();
private:
PortableServer::POA_var _poa_for_key_waiter;
std::list< KeyWaiter * > _waiting_keys;
+ AutoServantPtr<RequestSwitcher> _rs;
};
}
