SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
# Common CMake macros
# ===================
# Required prerequisites
# Find "big" prerequisites first - they reference themselves many others
-# -> this can help finding the smaller prerequisites and detect conficts.
+# -> this can help finding the smaller prerequisites and detect conflicts.
# =======================
# Exception: LibBatch is optional but is loaded first, as it can
Pre-requisites
--------------
-SALOME platform relies on a set of third-party softwares; some of them are needed
+SALOME platform relies on a set of third-party software; some of them are needed
at build time only, while other ones are needed in runtime also.
For more information about the pre-requisites please visit SALOME platform web
# - Config file for the @PROJECT_NAME@ package
# It defines the following variables.
-# Specific to the pacakge @PROJECT_NAME@ itself:
+# Specific to the package @PROJECT_NAME@ itself:
# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
#
# Other stuff specific to this package:
setOmniOrbUserPath()
# Set timeout handler
- print "Test timeout explicitely set to: %s seconds"%timeout_delay
+ print "Test timeout explicitly set to: %s seconds"%timeout_delay
timeout_sec = abs(int(timeout_delay)-10)
if sys.platform == 'win32':
from threading import Timer
setOmniOrbUserPath()
# Set timeout handler
- print "Test timeout explicitely set to: %s seconds"%timeout_delay
+ print "Test timeout explicitly set to: %s seconds"%timeout_delay
timeout_sec = abs(int(timeout_delay)-10)
if sys.platform == 'win32':
from threading import Timer
sys.exit(0) # see (1)
pass
# (1) If --shutdown-servers option is set to 1, session close procedure is
-# called twice: first explicitely by salome command, second by automatic
+# called twice: first explicitly by salome command, second by automatic
# atexit to handle Ctrl-C. During second call, LCC does not exist anymore and
-# a RuntimeError is raised; we explicitely exit this function with code 0 to
+# a RuntimeError is raised; we explicitly exit this function with code 0 to
# prevent parent thread from crashing.
def __killMyPort(port, filedict):
# wake up session
help_str = "Wake up a previously closed session. "
help_str += "The session object is found in the naming service pointed by the variable OMNIORB_CONFIG. "
- help_str += "If this variable is not setted, the last configuration is taken. "
+ help_str += "If this variable is not set, the last configuration is taken. "
o_wake_up = optparse.Option("--wake-up-session",
action="store_true",
dest="wake_up_session", default=False,
def killLocalPort():
"""
- kill servers from a previous SALOME exection, if needed,
+ kill servers from a previous SALOME execution, if needed,
on the CORBA port given in args of runSalome
"""
def givenPortKill(port):
"""
- kill servers from a previous SALOME exection, if needed,
+ kill servers from a previous SALOME execution, if needed,
on the same CORBA port
"""
# session.GetInterface()
#
- # additionnal external python interpreters
+ # additional external python interpreters
#
nbaddi=0
test = args['gui'] and args['session_gui']
test = test or args['wake_up_session']
# --
- # The next test covers the --pinter option or var PYTHONINSPECT setted
+ # The next test covers the --pinter option or if var PYTHONINSPECT is set
# --
test = test and not os.environ.get('PYTHONINSPECT')
# --
os.environ['NSPORT'] = port
os.environ['NSHOST'] = host
- # determine running mode, taht is either 'local' or 'remote'
+ # determine running mode, that is either 'local' or 'remote'
here = getShortHostName()
mode = "local"
if host != here and host != "localhost" and host != "no_host":
"""
def __init__(self, configFileNames=0):
self.getLogger().setLevel(logging.INFO)
- #it could be None explicitely (if user use multiples setVariable...for standalone)
+ #it could be None explicitly (if user use multiples setVariable...for standalone)
if configFileNames is None:
return
configFileNames = configFileNames or []
"""
Run SALOME!
- Args consist in a mandatory command followed by optionnal parameters.
+ Args consist in a mandatory command followed by optional parameters.
See usage for details on commands.
"""
def _startSalome(self, args):
# This DataFlow is "executable" : all pending Ports are defined with Datas
print myGraph.IsExecutable()
-# Starts only execution of that DataFlow and gets control immediatly
+# Starts only execution of that DataFlow and gets control immediately
print myGraph.Run()
# That DataFlow is running ==> 0 (false)
\section S1_install Quick Overview
-First of all, you have to check (or install if needed) the dependant
+First of all, you have to check (or install if needed) the dependent
software programs on your system. These programs are:
- common development tools as gcc, CMake tool.
-- third party softwares used in %SALOME building or runtime process
+- third party software used in %SALOME building or runtime process
(python, OCC, VTK, ...)
Further details can be found in sections \ref S2_install and \ref S3_install.
with a similar procedure (cf. \ref S6_install).
Eventually, the platform can be run by executing the shell script
-%runSalome (cf. \ref S7_install). Here, somme additionnal variables have to be set
+%runSalome (cf. \ref S7_install). Here, somme additional variables have to be set
to describe the %SALOME runtime configuration (<COMPONENT>_ROOT_DIR,
OMNIORB_CONFIG)
\section S2_install System configuration
-%SALOME is compiled and tested on differents platforms with native packages:
+%SALOME is compiled and tested on different platforms with native packages:
- Debian sarge
- Mandrake 10.1
- ...
remarks:
- This is the minimum level of CMake, if you need
- to compile all the third party softwares (included OpenCascade 5.2.x).
+ to compile all the third party software (included OpenCascade 5.2.x).
\section S3_install Third-party dependencies
-The %SALOME platform relies on a set of third-party softwares. The
+The %SALOME platform relies on a set of third-party software. The
current version depends on the following list
(versions given here are from Debian Sarge, except OpenCascade, VTK and MED,
which are not Debian packages):
- graphviz-2.2.1
-Additionnal software may be installed for optional features:
+Additional software may be installed for optional features:
- netgen4.3 + patch
- tix8.1.4
- See doc/configuration_examples/*
-In the following, we assume that all the third-party softwares are
+In the following, we assume that all the third-party software are
installed in the same root directory, named <salomeroot>/prerequis.
Then, your file system should probably look like:
The shell file prerequis.sh, embedded in the KERNEL source package,
provides a template for setting those variables. In this example, all the
-softwares are supposed to be installed in the same root directory,
+software are supposed to be installed in the same root directory,
named here INSTALLROOT.
Copy the prerequis.sh in a working directory and adjust the settings
installation of the KERNEL component, and then the GEOM and MED components.
The building process uses the variables <COMPONENT>_ROOT_DIR to
-localize the dependant components. The variables must be set to the
+localize the dependent components. The variables must be set to the
install path directory of the components <COMPONENT> (ex:
KERNEL_ROOT_DIR=<kernel_install>).
To run the %SALOME platform, the procedure is:
-- set the shell environment to get access to third-party softwares:
+- set the shell environment to get access to third-party software:
\code
$ source prerequis.sh
\endcode
- choose and create a root directory for the %SALOME platform, say
<salomeroot>.
-- install the third-party softwares in a sub-directory "prerequis"
+- install the third-party software in a sub-directory "prerequis"
- install the %SALOME components in a sub-directory "SALOME2"
optimizes execution, in terms of speed, memory, and
display only user level messages.
-But, some informations must always be displayed in both
+But, some information must always be displayed in both
modes: especially messages concerning environment or
internal errors, with version identification. When an
end user is confronted to such a message, he may refer
standard output, a file, or send them via CORBA, in
case of a multi machine configuration.
-Three informations are systematically added in front of
+Three information are systematically added in front of
the information displayed:
- the %thread number from which the message come from;
- the name of the source file in which the macros is set;
- <b>INFOS_COMPILATION</b>\n
The C++ macro INFOS_COMPILATION writes on the trace
- buffer pool informations about the compiling process:
+ buffer pool information about the compiling process:
- the name of the compiler : g++, KCC, CC, pgCC;
- the date and the time of the compiling processing process.
.
See \ref kernel_salome for a short description of most useful variables and
functions.
-\subsection subsection12 Container and component instanciation
+\subsection subsection12 Container and component instantiation
See SALOME_LifeCycleCORBA for the C++ interface (Python interface obtained with SWIG
is very similar).
See SALOME_FileTransferCORBA for the C++ interface (Python interface obtained with
SWIG is very similar).
-The following example shows how to tranfer a file from a remote host to the
+The following example shows how to transfer a file from a remote host to the
client computer. Remote hostname is 'cli76cc', we would like to copy
'tkcvs_8_0_3.tar.gz' from remote to local computer. %A full pathname is
required. %A container is created on remote computer if it does not exist,
\section S5_main SALOME programming model
-You will find in the next pages informations about
+You will find in the next pages information about
specific points of %SALOME Kernel :
- \subpage kernel_salome
- <a href="group__enumerate.html">enumerate</a> - Emulates a C-like enum for python
- <a href="group__uiexception.html">uiexception</a> - %Exception for user error management
- <a href="group__datamodeler.html">datamodeler</a> - Helper for modeling user data
- - <a href="group__diclookup.html">diclookup</a> - Smart dictionnary with key/value lookup
+ - <a href="group__diclookup.html">diclookup</a> - Smart dictionary with key/value lookup
- <a href="group__service.html">service</a> - Helper for using %SALOME kernel services
- <a href="group__studyedit.html">studyedit</a> - Study editor
- <a href="group__unittester.html">unittester</a> - Run very basic unit tests
modules coming from different %SALOME modules. Today, the developper
of a module has to take care of the names used in other modules to
choose a name.
-- Integrate in %SALOME some python modules initialy developed in the
+- Integrate in %SALOME some python modules initially developed in the
context of domain specific %SALOME applications (%SALOME-MECA,
%SALOME-CFD, OPENTURN, PANTHERE) and whose source files are organized
in a packaged python structure.
To reach this target, we have to face two problems:
- %A naming conflict with the instruction <b>import salome</b>. The result
- is unpredictible because of the existance in the <b>sys.path</b> of
+ is unpredictable because of the existence in the <b>sys.path</b> of
both a file <b>salome.py</b> and a package \b salome.
- The dispatching of <b>salome.*</b> sub-packages in the different %SALOME
modules.
One special point for the documentation:
-- The documentation of the python package API is writen in HTML
+- The documentation of the python package API is written in HTML
and generated form the source code with doxygen.
- The *.dox (doxygen file) source files are located in the directory
<b><srcdir>/doc/salome</b>.
%A %SALOME user can define several %SALOME applications. These applications are
runnable from the same user account. These applications may share the same
-KERNEL and modules. Thus, the application configuration is independant of
+KERNEL and modules. Thus, the application configuration is independent of
KERNEL and must not be put in KERNEL_ROOT_DIR.
Furthermore, prerequisites may not be the same on all the applications.
<b>Basic CORBA services</b>
- Logger :\n
- %A CORBA %server that collects the trace messages from differents CORBA
+ %A CORBA %server that collects the trace messages from different CORBA
process.
- SALOMETraceCollector :\n
library included in container %server
- Notification :\n
- library included in differents servers (container)
+ library included in different servers (container)
- NOTIFICATION_SWIG
of the same interface type. When the connection is done, a component can use the "uses port" to use the
interface provided by the "provides port".
- The interface DSC implements the component interface that containes the operations that are needed
+ The interface DSC implements the component interface that contains the operations that are needed
to manage declarations into a component and connections between ports.
These operations are logicaly divided in two parts :
Returns True if at this moment there is a command under execution.
*/
boolean HasOpenCommand();
-/*! \brief Cancelation of the command
+/*! \brief Cancellation of the command
Cancels all actions declared within the command.
/*! \brief Saving the study in a specified HDF file (or files).
Saves the study in a specified file (or files).
- \param aUrl The path to the definite file in whcih the study will be saved
+ \param aUrl The path to the definite file in which the study will be saved
\param aStudy The study which will be saved
\param theMultiFile If this parameter is True the study will be saved in several files.
Saves the study in a specified ASCII file (or files).
- \param aUrl The path to the definite file in whcih the study will be saved
+ \param aUrl The path to the definite file in which the study will be saved
\param aStudy The study which will be saved
\param theMultiFile If this parameter is True the study will be saved in several files.
*/
<ul>
<li> publishing in the study of the objects created by a definite component
<li> saving/loading of the data created by a definite component. These methods are called by the StudyManager when loading/saving a study containing the data created by a definite component.
- <li> transforming of the transient references into persistant references (or vice versa) of the SObjects when saving (or loading) a study
+ <li> transforming of the transient references into persistent references (or vice versa) of the SObjects when saving (or loading) a study
<li> copy/paste common functionality. These methods can be called by any component in order to copy/paste its object created in the study
</ul>
\brief Tree node attribute.
By specifying the tree node attributes for the SObjects it is possible to
- create internal auxillary %object tree with its own structure and identifier.
+ create internal auxiliary %object tree with its own structure and identifier.
Since each such tree is specfied by the unique identifier, it is possible
to create as many trees as it is required.
\brief Attribute storing GUID.
This attribute can be used to store arbitrary GUID. Attribute allowing to store GUID.
- In contrast to any other atribute (e.g. AttributeLocalID), it is possible to
+ In contrast to any other attribute (e.g. AttributeLocalID), it is possible to
define as many GUID attributes for the same SObject as it is required provided that
they have different GUID values.
*/
void RemoveValue(in long row, in long column) raises(IncorrectIndex);
/*!
- \brief Sets the maximum number of colums in the table.
+ \brief Sets the maximum number of columns in the table.
If new number of columns is less than the current one, the table is truncated
(extra columns are removed).
/*!
\brief Python %object attribute
- This attribute is used to store pyton objects as a sequence of characters.
+ This attribute is used to store python objects as a sequence of characters.
*/
//==========================================================================
interface AttributePythonObject : GenericAttribute
try to make a Python import of COMPONENT,
then a lib open of libCOMPONENTEngine.so
\param reason in case of error (return false) a string explaining the error
- \return true if load successfull or already done, false otherwise
+ \return true if load successful or already done, false otherwise
*/
boolean load_component_Library(in string componentName, out string reason);
This simply loads the service in the current container by importing the
corresponding Python module.
Warning: no internal registration is done, so it is up to the caller to
- manage the various instanciation.
+ manage the various instantiation.
\param serviceName Name of the service
>0 otherwise (== study id)
\return CORBA Ref of the requested file.
- \exception contains informations of what if the component cannot
+ \exception contains information of what if the component cannot
sends the file's reference.
*/
Engines::Salome_file getInputFileToService(in string service_name,
\param service_name service's name.
- \exception contains informations about files that are not in a good state.
+ \exception contains information about files that are not in a good state.
*/
void checkInputFilesToService(in string service_name) raises(SALOME::SALOME_Exception);
\return CORBA Ref of the requested file.
- \exception contains informations of what if the component cannot
+ \exception contains information of what if the component cannot
sends the file's reference.
*/
Engines::Salome_file getOutputFileToService(in string service_name,
\param service_name service's name.
- \exception contains informations about files that are not in a good state.
+ \exception contains information about files that are not in a good state.
*/
void checkOutputFilesToService(in string service_name) raises(SALOME::SALOME_Exception);
\param hdf5_file name (with path) of the hdf5_file.
- \exception contains informations of errors if the loading doesn't succeed.
+ \exception contains information of errors if the loading doesn't succeed.
*/
void load(in string hdf5_file) raises (SALOME::SALOME_Exception);
\param hdf5_file name (with path) of the hdf5_file.
- \exception contains informations of errors if the save doesn't succeed.
+ \exception contains information of errors if the save doesn't succeed.
*/
void save(in string hdf5_file) raises (SALOME::SALOME_Exception);
\param hdf5_file name (with path) of the hdf5_file.
- \exception contains informations of errors if the save doesn't succeed.
+ \exception contains information of errors if the save doesn't succeed.
*/
void save_all(in string hdf5_file) raises (SALOME::SALOME_Exception);
long nb_proc;
//! if true start a MPI container
boolean isMPI;
- //! PaCO specific informations
+ //! PaCO specific information
string parallelLib;
//! Parameters to choose a resource
this directory. A change directory toward this working directory is done
by the batch system before running the job.
If not specified (empty string), the launcher will use the working
- directory of the chosen ressource and if this is also an empty string
+ directory of the chosen resource and if this is also an empty string
the value used will be $HOME/Batch/workdir_"date" where $HOME is the
- value of the environment variable on the remote ressource and "date" is
+ value of the environment variable on the remote resource and "date" is
the current date.
*/
string work_directory;
//! Prefix to be applied to #in_files.
/*! It can be used to specify where to find the local input files.
- It's optionnal if you specify the absolute path name of input files.
+ It's optional if you specify the absolute path name of input files.
*/
string local_directory;
*/
string maximum_duration;
- //! Specifies the rules to choose the ressource where to execute the job.
- /*! The additionnal two following parameters MUST be specified explicitly,
+ //! Specifies the rules to choose the resource where to execute the job.
+ /*! The additional two following parameters MUST be specified explicitly,
because they are not provided by the resource definition:
- mem_mb -> Memory expressed in megabytes.
- nb_proc -> Number of Processors.
void defineNewCustomVar(in string varName, in pickledArgs valueOfVar) raises (SALOME::SALOME_Exception);
/*!
- This methode executes the python code in \a codeStr and can append/remove symboles in context to make them available or not for future call of execute on this.
+ This method executes the python code in \a codeStr and can append/remove symboles in context to make them available or not for future call of execute on this.
\param [in] codeStr - the python code (without statement) to be executed, that can modify the context initialized at initialization.
*/
void executeAnotherPieceOfCode(in string codeStr) raises (SALOME::SALOME_Exception);
*/
module Registry
{
- //! a struct to collect informations about servers (processes)
+ //! a struct to collect information about servers (processes)
struct Infos
{
string name;
string ior; // client
};
- //! a list of informations
+ //! a list of information
typedef sequence<Infos> AllInfos;
/*! \brief interface to use %SALOME registry
void remove ( in unsigned long id ) ;
//! Get the size of the registry
unsigned long size() ;
- //! Get all informations from registry
+ //! Get all information from registry
AllInfos getall () ;
//! Get history information from registry
AllInfos history () ;
struct ResourceParameters
{
//! resource name - manual selection
- /*! If a name is provided, the ressource will be imposed.
- If the name is an empty string, the ressource will be chosen to match
+ /*! If a name is provided, the resource will be imposed.
+ If the name is an empty string, the resource will be chosen to match
the other parameters.
*/
string name;
The parameter specifies the maximum memory value that could be allocated
for executing the job. This takes into account not only the data that
could be loaded by the batch process but also the linked dynamic library.
- A possible problem, for exemple in the case where you use the ssh
+ A possible problem, for example in the case where you use the ssh
emulation of a batch system, is to get an error message as below
when libBatch tries to run the ssh command:
\verbatim
/usr/bin/ssh: error while loading shared libraries: libcrypto.so.0.9.8: failed
to map segment from shared object: Cannot allocate memory
\endverbatim
- In this exemple, the mem_mb was set to 1MB, value that is not
+ In this example, the mem_mb was set to 1MB, value that is not
sufficient to load the dynamic libraries linked to the ssh
executable (libcrypto.so in the error message).
So, even in the case of a simple test shell script, you should
string getMachineFile(in string resource_name, in long nb_procs, in string parallelLib)
raises (SALOME::SALOME_Exception);
- //! Return list of resources available (regarding containt of CatalogResources.xml). And for each resource the number of proc available of it.
+ //! Return list of resources available (regarding content of CatalogResources.xml). And for each resource the number of proc available of it.
void ListAllAvailableResources(out ResourceList machines, out IntegerList nbProcsOfMachines) raises (SALOME::SALOME_Exception);
};
{
void shutdown();
};
+
+ interface RequestSwitcher
+ {
+ void holdRequests();
+ void activeRequests();
+ };
interface DataScopeServerBase
{
boolean shutdownIfNotHostedByDSM(out DataScopeKiller killer) raises (SALOME::SALOME_Exception);
ByteVec fetchSerializedContent(in string varName) raises (SALOME::SALOME_Exception);
SeqOfByteVec getAllKeysOfVarWithTypeDict(in string varName) raises (SALOME::SALOME_Exception);
+ RequestSwitcher getRequestSwitcher();
+ void takeANap(in double napDurationInSec) raises (SALOME::SALOME_Exception);
};
interface DataScopeServer : DataScopeServerBase
# notifd may split the filter evaluation processing in two stages. In
# this case, a second thread pool is used for evaluating proxy-level
-# filters. The size of the pool is controled by the following
+# filters. The size of the pool is controlled by the following
NumProxyThreads 0
# file names in lower case letters. If set to YES upper case letters are also
# allowed. This is useful if you have classes or files whose names only differ
# in case and if your file system supports case sensitive file names. Windows
-# users are adviced to set this option to NO.
+# users are advised to set this option to NO.
CASE_SENSE_NAMES = YES
# Client and server object are the same with omniorb
# There are one header file and one source file generate
#IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ))
-# dependancies between idl and it's generated files
+# dependencies between idl and its generated files
#
%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/%.idl
$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
#if defined(__GLIBC__)
printf("%s %s\n", __libc_version, __libc_release);
#else
- printf("unkown\n");
+ printf("unknown\n");
#endif
return 0;
}
fi
done
else
- # Error occured in the first compile. Let's try to salvage the situation:
- # Compile a seperate program for each library.
+ # Error occurred in the first compile. Let's try to salvage the situation:
+ # Compile a separate program for each library.
for i in $deplibs; do
name="`expr $i : '-l\(.*\)'`"
# If $name is empty we are operating on a -L argument.
eval "export $shlibpath_var"
fi
- # Restore saved enviroment variables
+ # Restore saved environment variables
if test "${save_LC_ALL+set}" = set; then
LC_ALL="$save_LC_ALL"; export LC_ALL
fi
fi
done
-dnl use gcc option -MG : asume unknown file will be construct later
+dnl use gcc option -MG : assume unknown file will be construct later
rm -f conftest.d conftest.err
${DEPCC} ${C_DEPEND_FLAG} -MG -c conftest.c 1> conftest.d 2> conftest.err
if test -f conftest.u ; then
fi
done
-dnl use g++ option -MG : asume unknown file will be construct later
+dnl use g++ option -MG : assume unknown file will be construct later
rm -f conftest.d conftest.err
${DEPCXX} ${CXX_DEPEND_FLAG} -MG -c conftest.cxx 1> conftest.d 2> conftest.err
if test -f conftest.u ; then
dnl @author Bernard Secher - 15/01/2004
dnl
AC_DEFUN([AC_CXX_OPTION], [
- AC_MSG_CHECKING(wether $CXX accepts $1)
+ AC_MSG_CHECKING(whether $CXX accepts $1)
cat > conftest.cxx <<EOF
int main() { return 0; }
EOF
CALCIUM_IDL_INT_F77="long"
CALCIUM_CORBA_INT_F77="CORBA::Long"
else
- AC_MSG_ERROR([Size of Fortran type integer is neither four nor eigth bytes])
+ AC_MSG_ERROR([Size of Fortran type integer is neither four nor eight bytes])
fi
elif test "x$withval" = "xint"
*
* Note that neither ptrPoint, nor ptrDestruct should be destroyed by the user.
*
- * The destruction object must be created dynamically because it suscribes
+ * The destruction object must be created dynamically because it subscribes
* itself in the list of destruction to be performed at the end of the process.
*/
// ============================================================================
//
// File : Basics_DirUtils.cxx
-// Autor : Alexander A. BORODIN
+// Author : Alexander A. BORODIN
// Module : SALOME
//
#include "Basics_DirUtils.hxx"
// SALOME Utils : general SALOME's definitions and tools
// File : Basics_DirUtils.hxx
-// Autor : Alexander A. BORODIN
+// Author : Alexander A. BORODIN
// Module : SALOME
//
#ifndef _Basics_DIRUTILS_HXX_
//
// File : Basics_Utils.cxx
-// Autor : Alexander A. BORODIN
+// Author : Alexander A. BORODIN
// Module : SALOME
//
// SALOME Utils : general SALOME's definitions and tools
// File : Basics_DirUtils.hxx
-// Autor : Alexander A. BORODIN
+// Author : Alexander A. BORODIN
// Module : SALOME
//
#ifndef _Basics_UTILS_HXX_
#endif
/*! Return the C++ data associated to the array to transmit.
- Used when sender and receiver are collocalized.
+ Used when sender and receiver are colocalized.
*/
const void *SALOME_Sender_i::getData(long &size) const{
size=_lgrTabToSend;
return SenderFactory::buildSender(type,this);
}
-/*! Method to establish if the CORBA object refered by pCorba is collocalised.\n
+/*! Method to establish if the CORBA object referred by pCorba is colocalized.\n
If it is, the pointer to the servant that incarnates the CORBA object is returned.
*/
SALOME_SenderDouble_i *SALOME_SenderDouble_i::find(SALOME::SenderDouble_ptr pCorba){
return SenderFactory::buildSender(type,this);
}
-/*! Method to establish if the CORBA object refered by pCorba is collocalised.\n
+/*! Method to establish if the CORBA object referred by pCorba is colocalized.\n
If it is, the pointer to the servant that incarnates the CORBA object is returned.
*/
SALOME_SenderInt_i *SALOME_SenderInt_i::find(SALOME::SenderInt_ptr pCorba){
// << _StartUsed << std::endl ;
}
#else
- // NOT implementet yet
+ // NOT implemented yet
#endif
//=============================================================================
/*!
-* Construtor to use
+* Constructor to use
*/
//=============================================================================
* CORBA method
* \param componentName component name
* \param reason explains error when load fails
-* \return true if dlopen successfull or already done, false otherwise
+* \return true if dlopen successful or already done, false otherwise
*/
//=============================================================================
bool
* C++ method:
* \param componentName the name of the component (COMPONENT, for example)
* \param reason explains error when load fails
-* \return true if loading is successfull or already done, false otherwise
+* \return true if loading is successful or already done, false otherwise
*/
//=============================================================================
bool
* C++ method:
* \param componentName name of the component
* \param reason explains error when load fails
-* \return true if loading is successfull or already done, false otherwise
+* \return true if loading is successful or already done, false otherwise
*/
//=============================================================================
bool
* C++ method:
* \param componentName name of the component
* \param reason explains error when load fails
-* \return true if loading is successfull or already done, false otherwise
+* \return true if loading is successful or already done, false otherwise
*/
//=============================================================================
bool
std::string component_registerName =
_containerName + "/" + instanceName;
- // --- Instanciate required CORBA object
+ // --- Instantiate required CORBA object
PortableServer::ObjectId *id ; //not owner, do not delete (nore use var)
id = (Component_factory) ( _orb, _poa, _id, instanceName.c_str(),
}
catch (...)
{
- reason="Container_i::createInstance exception catched";
+ reason="Container_i::createInstance exception caught";
INFOS(reason) ;
}
return iobject._retn();
}
catch (...)
{
- INFOS( "Container_i::load_impl catched" ) ;
+ INFOS( "Container_i::load_impl caught" ) ;
}
return iobject._retn();
}
if (origName[0] != '/')
{
- INFOS("path of file to copy must be an absolute path begining with '/'");
+ INFOS("path of file to copy must be an absolute path beginning with '/'");
return Engines::fileRef::_nil();
}
* ssh user@machine distantPath/runRemote.sh hostNS portNS WORKINGDIR workingdir \
* SALOME_Container containerName &"
- * - where user is ommited if not specified in CatalogResources,
+ * - where user is omitted if not specified in CatalogResources,
* - where distant path is always relative to user@machine $HOME, and
* equal to $APPLI if not specified in CatalogResources,
* - where hostNS is the hostname of CORBA naming server (set by scripts to
}
catch (...)
{
- INFOS("[StarPaCOPPContainer] Exception catched from proxy Shutdown...");
+ INFOS("[StarPaCOPPContainer] Exception caught from proxy Shutdown...");
}
return ret;
}
//=============================================================================
/*! This method launches the parallel container.
- * It will may be placed on the ressources manager.
+ * It will may be placed on the resources manager.
*
* \param command to launch
* \param container's parameters
#shstr = "runSession SALOME_ContainerPy.py "
shstr += ContainerName
- # mpv: fix for SAL4731 - allways create new file to write log of server
+ # mpv: fix for SAL4731 - always create new file to write log of server
num = 1
fileName = ""
while 1:
* CORBA method: after a file transfer on a client computer, registers
* hostname of client and file path of the copied file.
* \param machine client hostname
- * \param fileName asolute path of the transfered file on client computer
+ * \param fileName absolute path of the transferred file on client computer
*/
//=============================================================================
if (theFileName[0] != '/')
{
- INFOS("destination file path must be absolute, begining with '/'");
+ INFOS("destination file path must be absolute, beginning with '/'");
return 0;
}
*
* CORBA method: try to open the file. If the file is readable, return
* a positive integer else return 0;
- * \param fileName path to the file to be transfered
+ * \param fileName path to the file to be transferred
* \return fileId = positive integer > 0 if open OK.
*/
//=============================================================================
*
* CORBA method: try to open the file. If the file is writable,
* return a positive integer else return 0;
- * \param fileName path to the file to be transfered
+ * \param fileName path to the file to be transferred
* \return fileId = positive integer > 0 if open OK.
*/
CORBA::Long fileTransfer_i::openW(const char* fileName)
}
// For each file we create two groups
- // First group contains file's informations
+ // First group contains file's information
// Second group contains the file
// At the end we create a group and a dataset containing the names
// of all the files.
if(fopen(comp_file_name,"rb") != NULL)
status = "ok";
- // Adding file with is informations
+ // Adding file with its information
Engines::file infos;
infos.file_name = CORBA::string_dup(file_name.c_str());
infos.path = CORBA::string_dup(path.c_str());
throw SALOME::SALOME_Exception(es);
}
- // Adding file with his informations
+ // Adding file with its information
Engines::file infos;
infos.file_name = CORBA::string_dup(file_name.c_str());
infos.path = CORBA::string_dup(path.c_str());
/*!
* CORBA method: try to open the file given. If the file is readable, return
* a positive integer else return 0;
- * \param fileName file name to be transfered
+ * \param fileName file name to be transferred
* \return fileId = positive integer > 0 if open OK.
*/
//=============================================================================
virtual void removeFile(const char* file_name);
virtual void removeFiles();
- // Informations methods:
+ // Information methods:
virtual void setContainer(Engines::Container_ptr container);
virtual Engines::files* getFilesInfos();
virtual Engines::file* getFileInfos(const char* file_name);
// a fd descriptor (FILE*) open on the file.
typedef std::map<int, FILE*> _t_fileAccess;
- // Contains the informations of the files managed by the Salome_file.
+ // Contains the information of the files managed by the Salome_file.
typedef std::map<std::string, Engines::file> _t_fileManaged;
// Contains the CORBA reference for each distributed file managed.
"unsigned short","int","unsigned int","long","unsigned long",
"longlong","unsigned longlong",
"float","double","long double","complex float","complex double","complex long double",
- "object","string","unicode","void","ntypes","notype","char","unkown"};
+ "object","string","unicode","void","ntypes","notype","char","unknown"};
return type_names[typecode];
}
ADD_SUBDIRECTORY(Palm)
ADD_SUBDIRECTORY(Calcium)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
SalomePalm
SalomeCalcium
break;
default :
- throw HDFexception("Can't open HDF file : bad acces option");
+ throw HDFexception("Can't open HDF file : bad access option");
}
}
* - Description : returns the number of HDF objets in a HDF group
* - Parameters :
* - fid (IN) : HDF file ID
- * - path (IN) : acces path to the HDF group in the HDF file
+ * - path (IN) : access path to the HDF group in the HDF file
* - Results :
* - if success : number of objects
* - if failure : -1
* - i (IN) : access rank
* - name (OUT) : expected name
* - Result :
- * - if sucess : 0
+ * - if success : 0
* - if failure : -1
*/
// Transfert d'un fichier ASCII dans un groupe HDF
HDFConvert::FromAscii("ascii.txt",*hdf_group,"ASCII DATASET");
- MESSAGE( ">> The Ascii file is transfered " );
+ MESSAGE( ">> The ASCII file is transferred " );
// The HDF group is built, it can be closed
hdf_group->CloseOnDisk();
doc_salome = '''
MODULE : salome
---------------
-module salome gives access to Salome ressources:
+module salome gives access to Salome resources:
variables:
salome.orb : CORBA
Help = SalomeDoc('''
Availables modules:
- salome : gives access to Salome ressources
+ salome : gives access to Salome resources
geompy : encapsulation of GEOM Engine methods
supervision : gives access to SuperVision Engine
To obtain specific help on a module "truc", type: Help.truc()
# Module : SALOME
#
"""
-Module salome gives access to Salome ressources.
+Module salome gives access to Salome resources.
variables:
"""
## @package salome
-# Module salome gives access to Salome ressources.
+# Module salome gives access to Salome resources.
#
# \param salome.orb : CORBA orb object
# \param salome.naming_service : instance of naming Service class (SALOME_NamingServicePy::SALOME_NamingServicePy_i)
print """
============================================
May be there is no running SALOME session
- salome.salome_init() is intented to be used
+ salome.salome_init() is intended to be used
within an already running session
============================================
"""
## \defgroup diclookup diclookup
# \{
-# \details Smart dictionnary with key/value lookup
+# \details Smart dictionary with key/value lookup
# \}
__author__="gboulant"
for suite in self.__listTestSuite:
runner.run(suite)
- # Finally close the ouput stream and print the report
+ # Finally close the output stream and print the report
logfile.close()
self.printreport()
def TEST_serialize():
import salome.kernel
ref_testdata = TestData()
- ref_testdata.setName("The firts name")
+ ref_testdata.setName("The first name")
res_testdata = salome.kernel.unserialize(salome.kernel.serialize(ref_testdata))
print res_testdata.getName()
def getUIMessage(self):
return self._UImessage
- ## Specify the type of this exception. To be choosen in the TYPES list.
+ ## Specify the type of this exception. To be chosen in the TYPES list.
def setType(self, type):
- """Specify the type of this exception. To be choosen in the TYPES list."""
+ """Specify the type of this exception. To be chosen in the TYPES list."""
if not self.TYPES.isValid(type):
raise UiException("The exception type "+str(type)+" can't be used",self.TYPES.DEVEL)
self._type = type
print "[TEST] %s.%s %s NOT OK" % (moduleName, functionName,"."*tabsize)
## This function is for debug only. It executes the specified function with the
-# specified arguments in a try/except bloc so that to display the exception in
-# the case where an exception is raised (usefull to debug server side of a CORBA
+# specified arguments in a try/except block so as to display the exception in
+# the case where an exception is raised (useful to debug server side of a CORBA
# process).
# \ingroup unittester
def tryfunction(function,*argv):
"""
This function is for debug only. It executes the specified function with the
- specified arguments in a try/except bloc so that to display the exception in
- the case where an exception is raised (usefull to debug server side of a CORBA
+ specified arguments in a try/except block so as to display the exception in
+ the case where an exception is raised (useful to debug server side of a CORBA
process).
"""
print "[TEST] trying the function %s" % function
# Function to return a Python module for the required IDL module name
def openModule(mname, fname=None):
# Salome modification start
- # Be sure to use the right module dictionnary
+ # Be sure to use the right module dictionary
import sys
# Salome modification end
# already exist
def newModule(mname):
# Salome modification start
- # Be sure to use the right module dictionnary
+ # Be sure to use the right module dictionary
import sys
# Salome modification end
# partial module map
def updateModule(mname):
# Salome modification start
- # Be sure to use the right module dictionnary
+ # Be sure to use the right module dictionary
import sys
# Salome modification end
if _partialModules.has_key(mname):
# Module : SALOME
# $Header$
## @package salome_iapp
-# Module salome gives access to Salome GUI ressources (if GUI has been launched).
+# Module salome gives access to Salome GUI resources (if GUI has been launched).
#
import salome_ComponentGUI
/**
* This returns a static reference to the SALOME study manager. The
* study manager can be used to retrieve a study or to get
- * informations about a study.
+ * information about a study.
*/
SALOMEDS::StudyManager_ptr getStudyManager() {
static SALOMEDS::StudyManager_ptr aStudyManager;
anObject = anORB->string_to_object(aValue);
}
}catch(...){
- INFOS("SObjectToObject - Unknown exception was occured!!!");
+ INFOS("SObjectToObject - Unknown exception has occurred!!!");
}
return anObject._retn();
}
//
// MEM: AttributeParameter
-// Note that the AttributeParameter is a multitype dictionnary whose
+// Note that the AttributeParameter is a multitype dictionary whose
// keys are the names specified when setting the value
//
file_normal.close();
if (normal_input != "Bonjour")
{
- result += "error from simple ouput file ! waiting for Bonjour and get : " + normal_input;
+ result += "error from simple output file ! waiting for Bonjour and get : " + normal_input;
return result;
}
std::string error_input;
file_normal.close();
if (!test_ok)
{
- result += "error from mpi ouput file ! waiting for HELLO MPI please watch /tmp/" + _date + "_mpi_output.log file";
+ result += "error from mpi output file ! waiting for HELLO MPI please watch /tmp/" + _date + "_mpi_output.log file";
return result;
}
result = "OK";
ADD_DEFINITIONS(-DWITH_LIBBATCH)
ENDIF(SALOME_USE_LIBBATCH)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
Registry
SalomeNotification
throw LauncherException("Bad state of the job: " + job->getState());
}
- // Third step search batch manager for the job into the map -> instanciate one if does not exist
+ // Third step search batch manager for the job into the map -> instantiate one if does not exist
#ifdef WITH_LIBBATCH
std::map<int, Batch::BatchManager *>::const_iterator it = _batchmap.find(job_id);
if(it == _batchmap.end())
//=============================================================================
/*!
- * Factory to instanciate the good batch manager for choosen cluster.
+ * Factory to instantiate the good batch manager for chosen cluster.
*/
//=============================================================================
Batch::BatchManager *
LAUNCHER_MESSAGE("Cannot find batch manager factory for " << bmType << ". Check your version of libBatch.");
throw LauncherException("Cannot find batch manager factory");
}
- LAUNCHER_MESSAGE("Instanciation of batch manager of type: " << bmType);
+ LAUNCHER_MESSAGE("Instantiation of batch manager of type: " << bmType);
Batch::BatchManager * batch_client = (*fact)(hostname.c_str(), params.UserName.c_str(),
protocol, mpi.c_str());
return batch_client;
{
int job_id = job->getNumber();
- // Select a ressource for the job
+ // Select a resource for the job
std::vector<std::string> ResourceList;
resourceParams params = job->getResourceRequiredParams();
// Consider only resources that can launch batch jobs
{
if (job_state == "CREATED")
{
- // In this case, we ignore run_part informations
+ // In this case, we ignore run_part information
createJob(new_job);
new_jobs_id_list.push_back(new_job->getNumber());
}
job_state == "FAILED" ||
job_state == "ERROR")
{
- // Step 2: We add run_part informations
+ // Step 2: We add run_part information
addJobDirectlyToMap(new_job);
new_jobs_id_list.push_back(new_job->getNumber());
}
launch_date[i] == ':' ||
launch_date[i] == ' ')
launch_date[i] = '_';
- launch_date.erase(--launch_date.end()); // Last caracter is a \n
+ launch_date.erase(--launch_date.end()); // Last character is a \n
return launch_date;
}
/*! CORBA Method:
* Create a job in the launcher with a file
* \param xmlExecuteFile : .xml to parse that contains job description
- * \param clusterName : machine choosed
+ * \param clusterName : machine chosen
*/
//=============================================================================
CORBA::Long
# Test of SalomeLauncher.
# This test should be run in the salome environment, using "salome shell"
# and a salome application should be running.
-# The test will try to launch batch jobs on every available ressources which
+# The test will try to launch batch jobs on every available resources which
# have the can_launch_batch_jobs parameter set to True.
# You can use the environment variable USER_CATALOG_RESOURCES_FILE in order to
-# define a customised ressource catalog.
+# define a customised resource catalog.
# If YACS_ROOT_DIR is not set, the test of submitting a YACS schema will be
# skiped.
class TestCompo(unittest.TestCase):
// (in SALOMEDS for an example)
// not enough: set a current directory in naming service is not thread safe
// if naming service instance is shared among several threads...
- // ==> allways use absolute path and dot rely on current directory!
+ // ==> always use absolute path and don't rely on current directory!
CORBA::Object_var obj =
_NS->Resolve(SALOME_ContainerManager::_ContainerManagerNameInNS);
{
//if (!isInitialized) std::cout<<"!!! SALOME_Trace is used without initialising !!!"<<std::endl;
//write resulting string into Logger CORBA server
- //concatenate string from passing parameters for transfering into Logger CORBA server
+ //concatenate string from passing parameters for transferring into Logger CORBA server
//std::cerr << "-+- " << msg << " ";
std::string component_registerName =
_containerName + "/" + instanceName;
- // --- Instanciate required CORBA object
+ // --- Instantiate required CORBA object
PortableServer::ObjectId *id ; //not owner, do not delete (nore use var)
id = (MPIComponent_factory) ( _orb, _poa, _id, instanceName.c_str(), aGenRegisterName.c_str() ) ;
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# debug mode display informations about communication
+# debug mode display information about communication
if $1 == "--debug" then
set debug="-debug"
else
${PROJECT_BINARY_DIR}/idl
)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
SalomeNS
OpUtil
//! method to verify path prefix content
/*!
\param pathlist ListOfParserPathPrefix arguments
- \return true if verfication is OK
+ \return true if verification is OK
*/
virtual bool _verify_path_prefix(ParserPathPrefixes & pathlist);
char* _general_path;
char* _personal_path;
- // These variables will contain the informations on the general common catalog
+ // These variables will contain the information on the general common catalog
ParserComponents _general_module_list ;
ParserPathPrefixes _general_path_list ;
ParserTypes _typeMap;
TypeList _typeList;
- // These variables will contain the informations on the personal catalog
+ // These variables will contain the information on the personal catalog
ParserComponents _personal_module_list ;
ParserPathPrefixes _personal_path_list ;
// Verification of _general_path_list content
if (!myPrivate->_verify_path_prefix(myPrivate->_general_path_list)) {
if(MYDEBUG) MESSAGE( "Error while parsing the general path list, "
- "differents paths are associated to the same computer,"
- "the first one will be choosen");
+ "different paths are associated to the same computer,"
+ "the first one will be chosen");
} else {
if(MYDEBUG) MESSAGE("General path list OK");
}
// Verification of _general_path_list content
if(!myPrivate->_verify_path_prefix(myPrivate->_personal_path_list)){
if(MYDEBUG) MESSAGE("Error while parsing the personal path list, "
- "differents paths are associated to the same computer, "
- "the first one will be choosen" );
+ "different paths are associated to the same computer, "
+ "the first one will be chosen" );
}else {
if(MYDEBUG) MESSAGE("Personal path list OK");
}
Utils_Locker lock (&_myMutex);
// --- _current_context is replaced to the _root_context
- // if the Path begins whith '/'
+ // if the Path begins with '/'
if (Path[0] == '/'){
_current_context = _root_context;
Utils_Locker lock (&_myMutex);
// --- _current_context is replaced to the _root_context
- // if the Path begins whith '/'
+ // if the Path begins with '/'
if (Path[0] == '/')
{
/*! \brief get the CORBA object reference associated to an uncomplete name.
*
* get the CORBA object reference associated to an uncomplete name with a
- * path. Look for the first occurence of name*.
+ * path. Look for the first occurrence of name*.
* If the NamingService is out, the exception ServiceUnreachable is thrown
* \param Path pathname under the form "/path/name" (Absolute reference !)
* search the fist reference like "/path(.dir)/name*(.kind)"
* If the NamingService is out, the exception ServiceUnreachable is thrown.
* \param hostname name of the machine on which the component is searched.
* \param containerName name of the container in which the component is
- instanciated.
+ instantiated.
* \param componentName name of the component we are looking for an existing
instance.
* \param nbproc in case of multi processor machine, container name is
* SALOME_NamingService. This form gives a suffixed containerName in case of
* multi processor machine.
* \param containerName name of the container in which the component is
- instanciated.
+ instantiated.
* \param hostname name of the host of the container, without domain names.
* \return the path under the form /Containers/hostname/containerName
* \sa ContainerName(const Engines::MachineParameters& params)
/*! \brief search a name in current directory.
*
* Search a name in the current directory. after call, the current directory
- * is changed to the directory containing the last occurence of name found.
- * If no occurence found (see return value), current directory remains
+ * is changed to the directory containing the last occurrence of name found.
+ * If no occurrence found (see return value), current directory remains
* unchanged.
*
* \param name the name to search.
- * \return number of occurences found.
+ * \return number of occurrences found.
* \sa Change_Directory(const char* Path)
*/
// ============================================================================
* path, to current context. Prefer absolute pathname, relative
* pathname are not safe, when SALOME_NamingService object is
* shared or use in multithreaded context.
- * \return true if successfull
- * (creation not strictly garanteed if true, because Register may
+ * \return true if successful
+ * (creation not strictly guaranteed if true, because Register may
* catch some specific unlikely exception without throw anything
* --- to be corrected ---)
* \sa RegisterCORBA::Object_ptr ObjRef, const char* Path)
CosNaming::NamingContext_var current_context = _current_context;
bool changeOK = false;
- // --- replace _current_context with _root_context if Path begins whith '/'
+ // --- replace _current_context with _root_context if Path begins with '/'
if (path[0] == '/')
current_context = _root_context;
* \param context_name CosNaming structure to put the path.
* \param splitPath a vector of string with subdirectories and final
* object, if any.
- * \param onlyDir if true, final object (if any) is ommited
+ * \param onlyDir if true, final object (if any) is omitted
* in context_name.
* if false, final object (if any) is included in
* context_name.
/*! \brief search a name in current directory.
*
* Search a name in the current directory. after call, the current directory
- * is changed to the directory containing the last occurence of name found.
- * If no occurence found (see return value), current directory remains
+ * is changed to the directory containing the last occurrence of name found.
+ * If no occurrence found (see return value), current directory remains
* unchanged. The call is recursive.
*
* \param name the name to search.
- * \param occurence_number number of occurence already found (incremented)
+ * \param occurence_number number of occurrence already found (incremented)
*/
// ============================================================================
if (!strcmp( bindingName[0].id, name))
{
- //MESSAGE("One occurence was found");
+ //MESSAGE("One occurrence was found");
occurence_number++;
// --- We keep in memory the directory where
- // one occurence was found
+ // one occurrence was found
found_context = _current_context ;
}
binding_iterator->destroy();
}
- // --- We go to the last directory where an occurence was found
+ // --- We go to the last directory where an occurrence was found
_current_context = found_context;
binding_iterator->destroy();
}
- // --- return to the last directory where an occurence was found
+ // --- return to the last directory where an occurrence was found
_current_context = ref_context ;
}
${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
${CPPUNIT_LIBRARIES}
SalomeNS
${PROJECT_SOURCE_DIR}/src/SALOMETraceCollector
)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
SalomeContainer
SalomeNS
string instanceName = aCompName + "_inst_" + aNumI ;
string component_registerName = _containerName + "/" + instanceName;
- // --- Instanciate required CORBA object
+ // --- Instantiate required CORBA object
Container_proxy_impl_final::proxy_object * proxy = new Container_proxy_impl_final::proxy_object();
proxy->proxy_id = (component_proxy_factory) (_orb,
}
catch (...)
{
- INFOS( "Exception catched in Proxy creation" );
+ INFOS( "Exception caught in Proxy creation" );
return Engines::EngineComponent::_nil();
}
//=============================================================================
/*!
- * Construtor
+ * Constructor
*/
//=============================================================================
* \param componentName like COMPONENT
* try to make a Python import of COMPONENT,
* then a lib open of libCOMPONENTEngine.so
- * \return true if dlopen successfull or already done, false otherwise
+ * \return true if dlopen successful or already done, false otherwise
*/
//=============================================================================
if (origName[0] != '/')
{
- INFOS("path of file to copy must be an absolute path begining with '/'");
+ INFOS("path of file to copy must be an absolute path beginning with '/'");
return Engines::fileRef::_nil();
}
}
catch (...)
{
- INFOS( "Container_i::load_impl catched" ) ;
+ INFOS( "Container_i::load_impl caught" ) ;
}
return iobject._retn();
}
std::string component_registerName =
_containerName + "/" + instanceName;
- // --- Instanciate required CORBA object
+ // --- Instantiate required CORBA object
PortableServer::ObjectId *id; //not owner, do not delete (nore use var)
id = (Component_factory) ( _orb, _poa, _id, instanceName.c_str(),
}
catch (...)
{
- INFOS( "Container_i::createInstance exception catched" );
+ INFOS( "Container_i::createInstance exception caught" );
}
return iobject._retn();
}
std::string instanceName = aCompName + "_inst_" + aNumI + "_work_node_" + aNumI2;
std::string component_registerName = _containerName + "/" + instanceName;
- // --- Instanciate work node
+ // --- Instantiate work node
PortableServer::ObjectId *id ; //not owner, do not delete (nore use var)
id = (Component_factory) (_orb, proxy_ior, getMyRank(), _poa, _id, instanceName.c_str(), componentName);
CORBA::string_free(proxy_ior);
}
catch (...)
{
- INFOS("Container_i::create_paco_component_node_instance exception catched");
+ INFOS("Container_i::create_paco_component_node_instance exception caught");
SALOME::ExceptionStruct es;
es.type = SALOME::INTERNAL_ERROR;
- es.text = "Container_i::create_paco_component_node_instance exception catched";
+ es.text = "Container_i::create_paco_component_node_instance exception caught";
throw SALOME::SALOME_Exception(es);
}
}
)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
SalomeNS
OpUtil
//=============================================================================
/*!
- * add an entry in the ressources catalog xml file.
+ * add an entry in the resources catalog xml file.
*/
//=============================================================================
*/
void AddDefaultResourceInCatalog();
- //! will contain the path to the ressources catalog
+ //! will contain the path to the resources catalog
std::list<std::string> _path_resources;
std::list<std::string>::iterator _path_resources_it;
- //! will contain the informations on the data type catalog(after parsing)
+ //! will contain the information on the data type catalog(after parsing)
MapOfParserResourcesType _resourcesList;
//! a map that contains all the available load rate managers (the key is the name)
}
/*!
- * Return list of resources available (regarding containt of CatalogResources.xml). And for each resource the number of proc available of it.
+ * Return list of resources available (regarding content of CatalogResources.xml). And for each resource the number of proc available of it.
*/
void SALOME_ResourcesManager::ListAllAvailableResources(Engines::ResourceList_out machines, Engines::IntegerList_out nbProcsOfMachines)
{
Engines::ResourceList *
SALOME_ResourcesManager::GetFittingResources(const Engines::ResourceParameters& params)
{
- MESSAGE("ResourcesManager::GetFittingResources");
+ //MESSAGE("ResourcesManager::GetFittingResources");
Engines::ResourceList_var ret;
// CORBA -> C++
INFOS("[getMachineFile] Error resource_name MPI implementation was defined for " << resource_name);
}
else
- INFOS("[getMachineFile] Error resource_name MPI implementation not currenly handled for " << resource_name);
+ INFOS("[getMachineFile] Error resource_name MPI implementation not currently handled for " << resource_name);
}
else
INFOS("[getMachineFile] Error resource_name not found in resourcesList -> " << resource_name);
M src/SALOMEDS/SALOMEDS_SObject_i.cxx
M src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
-# detailled modifications:
+# detailed modifications:
- in new files,
change ExternalFileDef in FileType everywhere
Description : This class is intended for storing different object attributes that
have only two states (0 and 1).
- Avalable attributes:
+ Available attributes:
IS_VISIBLE - is equal to 1 if object is visible in 3D view (0 - overwise).
This attribute is valid for active view only.
Description : This class is intended for storing different object attributes that
have only two states (0 and 1).
- Avalable attributes:
+ Available attributes:
IS_VISIBLE - is equal to 1 if object is visible in 3D view (0 - overwise).
This attribute is valid for active view only.
//=======================================================================
/*!
* Function : IsRoot
- * Purpose : Returns True is the attribute is highest in an hierachy
+ * Purpose : Returns True is the attribute is highest in an hierarchy
*/
//=======================================================================
bool SALOMEDS_AttributeParameter::IsRoot()
//=======================================================================
/*!
* Function : IsRoot
- * Purpose : Returns True is the attribute is highest in an hierachy
+ * Purpose : Returns True is the attribute is highest in an hierarchy
*/
//=======================================================================
CORBA::Boolean SALOMEDS_AttributeParameter_i::IsRoot()
SALOMEDS::Study_var Study = Study_servant->_this();
// Register study in the naming service
- // Path to acces the study
+ // Path to access the study
if(!_name_service->Change_Directory("/Study"))
MESSAGE( "Unable to access the study directory" )
else
_mapOfPOA[Study->StudyId()] = _poa;
// Register study in the naming service
- // Path to acces the study
+ // Path to access the study
if(!_name_service->Change_Directory("/Study")) MESSAGE( "Unable to access the study directory" )
else _name_service->Register(Study, aStudyImpl->Name().c_str());
${PROJECT_BINARY_DIR}/idl
)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
${CPPUNIT_LIBRARIES}
SALOMEBasics
//Check the attribute creation
CPPUNIT_ASSERT(_attr);
- //Try to retreive a value with invalid ID
+ //Try to retrieve a value with invalid ID
bool isRaised = false;
CPPUNIT_ASSERT(!_attr->IsSet("invalid ID", PT_INTEGER));
try {
CPPUNIT_ASSERT(_attr->Value(4) == 5);
- //Check processing of invalid indicies
+ //Check processing of invalid indices
bool isRaised = false;
try {
_attr->Value(-1);
CPPUNIT_ASSERT(_attr->Value(4) == 5.5);
- //Check processing of invalid indicies
+ //Check processing of invalid indices
bool isRaised = false;
try {
_attr->Value(-1);
# This local variable defines the list of FLAGS common to all target in this package.
ADD_DEFINITIONS(${BOOST_DEFINITIONS})
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
SALOMEBasics
SalomeHDFPersist
//=======================================================================
SALOMEDSImpl_AttributeParameter* SALOMEDSImpl_AttributeParameter::GetFather()
{
- SALOMEDSImpl_AttributeParameter* aFather;
+ SALOMEDSImpl_AttributeParameter* aFather = 0;
DF_Label L = Label();
if(L.IsRoot()) return aFather;
//=======================================================================
/*!
* Function : IsRoot
- * Purpose : Returns True is the attribute is highest in an hierachy
+ * Purpose : Returns True is the attribute is highest in an hierarchy
*/
//=======================================================================
bool SALOMEDSImpl_AttributeParameter::IsRoot()
buffer << _bools.size() << " ";
for(std::map<std::string,bool>::const_iterator p = _bools.begin(); p != _bools.end(); p++) {
- buffer << convertString(p->first) << " " << p->second << " ";
+ buffer << convertString(p->first) << " " << p->second << " ";
}
buffer << _strings.size() << " ";
buffer << _realarrays.size() << " ";
for(std::map< std::string,std::vector<double> >::const_iterator p = _realarrays.begin(); p != _realarrays.end(); p++) {
std::vector<double> v(p->second);
- sprintf(tmpBuffer, " %s %d ", convertString(p->first).c_str(), v.size());
+ sprintf(tmpBuffer, " %s %d ", convertString(p->first).c_str(), (int)v.size());
buffer << tmpBuffer;
- for(int i = 0; i<v.size(); i++) {
+ for(size_t i = 0; i<v.size(); i++) {
sprintf(tmpBuffer, " %.64e ", v[i]);
buffer << tmpBuffer;
}
buffer << _intarrays.size() << " ";
for(std::map< std::string,std::vector<int> >::const_iterator p = _intarrays.begin(); p != _intarrays.end(); p++) {
std::vector<int> v(p->second);
- sprintf(tmpBuffer, " %s %d ", convertString(p->first).c_str(), v.size());
+ sprintf(tmpBuffer, " %s %d ", convertString(p->first).c_str(), (int)v.size());
buffer << tmpBuffer;
- for(int i = 0; i<v.size(); i++) {
+ for(size_t i = 0; i<v.size(); i++) {
sprintf(tmpBuffer, " %d ", v[i]);
buffer << tmpBuffer;
}
buffer << _strarrays.size() << " ";
for(std::map< std::string,std::vector<std::string> >::const_iterator p = _strarrays.begin(); p != _strarrays.end(); p++) {
std::vector<std::string> v(p->second);
- sprintf(tmpBuffer, " %s %d ", convertString(p->first).c_str(), v.size());
+ sprintf(tmpBuffer, " %s %d ", convertString(p->first).c_str(), (int)v.size());
buffer << tmpBuffer;
- for(int i = 0; i<v.size(); i++) {
+ for(size_t i = 0; i<v.size(); i++) {
buffer << " " << convertString(v[i]) << " ";
}
}
- delete tmpBuffer;
+ delete [] tmpBuffer;
std::string AS = buffer.str();
- return AS;
+ return AS;
}
//=======================================================================
* Purpose : Restores the attribute from the string
*/
//=======================================================================
-void SALOMEDSImpl_AttributeParameter::Load(const std::string& theValue)
-{
+void SALOMEDSImpl_AttributeParameter::Load(const std::string& theValue)
+{
Backup();
_ints.clear();
aProperty[a++] = 1;
}
- //Write delimeter of the section to define end of the modifications section
+ //Write delimiter of the section to define end of the modifications section
aProperty[a++] = 30;
//Write units if need
a = strlen(aProperty);
}
- aProperty[a++] = 1; //delimeter of the units and comments
+ aProperty[a++] = 1; //delimiter of the units and comments
//Write comments if need
if(comment.size() > 0) {
a = strlen(aProperty);
}
- aProperty[a++] = 30; //delimeter of the component versions
+ aProperty[a++] = 30; //delimiter of the component versions
std::map<std::string, std::string>::const_iterator versionsIt;
for ( versionsIt = versions.begin(); versionsIt != versions.end(); ++versionsIt ) {
//Case when study contains units and comment properties
if( anIndex < value.size() ) {
- anIndex++; //skip the delimeter of the sections: char(30)
+ anIndex++; //skip the delimiter of the sections: char(30)
int unitsSize;
for(unitsSize = 0; aCopy[anIndex+unitsSize] != 1; unitsSize++);
}
//============================================================================
-/*! Function : Desctructor
+/*! Function : Destructor
* Purpose :
*/
//============================================================================
//...........................,
//component=versions, char(1), char(0)
- //string length: 1 byte = locked flag, 1 byte = modified flag, (12 + name length + 1) for each name and date, 1 byte (char(30) section delimeter)
+ //string length: 1 byte = locked flag, 1 byte = modified flag, (12 + name length + 1) for each name and date, 1 byte (char(30) section delimiter)
// unit length + 1, comment length, "zero" byte
char* aProperty = new char[3 + aLength + 12 * aNames.size() + 1 + unitsSize + 1 + commentSize + 1 + aLength1 ];
aProperty[a++] = 1;
}
- //Write delimeter of the section to define end of the modifications section
+ //Write delimiter of the section to define end of the modifications section
aProperty[a++] = 30;
//Write units if need
a = strlen(aProperty);
}
- aProperty[a++] = 30; //delimeter of the component versions
+ aProperty[a++] = 30; //delimiter of the component versions
std::map<std::string, std::string>::const_iterator versionsIt;
for ( versionsIt = versions.begin(); versionsIt != versions.end(); ++versionsIt ) {
// Set "C" locale temporarily to avoid possible localization problems
Kernel_Utils::Localizer loc;
- // HDF File will be composed of differents part :
+ // HDF File will be composed of different part :
// * For each ComponentDataType, all data created by the component
- // Informations in data group hdf_group_datacomponent
+ // Information in data group hdf_group_datacomponent
// * Study Structure -> Exactly what is contained in Document
- // Informations in data group hdf_group_study_structure
+ // Information in data group hdf_group_study_structure
_errorCode = "";
aStudy->URL(aStudyUrl);
// To change for Save
- // Do not have to do a new file but just a Open??? Rewrite all informations after erasing evrything??
+ // Do not have to do a new file but just a Open??? Rewrite all information after erasing everything??
hdf_file = new HDFfile((char*)aUrl.c_str());
hdf_file->CreateOnDisk();
hdf_dataset->WriteOnDisk((void*)(theASCII?"A":"B")); // save: ASCII or BINARY
hdf_dataset->CloseOnDisk();
hdf_dataset=0; //will be deleted by hdf_sco_AuxFiles destructor
- // Creation of the persistance reference attribute
+ // Creation of the persistence reference attribute
Translate_IOR_to_persistentID (sco, Engine, theMultiFile, theASCII);
}
}
{
_errorCode = "";
- // Write in group hdf_group_datatype all informations of SObject SC
+ // Write in group hdf_group_datatype all information of SObject SC
// Iterative function to parse all SObjects under a SComponent
HDFgroup *hdf_group_sobject = 0;
if (!strcmp(hdf_dataset->GetName(),"COMPONENTDATATYPE")) {
anAttr = theStudy->NewBuilder()->FindOrCreateAttribute(aSO, "AttributeComment");
} else if (!strcmp(hdf_dataset->GetName(),"AttributeReference") ||
- !strcmp(hdf_dataset->GetName(),"Reference")) { // Old format maintainance
+ !strcmp(hdf_dataset->GetName(),"Reference")) { // Old format maintenance
theStudy->NewBuilder()->Addreference(aSO, theStudy->CreateObjectID(current_string));
delete [] (current_string);
hdf_dataset->CloseOnDisk();
${PROJECT_BINARY_DIR}/idl
)
-# This local variable defines the list of dependant libraries common to all target in this package.
+# This local variable defines the list of dependent libraries common to all target in this package.
SET(COMMON_LIBS
${CPPUNIT_LIBRARIES}
SALOMEBasics
aTDFAttr = aBuilder->FindOrCreateAttribute(aSubSO, "AttributeUserID");
if(aTDFAttr) {
- std::cout << "Attribute UserID was created succesfully : id = " << dynamic_cast<SALOMEDSImpl_AttributeUserID*>(aTDFAttr)->Value() << std::endl;
+ std::cout << "Attribute UserID was created successfully : id = " << dynamic_cast<SALOMEDSImpl_AttributeUserID*>(aTDFAttr)->Value() << std::endl;
}
else std::cout << "Can't create AttributeUserID" << std::endl;
std::string id2 = "0e1c36e6-379b-4d90-ab3b-18a14310e648";
aTDFAttr = aBuilder->FindOrCreateAttribute(aSubSO, "AttributeUserID"+id2);
if(aTDFAttr) {
- std::cout << "Attribute UserID was created succesfully : id = " << dynamic_cast<SALOMEDSImpl_AttributeUserID*>(aTDFAttr)->Value() << std::endl;
+ std::cout << "Attribute UserID was created successfully : id = " << dynamic_cast<SALOMEDSImpl_AttributeUserID*>(aTDFAttr)->Value() << std::endl;
}
else std::cout << "Can't create AttributeUserID" << std::endl;
/*!
* This class is for use without CORBA, inside or outside SALOME.
* SALOME uses SALOMETraceCollector, to allow trace collection via CORBA.
- * Type of trace (and corresponding class) is choosen in LocalTraceBufferPool.
+ * Type of trace (and corresponding class) is chosen in LocalTraceBufferPool.
*
* Guarantees a unique object instance of the class (singleton thread safe)
* a separate thread for loop to print traces is launched.
// ============================================================================
/*!
* In a separate thread, loop to print traces.
- * Mutex garantees intialisation on instance method is done and only one run
+ * Mutex guarantees intialisation on instance method is done and only one run
* allowed (double check ...)
* Loop until there is no more buffer to print,
* and no ask for end from destructor.
/*!
* This class is for use without CORBA, inside or outside SALOME.
* SALOME uses SALOMETraceCollector, to allow trace collection via CORBA.
- * Type of trace (and corresponding class) is choosen in LocalTraceBufferPool.
+ * Type of trace (and corresponding class) is chosen in LocalTraceBufferPool.
*
* Guarantees a unique object instance of the class (singleton thread safe)
* a separate thread for loop to print traces is launched.
// ============================================================================
/*!
* In a separate thread, loop to print traces.
- * Mutex garantees intialisation on instance method is done and only one run
+ * Mutex guarantees intialisation on instance method is done and only one run
* allowed (double check ...)
* Loop until there is no more buffer to print,
* and no ask for end from destructor.
// Module : SALOME
// $Header$
//
-/* --- Definition macros file to print informations if _DEBUG_ is defined --- */
+/* --- Definition macros file to print information if _DEBUG_ is defined --- */
#ifndef UTILITIES_H
#define UTILITIES_H
* This buffer is read later by a specific thread in charge of trace print.
* Order of trace entries is globally respected. Nevertheless, if there are
* several threads waiting for a free buffer to trace, the order of
- * thread waken up is not garanteed (no fifo or priority rules in Linux Kernel)
+ * thread waken up is not guaranteed (no fifo or priority rules in Linux Kernel)
*/
#define MESS_INIT(deb) std::ostringstream os; os<<deb
CORBA::Object_var activate()
{
PortableServer::POA_var poa(getPOA());
- PortableServer::ObjectId_var id(poa->activate_object(this));
+ PortableServer::ObjectId_var id;
+ try
+ {
+ id=poa->activate_object(this);
+ }
+ catch(PortableServer::POA::ServantAlreadyActive& e)
+ {
+ id=poa->servant_to_id(this);
+ }
CORBA::Object_var ret(poa->id_to_reference(id));
return ret;
}
-
+
void enforcedRelease()
{
PortableServer::POA_var poa(getPOA());
const T& operator*() const { return *_ptr; }
operator T *() { return _ptr; }
operator const T *() const { return _ptr; }
+ bool isNull() const { return _ptr==NULL; }
private:
void destroyPtr()
{
_orb->shutdown(0);
}
+RequestSwitcher::RequestSwitcher(CORBA::ORB_ptr orb)
+{
+ CORBA::Object_var obj(orb->resolve_initial_references("RootPOA"));
+ PortableServer::POA_var poa(PortableServer::POA::_narrow(obj));
+ _poa_manager_under_control=poa->the_POAManager();
+ //
+ CORBA::PolicyList policies;
+ policies.length(1);
+ PortableServer::ThreadPolicy_var threadPol(poa->create_thread_policy(PortableServer::SINGLE_THREAD_MODEL));
+ policies[0]=PortableServer::ThreadPolicy::_duplicate(threadPol);
+ // all is in PortableServer::POAManager::_nil. By specifying _nil cf Advanced CORBA Programming with C++ p 506
+ // a new POA manager is created. This POA manager is independent from POA manager of the son ones.
+ _poa_for_request_control=poa->create_POA("4RqstSwitcher",PortableServer::POAManager::_nil(),policies);
+ threadPol->destroy();
+ PortableServer::POAManager_var mgr(_poa_for_request_control->the_POAManager());
+ mgr->activate();
+ //obj=orb->resolve_initial_references ("POACurrent");// agy : usage of POACurrent breaks the hold_requests. Why ?
+ //PortableServer::Current_var current(PortableServer::Current::_narrow(obj));
+}
+
+void RequestSwitcher::holdRequests()
+{
+ _poa_manager_under_control->hold_requests(true);
+}
+
+void RequestSwitcher::activeRequests()
+{
+ _poa_manager_under_control->activate();
+}
+
DataScopeServerBase::DataScopeServerBase(CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName):_globals(0),_locals(0),_pickler(0),_orb(CORBA::ORB::_duplicate(orb)),_name(scopeName),_killer(killer)
{
}
return ret;
}
+SALOME::RequestSwitcher_ptr DataScopeServerBase::getRequestSwitcher()
+{
+ if(_rs.isNull())
+ {
+ _rs=new RequestSwitcher(_orb);
+ }
+ CORBA::Object_var obj(_rs->activate());
+ return SALOME::RequestSwitcher::_narrow(obj);
+}
+
+void DataScopeServerBase::takeANap(CORBA::Double napDurationInSec)
+{
+ if(napDurationInSec<0.)
+ throw Exception("DataScopeServerBase::takeANap : negative value !");
+#ifndef WIN32
+ struct timespec req,rem;
+ long nbSec((long)napDurationInSec);
+ double remainTime(napDurationInSec-(double)nbSec);
+ req.tv_sec=nbSec;
+ req.tv_nsec=(long)(remainTime*1000000.);
+ int ret(nanosleep(&req,&rem));
+ if(ret!=0)
+ throw Exception("DataScopeServerBase::takeANap : nap not finished as expected !");
+#else
+ throw Exception("DataScopeServerBase::takeANap : not implemented for Windows !");
+#endif
+}
+
void DataScopeServerBase::initializePython(int argc, char *argv[])
{
Py_Initialize();
CORBA::ORB_var _orb;
};
+ class SALOMESDS_EXPORT RequestSwitcher : public POA_SALOME::RequestSwitcher, public POAHolder
+ {
+ public:
+ RequestSwitcher(CORBA::ORB_ptr orb);
+ void holdRequests();
+ void activeRequests();
+ PortableServer::POA_var getPOA() const { return _poa_for_request_control; }
+ private:
+ PortableServer::POA_var _poa_for_request_control;
+ PortableServer::POAManager_var _poa_manager_under_control;
+ };
+
class KeyWaiter;
class PickelizedPyObjServer;
public:
DataScopeServerBase(CORBA::ORB_ptr orb, SALOME::DataScopeKiller_var killer, const std::string& scopeName);
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::RequestSwitcher_ptr getRequestSwitcher();
+ void takeANap(CORBA::Double napDurationInSec);
public:
+ ~DataScopeServerBase();
BasicDataServer *retrieveVarInternal2(const std::string& varName);
void initializePython(int argc, char *argv[]);
void registerToSalomePiDict() const;
std::string _name;
std::list< std::pair< SALOME::BasicDataServer_var, BasicDataServer * > > _vars;
SALOME::DataScopeKiller_var _killer;
+ AutoServantPtr<RequestSwitcher> _rs;
static std::size_t COUNTER;
};
#include "SALOMESDS_Exception.hxx"
SALOMESDS::Exception::Exception(const std::string& reason)
+{
+ this->assign(reason.c_str());
+}
+
+SALOMESDS::Exception::Exception(const char *reason)
+{
+ this->assign(reason);
+}
+
+void SALOMESDS::Exception::assign(const char *reason)
{
SALOME::ExceptionStruct es;
es.type=SALOME::INTERNAL_ERROR;
- es.text=CORBA::string_dup(reason.c_str());
+ es.text=CORBA::string_dup(reason);
es.lineNumber=0;
(*this).details=es;
}
-
-
{
public:
Exception(const std::string& reason);
+ Exception(const char *reason);
+ private:
+ void assign(const char *reason);
};
}
throw Exception("PickelizedPyObjServer::setNewPyObj : trying to assign a NULL pyobject in this !");
if(obj==_self)
return ;
- if(PyList_Check(obj)==0 && PyDict_Check(obj)==0 && PyTuple_Check(obj)==0 && PyString_Check(obj)==0 && PyInt_Check(obj)==0 && PyBool_Check(obj)==0 && PyFloat_Check(obj)==0 && obj!=Py_None)
- throw Exception("PickelizedPyObjServer::setNewPyObj : Supported python types are [list,tuple,dict,str,int,bool,float,None] !");
if(_self)
{
PyObject *selfType(PyObject_Type(_self));
std::istringstream isTransacSS(argv[2]);
int isTransac(0);
isTransacSS >> isTransac;
- CORBA::ORB_var orb(CORBA::ORB_init(argc,argv));
+ CORBA::ORB_var orb;
+ {
+ int argc(3);
+ char **argv=new char *[3];
+ char *p0(strdup("DTC")),*p1(strdup("-ORBsupportCurrent")),*p2(strdup("0"));
+ argv[0]=p0;
+ argv[1]=p1;// by disabling supportCurrent it make the POAManager::hold_requests work !
+ argv[2]=p2;
+ orb=CORBA::ORB_init(argc,argv);
+ free(p0); free(p1); free(p2);
+ delete [] argv;
+ }
CORBA::Object_var obj(orb->resolve_initial_references("RootPOA"));
PortableServer::POA_var poa(PortableServer::POA::_narrow(obj));
PortableServer::POAManager_var mgr(poa->the_POAManager());
import cPickle
import gc
import time
+from datetime import datetime
import multiprocessing as mp
+nbOfSecWait=1.
+
def obj2Str(obj):
return cPickle.dumps(obj,cPickle.HIGHEST_PROTOCOL)
def str2Obj(strr):
print out
print err
return proc.returncode
-
+
+def func_test7(scopeName,l,l2,cv):
+ salome.salome_init()
+ varName="a"
+ zeValue={"ab":[4,5,6]}
+ dsm=salome.naming_service.Resolve("/DataServerManager")
+ dss,isCreated=dsm.giveADataScopeTransactionCalled(scopeName) # should be suspended nbOfSecWait s by main process
+ assert(not isCreated)
+ l.release() # tell manager that I'm ready
+ l2.acquire() # wait for manager to start micro-test1
+ ######### micro-test1 - check that all requests are suspended
+ s=datetime.now()
+ t0=dss.createRdWrVarTransac(varName,obj2Str(zeValue))
+ s=(datetime.now()-s).total_seconds()
+ assert(s>=0.99*nbOfSecWait and s<nbOfSecWait*1.01) # expect to wait nearly nbOfSecWait seconds
+ dss.atomicApply([t0])
+ ######### end of micro-test1
+ ######### micro-test2 - after activeRequests everything work well
+ s=datetime.now()
+ st=dss.fetchSerializedContent(varName)
+ assert(str2Obj(st)==zeValue)
+ s=(datetime.now()-s).total_seconds()
+ assert(s>=0. and s<0.05) # expect to be not locked
+ ######### end of micro-test2
+ with cv:
+ cv.notify_all()
+ dss.takeANap(nbOfSecWait) # emulate a DataServer occupation
+ pass
+
class SalomeSDSTest(unittest.TestCase):
def testList1(self):
self.assertEqual(str2Obj(dss.fetchSerializedContent(varName)),{'ab':[4,5,6],'cd':[7,8,9,10]})
pass
+ def testLockToDump(self):
+ """ Test to check that holdRequests method. This method wait for clean server status and hold it until activeRequests is called.
+ Warning this method expects a not overloaded machine to be run because test is based on ellapse time.
+ """
+ scopeName="Scope1"
+ dsm=salome.naming_service.Resolve("/DataServerManager")
+ dsm.cleanScopesInNS()
+ if scopeName in dsm.listScopes():
+ dsm.removeDataScope(scopeName)
+ # l is for main process sync. to be sure to launch test when sub process is ready
+ # l2 lock is for sub process sync.
+ l=mp.Lock(); l2=mp.Lock()
+ l.acquire() ; l2.acquire()
+ cv=mp.Condition(mp.Lock())
+ dss,isCreated=dsm.giveADataScopeTransactionCalled(scopeName)
+ #assert(isCreated)
+ p=mp.Process(target=func_test7,args=(scopeName,l,l2,cv))
+ p.start()
+ l.acquire()
+ rs=dss.getRequestSwitcher() ; rs.holdRequests() # The aim of the test
+ l2.release() # tell slave process that it's ready for micro-test1
+ time.sleep(nbOfSecWait)
+ rs.activeRequests() # The aim of the test
+ ######### micro-test3 - check that holdRequests is able to wait for a non finished job
+ with cv:
+ cv.wait()
+ s=datetime.now()
+ time.sleep(0.01) # let main proc the priority
+ rs.holdRequests() # the aim of the test is here. main process is occupied 1s -> holdRequests is Expected to wait
+ s=(datetime.now()-s).total_seconds()
+ rs.activeRequests()
+ assert(s>=0.99*nbOfSecWait and s<nbOfSecWait*1.01) # expect to be not locked
+ # finishing
+ p.join()
+ pass
+
def setUp(self):
salome.salome_init()
pass
// ============================================================================
/*!
* This class is for use with CORBA, inside SALOME.
- * Type of trace (and corresponding class) is choosen in LocalTraceBufferPool.
+ * Type of trace (and corresponding class) is chosen in LocalTraceBufferPool.
*
* Guarantees a unique object instance of the class (singleton thread safe)
* a separate thread for loop to print traces is launched.
// ============================================================================
/*!
* In a separate thread, loop to print traces.
- * Mutex garantees intialisation on instance method is done and only one run
+ * Mutex guarantees intialisation on instance method is done and only one run
* allowed (double check ...)
* Loop until there is no more buffer to print,
* and no ask for end from destructor.
*
* <B>Design description</B>
*
- * The destruction object must be created dynamicaly because it suscribes himself in the list of
+ * The destruction object must be created dynamically because it subcribes itself in the list of
* destruction to be performed at the end of the process.
*
*/
free((char*)_dir);
#ifndef WIN32
// free the memory only on Unix
- // becasue at Windows it is the same static variable
+ // because in Windows it is the same static variable
// (function get_adip() returns the same char* as get_uname() )
delete [] (char*)_adip ;
#endif
gives Hostname without domain extension.
SALOME naming service needs short Hostnames (without domain extension).
- HOSTNAME is not allways defined in environment,
+ HOSTNAME is not always defined in environment,
socket.gethostname() gives short or complete Hostname, depending on
defined aliases.
"""
self._name = name
self._pid = os.getpid()
self._machine = socket.gethostname()
- self._adip = socket.gethostbyname(self._machine) # IP adress
+ self._adip = socket.gethostbyname(self._machine) # IP address
if sys.platform == "win32":
self._uid = os.getpid()
self._pwname = os.environ["USERNAME"]
