#!/usr/bin/env python
-import os, sys, pickle, string
+import os, sys, pickle, string, signal
########## adds to the kill list of SALOME one more process ##########
-def addToKillList(command_pid, command):
- command=(command.split(" "))[0]
- my_port = 2809
- try:
- file = open(os.environ["OMNIORB_CONFIG"], "r")
- s = file.read()
- while len(s):
- l = string.split(s, ":")
- if string.split(l[0], " ")[0] == "ORBInitRef" or string.split(l[0], " ")[0] == "InitRef" :
- my_port = int(l[len(l)-1])
- pass
- s = file.read()
+def findFileDict():
+ if os.environ.has_key('NSPORT'):
+ my_port = os.environ['NSPORT']
pass
- except:
- pass
- #print "myport = ", my_port
-
+ else:
+ my_port = 2809
+ try:
+ file = open(os.environ["OMNIORB_CONFIG"], "r")
+ s = file.read()
+ while len(s):
+ l = string.split(s, ":")
+ if string.split(l[0], " ")[0] == "ORBInitRef" or string.split(l[0], " ")[0] == "InitRef" :
+ my_port = int(l[len(l)-1])
+ pass
+ s = file.read()
+ pass
+ pass
+ except:
+ pass
+ pass
+ print "myport = ", my_port
+ return my_port
+
+def addToKillList(command_pid, command):
+ my_port = findFileDict()
filedict=os.getenv("HOME")+'/'+os.getenv('USER')+"_"+str(my_port)+'_SALOME_pidict'
try:
fpid=open(filedict, 'r')
#print "see process %s : %s"% (pid, cmd[0])
if pid == command_pid:
already_in=1
+ pass
+ pass
pass
+ command=(command.split(" "))[0]
if already_in == 0:
try:
process_ids.append({command_pid: [command]})
print "addToKillList: can not add command %s to the kill list"% filedict
pass
pass
+ pass
+
+def killList():
+ my_port = findFileDict()
+ filedict=os.getenv("HOME")+'/'+os.getenv('USER')+"_"+str(my_port)+'_SALOME_pidict'
+ try:
+ fpid=open(filedict, 'r')
+ process_ids=pickle.load(fpid)
+ fpid.close()
+ except:
+ process_ids=[{}]
+ pass
+
+ for process_id in process_ids:
+ print process_id
+ for pid, cmd in process_id.items():
+ print "stop process %s : %s"% (pid, cmd[0])
+ try:
+ os.kill(int(pid),signal.SIGKILL)
+ except:
+ print " ------------------ process %s : %s inexistant"% (pid, cmd[0])
+ pass
+ pass
+ pass
+ os.remove(filedict)
+ pass
+
+
if __name__ == "__main__":
print sys.argv
//_poa->deactivate_object(*_id);
if(_isServantAloneInProcess)
{
+ MESSAGE("Effective Shutdown of container Begins...");
LocalTraceBufferPool* bp1 = LocalTraceBufferPool::instance();
bp1->deleteInstance(bp1);
_orb->shutdown(0);
CORBA::Object_var obj=_NS->Resolve((*iter).c_str());
Engines::Container_var cont=Engines::Container::_narrow(obj);
if(!CORBA::is_nil(cont))
- cont->Shutdown();
+ {
+ MESSAGE("ShutdownContainers: " << (*iter));
+ cont->Shutdown();
+ }
+ else MESSAGE("ShutdownContainers: no container ref for " << (*iter));
}
}
import runSalome
import orbmodule
import TestKiller
+import addToKillList
# get SALOME environment :
containerManager = clt.waitNS("/ContainerManager",Engines.ContainerManager)
containerManager.Shutdown()
-# kill Test process
+# kill Test process
+
+addToKillList.killList()
TestKiller.killProcess(runSalome.process_id)
if (_singleton == 0) // another thread may have got
{ // the lock after the first test
DEVTRACE("FileTraceCollector:: instance()");
- _singleton = new FileTraceCollector();
+ BaseTraceCollector* myInstance = new FileTraceCollector();
_fileName = fileName;
DEVTRACE(" _fileName: " << _fileName);
int re2 = pthread_create(&traceThread, NULL,
FileTraceCollector::run, (void *)bid);
sem_wait(&_sem);
+ _singleton = myInstance; // _singleton known only when init done
DEVTRACE("FileTraceCollector:: instance()-end");
}
ret = pthread_mutex_unlock(&_singletonMutex); // release lock
ret = pthread_mutex_lock(&_singletonMutex); // acquire lock to be alone
if (_singleton == 0) // another thread may have got
{ // the lock after the first test
- _singleton = new LocalTraceBufferPool();
+ LocalTraceBufferPool* myInstance = new LocalTraceBufferPool();
DESTRUCTOR_OF<LocalTraceBufferPool> *ptrDestroy =
- new DESTRUCTOR_OF<LocalTraceBufferPool> (*_singleton);
+ new DESTRUCTOR_OF<LocalTraceBufferPool> (*myInstance);
// --- start a trace Collector
exit(1); // in case assert is deactivated
}
}
+ _singleton = myInstance;
}
ret = pthread_mutex_unlock(&_singletonMutex); // release lock
}
ret = pthread_mutex_lock(&_singletonMutex); // acquire lock to be alone
if (_singleton == 0) // another thread may have got
{ // the lock after the first test
- _singleton = new LocalTraceCollector();
+ BaseTraceCollector* myInstance = new LocalTraceCollector();
sem_init(&_sem,0,0); // to wait until run thread is initialized
pthread_t traceThread;
int re2 = pthread_create(&traceThread, NULL,
LocalTraceCollector::run, (void *)bid);
sem_wait(&_sem);
+ _singleton = myInstance; // _singleton known only when init done
}
ret = pthread_mutex_unlock(&_singletonMutex); // release lock
}
ret = pthread_mutex_lock(&_singletonMutex); // acquire lock to be alone
if (_singleton == 0) // another thread may have got
{ // the lock after the first test
- _singleton = new SALOMETraceCollector();
+ BaseTraceCollector* myInstance = new SALOMETraceCollector();
int argc=0;
char *_argv=0;
char ** argv = &_argv;
int re2 = pthread_create(&traceThread, NULL,
SALOMETraceCollector::run, (void *)bid);
sem_wait(&_sem);
+ _singleton = myInstance; // _singleton known only when init done
}
ret = pthread_mutex_unlock(&_singletonMutex); // release lock
}
