core/redAcore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Important Update:

Browse Source 
- FunctionCore:
  - Implement UnlinkChannel()
    - Avoid memory errors on application shutdown (state events)
    - Unlink channels before destroying in Function destructor
  - Bug fix: Linked Channels not added correctly
This commit is contained in:
Charl Wentzel
2019-06-17 12:43:12 +02:00
parent abf51d39a2
commit 794b7e5486
2 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
FunctionCore.cpp
View File

@@ -48,18 +48,15 @@ CFunctionCore::~CFunctionCore()
// Destroy Channels // Destroy Channels
while (FirstChannel) while (FirstChannel)
{ {
// Destroy Parameters
if (FirstChannel->Name) {
free( FirstChannel->Name );
free( FirstChannel->Ref );
}
// Destroy Linked Channels // Destroy Linked Channels
while (FirstChannel->FirstLink) { while (FirstChannel->FirstLink)
NextLinkedChannel = FirstChannel->FirstLink->Next; UnlinkChannel( FirstChannel->Name, FirstChannel->FirstLink->Function->Name, FirstChannel->FirstLink->Channel->Name );
delete FirstChannel->FirstLink;
FirstChannel->FirstLink = NextLinkedChannel; // Destroy Parameters
} if (FirstChannel->Name)
free( FirstChannel->Name );
if (FirstChannel->Ref)
free( FirstChannel->Ref );
// Destroy Channel // Destroy Channel
NextChannel = FirstChannel->Next; NextChannel = FirstChannel->Next;
@@ -280,7 +277,7 @@ bool CFunctionCore::LinkChannel( const char * ChannelName, const char * LinkFunc
// Check if linked Channel exists // Check if linked Channel exists
LinkedChannel = &(Channel->FirstLink); LinkedChannel = &(Channel->FirstLink);
while (*LinkedChannel && ((*LinkedChannel)->Channel == LinkChannel)) while (*LinkedChannel && ((*LinkedChannel)->Channel != LinkChannel))
LinkedChannel = &((*LinkedChannel)->Next); LinkedChannel = &((*LinkedChannel)->Next);
if (!*LinkedChannel) if (!*LinkedChannel)
*LinkedChannel = new TChannelLink; *LinkedChannel = new TChannelLink;
@@ -297,7 +294,7 @@ bool CFunctionCore::LinkChannel( const char * ChannelName, const char * LinkFunc
// Find Linked channel on remote function // Find Linked channel on remote function
LinkedChannel = &(LinkChannel->FirstLink); LinkedChannel = &(LinkChannel->FirstLink);
while (*LinkedChannel && ((*LinkedChannel)->Channel == Channel)) while (*LinkedChannel && ((*LinkedChannel)->Channel != Channel))
LinkedChannel = &((*LinkedChannel)->Next); LinkedChannel = &((*LinkedChannel)->Next);
if (!*LinkedChannel) if (!*LinkedChannel)
*LinkedChannel = new TChannelLink; *LinkedChannel = new TChannelLink;
@@ -315,6 +312,52 @@ bool CFunctionCore::LinkChannel( const char * ChannelName, const char * LinkFunc
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
bool CFunctionCore::UnlinkChannel( const char * ChannelName, const char * LinkFunctionName, const char * LinkChannelName )
{
TChannel * Channel = NULL;
CFunctionCore * LinkFunction = NULL;
TChannel * LinkChannel = NULL;
TChannelLink ** LinkedChannel = NULL;
TChannelLink * NextLinkedChannel = NULL;
// Check if Channels & Function exist
if (!(Channel = GetChannel( ChannelName )) ||
!(LinkFunction = Application->GetFunction( LinkFunctionName )) ||
!(LinkChannel = LinkFunction->GetChannel( LinkChannelName )) ) {
return false;
}
// Check if linked Channel exists
LinkedChannel = &(Channel->FirstLink);
while (*LinkedChannel && ((*LinkedChannel)->Channel != LinkChannel))
LinkedChannel = &((*LinkedChannel)->Next);
// Unlink channel
if (*LinkedChannel) {
if (Log) Log->Message( LogLevel, dlLow, "%s/%s: Forward Channel Unlinked - '%s'-x->'%s'",
ProcessName, Name, Channel->Ref, (*LinkedChannel)->Channel->Ref );
NextLinkedChannel = (*LinkedChannel)->Next;
delete *LinkedChannel;
*LinkedChannel = NextLinkedChannel;
}
// Find Linked channel on remote function
LinkedChannel = &(LinkChannel->FirstLink);
while (*LinkedChannel && ((*LinkedChannel)->Channel != Channel))
LinkedChannel = &((*LinkedChannel)->Next);
// Unlink channel
if (*LinkedChannel) {
if (Log) Log->Message( LogLevel, dlLow, "%s/%s: Reverse Channel Unlinked - '%s'-x->'%s'",
ProcessName, Name, LinkChannel->Ref, (*LinkedChannel)->Channel->Ref );
NextLinkedChannel = (*LinkedChannel)->Next;
delete *LinkedChannel;
*LinkedChannel = NextLinkedChannel;
}
return true;
}
//---------------------------------------------------------------------------
int CFunctionCore::Input( const char * ChannelName, const char * SourceRef, const char * Data, int Len ) int CFunctionCore::Input( const char * ChannelName, const char * SourceRef, const char * Data, int Len )
{ {
TChannel * Channel = NULL; TChannel * Channel = NULL;

1
FunctionCore.h
View File

@@ -130,6 +130,7 @@ public:
// Automated Data Input/Output // Automated Data Input/Output
virtual bool LinkChannel( const char * ChannelName, const char * LinkFunctionName, const char * LinkChannelName, bool Input, bool Output ); virtual bool LinkChannel( const char * ChannelName, const char * LinkFunctionName, const char * LinkChannelName, bool Input, bool Output );
virtual bool UnlinkChannel( const char * ChannelName, const char * LinkFunctionName, const char * LinkChannelName );
virtual bool Process() = 0; virtual bool Process() = 0;
friend class CApplication; friend class CApplication;