Commit b14dda41 authored by hkrishna's avatar hkrishna

remove deletion of readline thread as it is causes more problems than it resolves

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@22817 18c085ea-50e0-402c-830e-de6fd14e8384
parent 542ecfb0
...@@ -15869,12 +15869,6 @@ visit_exec_client_method(void *data) ...@@ -15869,12 +15869,6 @@ visit_exec_client_method(void *data)
VisItUnlockPythonInterpreter(myThreadState); VisItUnlockPythonInterpreter(myThreadState);
PyGILState_STATE state = PyGILState_Ensure(); PyGILState_STATE state = PyGILState_Ensure();
if(PyOS_ReadlineFunctionPointer || _PyOS_ReadlineTState)
{
PyOS_Readline(0,0,0);
PyOS_ReadlineFunctionPointer = NULL;
PyThreadState_Delete(_PyOS_ReadlineTState);
}
PyRun_SimpleString("import sys; sys.exit(0)"); PyRun_SimpleString("import sys; sys.exit(0)");
PyGILState_Release(state); PyGILState_Release(state);
} }
...@@ -18551,7 +18545,6 @@ static void * ...@@ -18551,7 +18545,6 @@ static void *
visit_eventloop(void *) visit_eventloop(void *)
#endif #endif
{ {
bool viewerQuit = false;
// This is the event loop for the messaging thread. If it needs to read // This is the event loop for the messaging thread. If it needs to read
// input from the viewer, it does so and executes the Notify method of // input from the viewer, it does so and executes the Notify method of
// all subjects that changed. // all subjects that changed.
...@@ -18583,7 +18576,6 @@ visit_eventloop(void *) ...@@ -18583,7 +18576,6 @@ visit_eventloop(void *)
// Indicate that there is no viewer. // Indicate that there is no viewer.
// //
noViewer = true; noViewer = true;
viewerQuit = true;
#ifndef POLLING_SYNCHRONIZE #ifndef POLLING_SYNCHRONIZE
SYNC_WAKE_MAIN_THREAD(); SYNC_WAKE_MAIN_THREAD();
...@@ -18599,20 +18591,6 @@ visit_eventloop(void *) ...@@ -18599,20 +18591,6 @@ visit_eventloop(void *)
viewerBlockingRead = false; viewerBlockingRead = false;
/// HKTODO: should the python client quit if the viewer is killed?
if(viewerQuit)
{
PyGILState_STATE state = PyGILState_Ensure();
if(PyOS_ReadlineFunctionPointer || _PyOS_ReadlineTState)
{
PyOS_Readline(0,0,0);
PyOS_ReadlineFunctionPointer = NULL;
PyThreadState_Delete(_PyOS_ReadlineTState);
}
PyRun_SimpleString("import sys; sys.exit(0)");
PyGILState_Release(state);
}
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment