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

cwFlowTypes : Added var_disconnect()

Browse Source
This commit is contained in:
kevin 2024-05-10 15:52:37 -04:00
parent db73373cc0
commit af9d9bdc57
2 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cwFlowTypes.cpp
View File

@ -730,7 +730,7 @@ namespace cw
void _var_print( const variable_t* var ) void _var_print( const variable_t* var )
{ {
const char* conn_label = is_connected_to_source_proc(var) ? "extern" : " "; const char* conn_label = is_connected_to_source(var) ? "extern" : " ";
cwLogPrint(" %20s:%5i id:%4i ch:%3i : %s : ", var->label, var->label_sfx_id, var->vid, var->chIdx, conn_label ); cwLogPrint(" %20s:%5i id:%4i ch:%3i : %s : ", var->label, var->label_sfx_id, var->vid, var->chIdx, conn_label );
@ -880,7 +880,7 @@ namespace cw
rc_t rc; rc_t rc;
// if this variable is fed from the output of an external proc - then it's local value cannot be set // if this variable is fed from the output of an external proc - then it's local value cannot be set
if(is_connected_to_source_proc(var) ) if(is_connected_to_source(var) )
{ {
return cwLogError(kInvalidStateRC,"Cannot set the value on the connected variable %s:%i-%s:%i.",var->proc->label,var->proc->label_sfx_id,var->label,var->label_sfx_id); return cwLogError(kInvalidStateRC,"Cannot set the value on the connected variable %s:%i-%s:%i.",var->proc->label,var->proc->label_sfx_id,var->label,var->label_sfx_id);
} }
@ -1483,7 +1483,7 @@ cw::rc_t cw::flow::proc_validate( proc_t* proc )
} }
// if var is using a local value (not connected to a source variable) then the type of the value must be valid with the variable class // if var is using a local value (not connected to a source variable) then the type of the value must be valid with the variable class
if( !is_connected_to_source_proc(var) && !(var->varDesc->type & var->value->tflag) ) if( !is_connected_to_source(var) && !(var->varDesc->type & var->value->tflag) )
{ {
rc = cwLogError(kInvalidStateRC, "The value type flag '%s' (0x%x) of '%s:%i-%s:%i' is not found in the variable class type flags: '%s' (0x%x)", rc = cwLogError(kInvalidStateRC, "The value type flag '%s' (0x%x) of '%s:%i-%s:%i' is not found in the variable class type flags: '%s' (0x%x)",
_typeFlagToLabel(var->value->tflag),var->value->tflag, _typeFlagToLabel(var->value->tflag),var->value->tflag,
@ -1633,7 +1633,7 @@ cw::rc_t cw::flow::var_channelize( proc_t* proc, const char* var_label, unsigne
if( value_cfg == nullptr ) if( value_cfg == nullptr )
{ {
// if the base-var is connected to a source ... // if the base-var is connected to a source ...
if( is_connected_to_source_proc(base_var) ) if( is_connected_to_source(base_var) )
{ {
// ... then connect the new var to a source also // ... then connect the new var to a source also
@ -1860,8 +1860,6 @@ cw::rc_t cw::flow::var_find( proc_t* proc, unsigned vid, unsigned chIdx, variabl
return rc; return rc;
} }
cw::rc_t cw::flow::var_find( proc_t* proc, const char* label, unsigned sfx_id, unsigned chIdx, variable_t*& vRef ) cw::rc_t cw::flow::var_find( proc_t* proc, const char* label, unsigned sfx_id, unsigned chIdx, variable_t*& vRef )
{ {
variable_t* var; variable_t* var;
@ -1956,7 +1954,7 @@ cw::rc_t cw::flow::var_register( proc_t* proc, const char* var_label, unsigned s
return rc; return rc;
} }
bool cw::flow::is_connected_to_source_proc( const variable_t* var ) bool cw::flow::is_connected_to_source( const variable_t* var )
{ {
// if this var does not have a 'src_ptr' then it can't be connected to an external proc // if this var does not have a 'src_ptr' then it can't be connected to an external proc
if( var->src_var == nullptr || var->value == nullptr ) if( var->src_var == nullptr || var->value == nullptr )
@ -1988,19 +1986,34 @@ void cw::flow::var_connect( variable_t* src_var, variable_t* in_var )
in_var->value = src_var->value; in_var->value = src_var->value;
in_var->src_var = src_var; in_var->src_var = src_var;
}
//printf("Connect: "); void cw::flow::var_disconnect( variable_t* in_var )
//_var_print_addr("src",src_var); {
//_var_print_addr("dst",in_var); if( in_var->src_var != nullptr )
//_var_print_addr("HEAD",src_var->dst_head); {
// remote the in_var from the src var's output list
variable_t* v0 = nullptr;
variable_t* v = in_var->src_var->dst_head;
for(; v!=nullptr; v=v->dst_link)
{
if( v == in_var )
{
if( v0 == nullptr )
in_var->src_var->dst_head = v->dst_link;
else
v0->dst_link = v->dst_link;
break;
}
//if( src_var->dst_head->dst_link != nullptr ) v0 = v;
// _var_print_addr("LINK",src_var->dst_head->dst_link); }
//_var_print_addr("TAIL",src_var->dst_tail);
//printf("\n");
// the in_var is always in the src-var's output list
assert(v == in_var );
in_var->src_var = nullptr;
}
} }
unsigned cw::flow::var_mult_count( proc_t* proc, const char* var_label ) unsigned cw::flow::var_mult_count( proc_t* proc, const char* var_label )

8
cwFlowTypes.h
View File

@ -409,8 +409,8 @@ namespace cw
// `value_cfg` is optional. Set it to NULL to ignore // `value_cfg` is optional. Set it to NULL to ignore
rc_t var_register( proc_t* proc, const char* var_label, unsigned sfx_id, unsigned vid, unsigned chIdx, const object_t* value_cfg, variable_t*& varRef ); rc_t var_register( proc_t* proc, const char* var_label, unsigned sfx_id, unsigned vid, unsigned chIdx, const object_t* value_cfg, variable_t*& varRef );
// Returns true if this var is connected to an source proc variable // Returns true if this var is connected to a source proc variable
bool is_connected_to_source_proc( const variable_t* var ); bool is_connected_to_source( const variable_t* var );
// Return true if this var is acting as a source for another var. // Return true if this var is acting as a source for another var.
bool is_a_source_var( const variable_t* var ); bool is_a_source_var( const variable_t* var );
@ -418,6 +418,10 @@ namespace cw
// Connect in_var to src_var. // Connect in_var to src_var.
void var_connect( variable_t* src_var, variable_t* in_var ); void var_connect( variable_t* src_var, variable_t* in_var );
// Disconnect an in_var from it's source
void var_disconnect( variable_t* in_var );
// Get the count of 'mult' vars associated with this var label. // Get the count of 'mult' vars associated with this var label.
unsigned var_mult_count( proc_t* proc, const char* var_label ); unsigned var_mult_count( proc_t* proc, const char* var_label );