If you are using GitLab outside of the ILL, then you will need to use HTTPS and not SSH for clone/push/pull operations. SSH will work normally if you are using the VPN.

Commit b140af43 authored by Tobias WEBER's avatar Tobias WEBER

more debugging

parent 5c473cf1
......@@ -302,7 +302,7 @@ static void child_proc(ipr::message_queue& msgToParent, ipr::message_queue& msgF
}
case ProcMsgTypes::QUIT:
{
//tl::log_debug("Exiting child process");
tl::log_debug("Exiting child process");
exit(0);
break;
}
......@@ -404,12 +404,14 @@ SqwProc<t_sqw>::~SqwProc()
if(--m_iRefCnt == 0)
{
tl::log_debug("Removing process memory \"", "takin_sqw_proc_*_", m_strProcName, "\".");
ipr::message_queue::remove(("takin_sqw_proc_in_" + m_strProcName).c_str());
ipr::message_queue::remove(("takin_sqw_proc_out_" + m_strProcName).c_str());
ipr::shared_memory_object::remove(("takin_sqw_proc_mem_" + m_strProcName).c_str());
ipr::message_queue::remove(("takin_sqw_proc_in_" + m_strProcName).c_str());
ipr::message_queue::remove(("takin_sqw_proc_out_" + m_strProcName).c_str());
m_pMem->destroy<t_sh_str>(("takin_sqw_proc_params_" + m_strProcName).c_str());
tl::log_debug("Removed process memory \"", "takin_sqw_proc_*_", m_strProcName, "\".");
}
}
catch(const std::exception& ex)
......
......@@ -369,6 +369,7 @@ std::tuple<std::string, std::string, std::string> sqw_info()
std::shared_ptr<SqwBase> sqw_construct(const std::string& strCfgFile)
{
//tl::log_info("In ", __func__, ".");
//return std::make_shared<SqwPy>(strCfgFile);
return std::make_shared<SqwProc<SqwPy>>(strCfgFile);
}
......
......@@ -9,16 +9,6 @@
#include "sqw.h"
#include "sqw_uniform_grid.h"
//#include "sqw_proc.h"
//#include "sqw_proc_impl.h"
/*#ifndef NO_PY
#include "sqw_py.h"
#endif*/
/*#ifdef USE_JL
#include "sqw_jl.h"
#endif*/
#include "tlibs/log/log.h"
#include "tlibs/file/file.h"
#include "libs/globals.h"
......@@ -67,19 +57,6 @@ static t_mapSqw g_mapSqw =
[](const std::string& strCfgFile) -> std::shared_ptr<SqwBase>
{ return std::make_shared<SqwMagnon>(strCfgFile.c_str()); },
"Simple Magnon Model" } },
/*#ifndef NO_PY
{ "py", t_mapSqw::mapped_type {
[](const std::string& strCfgFile) -> std::shared_ptr<SqwBase>
//{ return std::make_shared<SqwPy>(strCfgFile.c_str()); },
{ return std::make_shared<SqwProc<SqwPy>>(strCfgFile.c_str()); },
"Python Model" } },
#endif*/
/*#ifdef USE_JL
{ "jl", t_mapSqw::mapped_type {
[](const std::string& strCfgFile) -> std::shared_ptr<SqwBase>
{ return std::make_shared<SqwProc<SqwJl>>(strCfgFile.c_str()); },
"Julia Model" } },
#endif*/
{ "elastic", t_mapSqw::mapped_type {
[](const std::string& strCfgFile) -> std::shared_ptr<SqwBase>
{ return std::make_shared<SqwElast>(strCfgFile.c_str()); },
......@@ -187,8 +164,8 @@ void load_sqw_plugins()
{
// TODO: libjulia.so needs rtld_global, but cannot be used here as the takin_sqw_info functions are named the same in all so files...
std::shared_ptr<so::shared_library> pmod =
std::make_shared<so::shared_library>(strPlugin/*,
so::load_mode::rtld_lazy*/ /*| so::load_mode::rtld_global*/);
std::make_shared<so::shared_library>(strPlugin,
so::load_mode::rtld_lazy /*| so::load_mode::rtld_global*/);
if(!pmod) continue;
// import info function
......
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