Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Changed: #1440 Some debugging and info display

Browse Source 
--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 13 years ago
parent 9e39a5ffef
commit 4d47d78eae
10 changed files with 137 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
code/nel/tools/pipeline/service/example_cfg/pipeline_service_default.cfg
Unescape Escape View File

@ -61,7 +61,7 @@ DisplayedVariables =
{
"Status|pipelineServiceState", "FileQueue|asyncFileQueueCount",
"", "InfoFlags|infoFlags",
"", "@Reload Sheets|reloadSheets", "@Busy Test|busyTestState" ,
"", "@Reload Sheets|reloadSheets", "@Busy Test|busyTestState" , "@Plug Slave|slave.plug gw", "@Unplug Slave|slave.unplug gw",
};
DontUseAES = 1;

2
code/nel/tools/pipeline/service/example_cfg/pipeline_service_master.cfg
Unescape Escape View File

@ -23,5 +23,5 @@ StartCommands +=
DisplayedVariables +=
{
"", "@Master Reload Sheets|master.reloadSheets", "@Status Update All|updateDatabaseStatus",
"", "@Build|master.build", "@Verify|master.build --verifyOnly", "@Abort|master.abort", "@Master Reload Sheets|master.reloadSheets", "@Status Update All|updateDatabaseStatus", "@Plug Master|master.plug gw", "@Unplug Master|master.unplug gw",
};

65
code/nel/tools/pipeline/service/module_pipeline_master.cpp
Unescape Escape View File

@ -41,6 +41,7 @@
#include "pipeline_service.h"
#include "database_status.h"
#include "build_task_queue.h"
#include "pipeline_workspace.h"
using namespace std;
using namespace NLMISC;
@ -126,6 +127,9 @@ public:
virtual ~CModulePipelineMaster()
{
if (m_BuildWorking)
this->abort();
g_IsMaster = false;
m_SlavesMutex.lock();
@ -158,6 +162,8 @@ public:
m_Slaves[moduleProxy] = slave;
m_SlavesMutex.unlock();
slave->Proxy.submitToMaster(this);
}
}
@ -222,6 +228,13 @@ public:
it->second->ActiveTaskId = taskInfo->Id.Global;
it->second->Proxy.startBuildTask(this, taskInfo->ProjectName, taskInfo->ProcessPluginId);
// the slave may either reject; or not answer until it's finished with this task
// Display information to user terminals
{
// TODO_TERMINAL_SYNC
CProcessPluginInfo pluginInfo;
g_PipelineWorkspace->getProcessPlugin(pluginInfo, taskInfo->ProcessPluginId);
nlinfo("Dispatching task '%i' ('%s': '%s') to slave '%s'", taskInfo->Id.Global, taskInfo->ProjectName.c_str(), pluginInfo.Handler.c_str(), it->second->Proxy.getModuleProxy()->getModuleName().c_str());
}
}
}
}
@ -243,7 +256,7 @@ public:
}
m_SlavesMutex.unlock();
PIPELINE::endedBuildReady();
PIPELINE::endedBuildReadyMaster();
}
}
}
@ -262,7 +275,10 @@ public:
virtual void slaveRefusedBuildTask(NLNET::IModuleProxy *sender)
{
// TODO
//m_SlavesMutex.lock();
CSlave *slave = m_Slaves[sender];
if (slave == NULL) { nlerror("Received 'slaveRefusedBuildTask' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; }
//m_SlavesMutex.unlock();
m_BuildTaskQueue.rejectedTask(slave->ActiveTaskId);
slave->ActiveTaskId = 0;
--slave->SaneBehaviour;
@ -272,20 +288,29 @@ public:
virtual void slaveReloadedSheets(NLNET::IModuleProxy *sender)
{
//m_SlavesMutex.lock();
CSlave *slave = m_Slaves[sender];
if (slave == NULL) { nlerror("Received 'slaveReloadedSheets' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; }
//m_SlavesMutex.unlock();
slave->SheetsOk = true;
CInfoFlags::getInstance()->removeFlag(PIPELINE_INFO_MASTER_RELOAD_SHEETS);
}
virtual void slaveBuildReadySuccess(NLNET::IModuleProxy *sender)
{
//m_SlavesMutex.lock();
CSlave *slave = m_Slaves[sender];
if (slave == NULL) { nlerror("Received 'slaveBuildReadySuccess' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; }
//m_SlavesMutex.unlock();
slave->BuildReadyState = 2;
}
virtual void slaveBuildReadyFail(NLNET::IModuleProxy *sender)
{
//m_SlavesMutex.lock();
CSlave *slave = m_Slaves[sender];
if (slave == NULL) { nlerror("Received 'slaveBuildReadyFail' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; }
//m_SlavesMutex.unlock();
slave->BuildReadyState = 0;
--slave->SaneBehaviour;
CInfoFlags::getInstance()->addFlag(PIPELINE_INFO_SLAVE_REJECTED);
@ -293,13 +318,19 @@ public:
virtual void vectorPushString(NLNET::IModuleProxy *sender, const std::string &str)
{
//m_SlavesMutex.lock();
CSlave *slave = m_Slaves[sender];
if (slave == NULL) { nlerror("Received 'vectorPushString' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; }
//m_SlavesMutex.unlock();
slave->Vector.push_back(str);
}
virtual void updateDatabaseStatusByVector(NLNET::IModuleProxy *sender)
{
//m_SlavesMutex.lock();
CSlave *slave = m_Slaves[sender];
if (slave == NULL) { nlerror("Received 'updateDatabaseStatusByVector' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; }
//m_SlavesMutex.unlock();
CInfoFlags::getInstance()->addFlag(PIPELINE_INFO_MASTER_UPDATE_DATABASE_FOR_SLAVE);
bool ok = true;
@ -325,13 +356,16 @@ public:
void setAvailablePlugins(NLNET::IModuleProxy *sender, const std::vector<uint32> &pluginsAvailable)
{
//m_SlavesMutex.lock();
CSlave *slave = m_Slaves[sender];
if (slave == NULL) { nlerror("Received 'setAvailablePlugins' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; }
//m_SlavesMutex.unlock();
slave->PluginsAvailable = pluginsAvailable;
}
bool build(bool bypassEros, bool verifyOnly)
{
if (PIPELINE::tryBuildReady())
if (PIPELINE::tryBuildReadyMaster())
{
m_BuildWorking = true;
m_BypassErrors = bypassEros;
@ -344,6 +378,8 @@ public:
}
bool abort()
{
if (m_BuildWorking)
{
m_BuildTaskQueue.abortQueue();
@ -358,6 +394,11 @@ public:
return true;
}
else
{
return false;
}
}
protected:
NLMISC_COMMAND_HANDLER_TABLE_EXTEND_BEGIN(CModulePipelineMaster, CModuleBase)
@ -429,14 +470,30 @@ protected:
}
else
{
return build(bypassErrors, verifyOnly);
if (build(bypassErrors, verifyOnly))
{
return true;
}
else
{
log.displayNL("Bad command usage");
return false;
}
}
}
NLMISC_CLASS_COMMAND_DECL(abort)
{
if (args.size() != 0) return false;
return this->abort();
if (this->abort())
{
return true;
}
else
{
log.displayNL("Bad command usage");
return false;
}
}
}; /* class CModulePipelineMaster */

31
code/nel/tools/pipeline/service/module_pipeline_slave.cpp
Unescape Escape View File

@ -70,16 +70,20 @@ public:
CModulePipelineMasterProxy *m_Master;
bool m_TestCommand;
TRequestState m_ReloadSheetsState;
bool m_BuildReadyState;
public:
CModulePipelineSlave() : m_Master(NULL), m_TestCommand(false), m_ReloadSheetsState(REQUEST_NONE)
CModulePipelineSlave() : m_Master(NULL), m_TestCommand(false), m_ReloadSheetsState(REQUEST_NONE), m_BuildReadyState(false)
{
}
virtual ~CModulePipelineSlave()
{
// TODO: IF MASTER STILL CONNECTED, NOTIFY INSANITY
// TODO: ABORT RUNNING BUILD PROCESS
abortBuildTask(NULL);
leaveBuildReadyState(NULL);
}
virtual bool initModule(const TParsedCommandLine &initInfo)
@ -98,10 +102,14 @@ public:
nlassert(m_Master == NULL);
m_Master = new CModulePipelineMasterProxy(moduleProxy);
}
}
virtual void submitToMaster(NLNET::IModuleProxy *sender)
{
// TODO: AUTHENTICATE OR GATEWAY SECURITY?
sendMasterAvailablePlugins();
}
CModulePipelineMasterProxy master(sender);
sendMasterAvailablePlugins(&master);
}
virtual void onModuleDown(IModuleProxy *moduleProxy)
@ -113,6 +121,8 @@ public:
nlassert(m_Master->getModuleProxy() == moduleProxy);
// TODO: ABORT RUNNING BUILD PROCESS
abortBuildTask(NULL);
leaveBuildReadyState(NULL); // leave state if building
delete m_Master;
m_Master = NULL;
@ -133,7 +143,7 @@ public:
if (PIPELINE::isServiceStateIdle())
{
m_ReloadSheetsState = REQUEST_NONE;
sendMasterAvailablePlugins();
sendMasterAvailablePlugins(m_Master);
m_Master->slaveReloadedSheets(this);
CInfoFlags::getInstance()->removeFlag(PIPELINE_INFO_SLAVE_RELOAD_SHEETS);
}
@ -175,8 +185,9 @@ public:
virtual void enterBuildReadyState(NLNET::IModuleProxy *sender)
{
if (PIPELINE::tryBuildReady())
if (!m_BuildReadyState && PIPELINE::tryBuildReady())
{
m_BuildReadyState = true;
m_Master->slaveBuildReadySuccess(this);
}
else
@ -187,14 +198,18 @@ public:
virtual void leaveBuildReadyState(NLNET::IModuleProxy *sender)
{
if (m_BuildReadyState)
{
m_BuildReadyState = false;
PIPELINE::endedBuildReady();
}
}
void sendMasterAvailablePlugins()
void sendMasterAvailablePlugins(CModulePipelineMasterProxy *master)
{
std::vector<uint32> availablePlugins;
g_PipelineWorkspace->listAvailablePlugins(availablePlugins);
m_Master->setAvailablePlugins(this, availablePlugins);
master->setAvailablePlugins(this, availablePlugins);
}
protected:

BIN
code/nel/tools/pipeline/service/module_pipeline_slave_itf.cpp
View File

Binary file not shown.

BIN
code/nel/tools/pipeline/service/module_pipeline_slave_itf.h
View File

Binary file not shown.

4
code/nel/tools/pipeline/service/module_pipeline_slave_itf.xml
Unescape Escape View File

@ -4,6 +4,10 @@
<module_interface name="CModulePipelineSlave">
<method name="submitToMaster" msg="M_HELLO">
<doc line=""/>
</method>
<method name="startBuildTask" msg="GO_BT">
<doc line=""/>

34
code/nel/tools/pipeline/service/pipeline_service.cpp
Unescape Escape View File

@ -261,6 +261,36 @@ void endedDirectTask()
endedRunnableTask(STATE_DIRECT_CODE);
}
bool tryBuildReadyMaster()
{
bool result = false;
s_StateMutex.enter();
result = (s_State == STATE_IDLE);
if (result)
{
s_State = STATE_BUILD_READY;
++s_BuildReadyRecursive;
}
s_StateMutex.leave();
if (!result) return false;
nlassert((s_State == STATE_BUILD_READY) && (s_BuildReadyRecursive > 0));
return true;
}
void endedBuildReadyMaster()
{
nlassert((s_State == STATE_BUILD_READY) && (s_BuildReadyRecursive > 0));
s_StateMutex.enter();
--s_BuildReadyRecursive;
s_State = STATE_IDLE;
s_StateMutex.leave();
nlassert(s_BuildReadyRecursive == 0);
}
bool tryBuildReady()
{
bool result = false;
@ -275,14 +305,14 @@ bool tryBuildReady()
s_StateMutex.leave();
if (!result) return false;
nlassert(s_State == STATE_BUILD_READY && s_BuildReadyRecursive > 0);
nlassert((s_State == STATE_BUILD_READY) && (s_BuildReadyRecursive > 0));
return true;
}
void endedBuildReady()
{
nlassert(s_State == STATE_BUILD_READY && s_BuildReadyRecursive > 0);
nlassert((s_State == STATE_BUILD_READY) && (s_BuildReadyRecursive > 0));
s_StateMutex.enter();
--s_BuildReadyRecursive;

3
code/nel/tools/pipeline/service/pipeline_service.h
Unescape Escape View File

@ -76,6 +76,9 @@ void endedDirectTask();
bool tryBuildReady();
void endedBuildReady();
bool tryBuildReadyMaster();
void endedBuildReadyMaster();
bool tryBuildProcess(const std::string &stateName);
void endedBuildProcess();

4
code/ryzom/common/data_leveldesign/leveldesign/pipeline/plugin_nel.pipeline_plugin
Unescape Escape View File

@ -12,9 +12,7 @@
<STRUCT>
<ATOM Name="Description" Value="Builds interface textures"/>
<ATOM Name="Process" Value="Interface"/>
<ARRAY Name="ProcessDependencies">
<ATOM Value="Dummy"/>
</ARRAY>
<ATOM Name="HandlerType" Value="RegisteredClass"/>
<ATOM Name="Handler" Value="CProcessInterface"/>
<ATOM Name="Info" Value="CProcessInterfaceInfo"/>

Write Preview
Loading…
Cancel
Save