cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwFlowNet.h/cpp:

Browse Source 
1. Network create now takes a 'preset_label'.
2. The preset is applied to each proc after the 'arg:{}' statement is processed.
3. The preset is applied again at the completion of the network instantiation.
This commit is contained in:
kevin 2024-09-20 18:11:30 -04:00
parent bc98a92f0a
commit 9038b2b6eb
2 changed files with 124 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
cwFlowNet.cpp
View File

@ -1769,7 +1769,43 @@ namespace cw
return rc; return rc;
} }
rc_t _process_net_preset(proc_t* proc, const object_t* net_preset_cfgD)
{
rc_t rc = kOkRC;
const object_t* proc_preset_cfg;
// if no network preset dict exists or if this proc. is not mentioned in it then there is nothing to do
if( net_preset_cfgD==nullptr || (proc_preset_cfg=net_preset_cfgD->find_child(proc->label)) == nullptr )
return rc;
switch( proc_preset_cfg->type_id() )
{
case kDictTId:
if((rc = _process_args_stmt(proc,proc_preset_cfg)) != kOkRC )
goto errLabel;
break;
case kListTId:
case kStringTId:
if((rc = _class_apply_presets(proc,proc_preset_cfg)) != kOkRC )
goto errLabel;
break;
default:
rc = cwLogError(kInvalidStateRC,"A network preset must be either a dictionary, list or string.");
goto errLabel;
break;
}
errLabel:
if(rc != kOkRC )
rc = cwLogError(rc,"Network preset application failed for proc instance:%s.",cwStringNullGuard(proc->label));
return rc;
}
void _pstate_destroy( proc_inst_parse_state_t pstate ) void _pstate_destroy( proc_inst_parse_state_t pstate )
{ {
@ -1795,12 +1831,14 @@ namespace cw
unsigned sfx_id, unsigned sfx_id,
network_t& net, network_t& net,
variable_t* proxyVarL, variable_t* proxyVarL,
const object_t* net_preset_cfgD,
proc_t*& proc_ref ) proc_t*& proc_ref )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
proc_inst_parse_state_t pstate = {}; proc_inst_parse_state_t pstate = {};
proc_t* proc = nullptr; proc_t* proc = nullptr;
class_desc_t* class_desc = nullptr; class_desc_t* class_desc = nullptr;
const object_t* proc_preset_cfg = nullptr;
proc_ref = nullptr; proc_ref = nullptr;
@ -1830,7 +1868,6 @@ namespace cw
proc->label = mem::duplStr(pstate.proc_label); proc->label = mem::duplStr(pstate.proc_label);
proc->label_sfx_id = pstate.proc_label_sfx_id; proc->label_sfx_id = pstate.proc_label_sfx_id;
proc->proc_cfg = proc_inst_cfg->pair_value(); proc->proc_cfg = proc_inst_cfg->pair_value();
proc->arg_cfg = pstate.arg_cfg;
proc->class_desc = class_desc; proc->class_desc = class_desc;
proc->net = &net; proc->net = &net;
@ -1875,9 +1912,13 @@ namespace cw
{ {
if((rc = _process_args_stmt(proc,pstate.arg_cfg)) != kOkRC ) if((rc = _process_args_stmt(proc,pstate.arg_cfg)) != kOkRC )
goto errLabel; goto errLabel;
}
//if((rc = _preset_channelize_vars( proc, "proc instance", "args", pstate.arg_cfg )) != kOkRC )
//goto errLabel; // If the the network preset holds a preset for this proc
if( net_preset_cfgD!=nullptr && (proc_preset_cfg=net_preset_cfgD->find_child(proc->label)) != nullptr )
{
if((rc = _process_net_preset(proc,net_preset_cfgD)) != kOkRC )
goto errLabel;
} }
// All the proc instance arg values have now been set and those variables // All the proc instance arg values have now been set and those variables
@ -2505,9 +2546,9 @@ namespace cw
errLabel: errLabel:
return rc; return rc;
} }
rc_t _network_preset_parse_dict( flow_t* p, network_t& net, const object_t* preset_cfg )
rc_t _network_preset_parse_top_level_dict( flow_t* p, network_t& net, const object_t* preset_cfg )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
unsigned presetAllocN = 0; unsigned presetAllocN = 0;
@ -2574,6 +2615,46 @@ namespace cw
return rc; return rc;
} }
// Given a network preset label return the dictionary of proc presets that is associated with it.
rc_t _get_network_preset_cfg( const object_t* presetsCfg, const char* preset_label, const object_t*& preset_ref )
{
rc_t rc = kOkRC;
preset_ref = nullptr;
if( preset_label == nullptr )
return rc;
if( presetsCfg == nullptr )
{
rc = cwLogError(kInvalidArgRC,"The network preset '%s' could not be found because there is no network 'presets' dictionary.",cwStringNullGuard(preset_label));
goto errLabel;
}
if((preset_ref = presetsCfg->find_child( preset_label)) == nullptr )
{
rc = cwLogError(kEleNotFoundRC,"The network preset '%s' was not found in the 'presets' dictionary.");
goto errLabel;
}
switch( preset_ref->type_id() )
{
case kDictTId: // this is a dictionary of proc presets
break;
case kListTId: // this is a 'dual' preset - skip it
preset_ref = nullptr;
break;
default:
rc = cwLogError(kSyntaxErrorRC,"Network presets must be either dictionaries or lists. Preset '%s' is neither.",cwStringNullGuard(preset_label));
preset_ref = nullptr;
}
errLabel:
return rc;
}
template<typename T0, typename T1 > template<typename T0, typename T1 >
rc_t _preset_set_var_from_dual_interp_1( variable_t* var, T0 v0, T1 v1, double coeff ) rc_t _preset_set_var_from_dual_interp_1( variable_t* var, T0 v0, T1 v1, double coeff )
@ -2891,11 +2972,13 @@ namespace cw
const object_t* networkCfg, const object_t* networkCfg,
unsigned sfx_id, unsigned sfx_id,
variable_t* proxyVarL, variable_t* proxyVarL,
const char* preset_label,
network_t*& net_ref ) network_t*& net_ref )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
unsigned procN = 0; unsigned procN = 0;
network_t* net = mem::allocZ<network_t>(); const object_t* netPresetCfg = nullptr;
network_t* net = mem::allocZ<network_t>();
// if the top level network has not been set then set it here. // if the top level network has not been set then set it here.
// (this is necessary so that proc's later in the exec order // (this is necessary so that proc's later in the exec order
@ -2915,7 +2998,14 @@ namespace cw
goto errLabel; goto errLabel;
} }
procN = net->procsCfg->child_count(); // locate the requested network preset cfg
if((rc = _get_network_preset_cfg(net->presetsCfg,preset_label,netPresetCfg)) != kOkRC )
{
rc = cwLogError(rc,"Network create failed because the network preset resolution failed.");
goto errLabel;
}
procN = net->procsCfg->child_count();
net->proc_array = mem::allocZ<proc_t*>(procN); net->proc_array = mem::allocZ<proc_t*>(procN);
// for each proc in the network // for each proc in the network
@ -2924,7 +3014,7 @@ namespace cw
const object_t* proc_cfg = net->procsCfg->child_ele(j); const object_t* proc_cfg = net->procsCfg->child_ele(j);
// create the proc inst instance // create the proc inst instance
if( (rc= _proc_create( p, proc_cfg, sfx_id, *net, proxyVarL, net->proc_array[j] ) ) != kOkRC ) if( (rc= _proc_create( p, proc_cfg, sfx_id, *net, proxyVarL, netPresetCfg, net->proc_array[j] ) ) != kOkRC )
{ {
rc = cwLogError(rc,"The processor instantiation at proc index %i failed.",j); rc = cwLogError(rc,"The processor instantiation at proc index %i failed.",j);
goto errLabel; goto errLabel;
@ -2936,8 +3026,9 @@ namespace cw
if((rc = _network_preset_pair_create_table(*net)) != kOkRC ) if((rc = _network_preset_pair_create_table(*net)) != kOkRC )
goto errLabel; goto errLabel;
_network_preset_parse_top_level_dict(p, *net, net->presetsCfg ); // parse the network presets but do not apply thme
_network_preset_parse_dict(p, *net, net->presetsCfg );
net_ref = net; net_ref = net;
errLabel: errLabel:
@ -2968,6 +3059,7 @@ cw::rc_t cw::flow::network_create( flow_t* p,
unsigned netCfgN, unsigned netCfgN,
variable_t* proxyVarL, variable_t* proxyVarL,
unsigned polyCnt, unsigned polyCnt,
const char* preset_label,
network_t*& net_ref ) network_t*& net_ref )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
@ -2989,9 +3081,10 @@ cw::rc_t cw::flow::network_create( flow_t* p,
// otherwise the sfx_id can be automatically generated. // otherwise the sfx_id can be automatically generated.
unsigned sfx_id = polyCnt>1 ? i : kInvalidId; unsigned sfx_id = polyCnt>1 ? i : kInvalidId;
const object_t* cfg = i < netCfgN ? netCfgA[i] : netCfgA[0]; const object_t* netCfg = i < netCfgN ? netCfgA[i] : netCfgA[0];
if((rc = _network_create(p, cfg, sfx_id, proxyVarL, net)) != kOkRC ) // create the network
if((rc = _network_create(p, netCfg, sfx_id, proxyVarL, preset_label, net)) != kOkRC )
{ {
rc = cwLogError(rc,"Network create failed on poly index %i.",i); rc = cwLogError(rc,"Network create failed on poly index %i.",i);
goto errLabel; goto errLabel;

15
cwFlowNet.h
View File

@ -5,12 +5,17 @@ namespace cw
{ {
namespace flow namespace flow
{ {
// Instantiate a network.
// The root network always is intantiated with a single cfg. record - because it is never a poly network.
// The only time netCfgN will be greater than 1 is when a heterogenous poly network is beging
// instantiated.
rc_t network_create( flow_t* p, rc_t network_create( flow_t* p,
const object_t* const * netCfgA, // subnetCfgA[subNetCfgN] per subnet cfg record const object_t* const * netCfgA, // netCfgA[netCfgN]
unsigned netCfgN, unsigned netCfgN, // count of cfg. records in netCfgN
variable_t* proxyVarL, // variable_t* proxyVarL, //
unsigned polyCnt, // Count of poly networks to create or 1 if the network is not poly unsigned polyCnt, // Count of poly subnets to create or 1 if the network is not poly
network_t*& net_ref const char* preset_label, // Optional top-level preset label
network_t*& net_ref // Returned network handle.
); );
rc_t network_destroy( network_t*& net ); rc_t network_destroy( network_t*& net );