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

Major update:

Browse Source 
- DataTreeCore:
  - Bug fix: GetMember() error if member not found
- FunctionCore: (affected: SelectableCore, FileCore, WatchdogCore)
  - Made destructor virual
  - Standardize method parameter naming, e.g. pName, pLog
  - Renamed parameters: DebugLevel -> LogLevel, OutputDisplay -> LogOutput
  - Reinstated parameter BaseMember
  - Removed logging parameters from constructor
  - Created method InitLoggging() (shows "Function Created" message)
  - Split LoadConfig() method into parts:
    - Implemented public LoadConfig() methods
    - Implemented LoadConfigData() method, load parameters from DataTree
- WatchdogCore:
  - Derive from CSelectableCore instead of CFunctionCore
  - Rename parameter: PingTimeout -> PingInterval
  - Replace Ping Channel with Handle only
  - Add method SetInterval()
  - Send command direct to handle with (channel) Input()
- SelectableCore:
  - Rename parameters: Auto -> AutoManage, ReopenTimeout -> ReopenDelay
  - Implemented own virtual LoadConfigData() method
- DeviceCore:
  - Made all logging conditional: if (Log) Log->Message(...)
- SelectCore:
  - Renamed parameters: DebugLevel -> LogLevel
This commit is contained in:
Charl Wentzel
2017-07-11 06:20:14 +02:00
parent b7ed169730
commit 3f86de71b1
12 changed files with 330 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SelectCore.cpp
View File

@@ -40,10 +40,10 @@ CSelect::CSelect( long SelectTimeout, CLogCore * pLog, EDebugLevel pDebugLevel )
// Output
Log = pLog;
DebugLevel = pDebugLevel;
LogLevel = pDebugLevel;
// Show status
if (Log) Log->Message( DebugLevel, dlLow, "%s: Select - Created", ProcessName );
if (Log) Log->Message( LogLevel, dlLow, "%s: Select - Created", ProcessName );
}
//---------------------------------------------------------------------------
@@ -61,14 +61,14 @@ CSelect::~CSelect()
}
// Show status
if (Log) Log->Message( DebugLevel, dlLow, "%s: Select - Destroyed", ProcessName );
if (Log) Log->Message( LogLevel, dlLow, "%s: Select - Destroyed", ProcessName );
return;
}
//---------------------------------------------------------------------------
bool CSelect::SetDebugLevel( EDebugLevel pDebugLevel )
{
DebugLevel = pDebugLevel;
LogLevel = pDebugLevel;
return true;
}
//---------------------------------------------------------------------------
@@ -113,7 +113,7 @@ void CSelect::Add( int FD, bool Read, bool Write, CSelectableCore * Function )
FD_SET( FD, &ReadTestFDS );
// Log event
if (Log) Log->Message( DebugLevel, dlHigh, "Select: FD [%d] - Add Read", FD );
if (Log) Log->Message( LogLevel, dlHigh, "Select: FD [%d] - Add Read", FD );
}
// Add Write Select
@@ -122,7 +122,7 @@ void CSelect::Add( int FD, bool Read, bool Write, CSelectableCore * Function )
FD_SET( FD, &WriteTestFDS );
// Log event
if (Log) Log->Message( DebugLevel, dlHigh, "Select: FD [%d] - Add Write", FD );
if (Log) Log->Message( LogLevel, dlHigh, "Select: FD [%d] - Add Write", FD );
}
// Check Maximum File Handle
@@ -150,7 +150,7 @@ void CSelect::Remove( int FD, bool Read, bool Write )
FD_CLR( FD, &ReadTestFDS);
// Log event
if (Log) Log->Message( DebugLevel, dlHigh, "Select: FD [%d] - Remove Read", FD );
if (Log) Log->Message( LogLevel, dlHigh, "Select: FD [%d] - Remove Read", FD );
}
// Remove from set for select write check
@@ -159,7 +159,7 @@ void CSelect::Remove( int FD, bool Read, bool Write )
FD_CLR( FD, &WriteTestFDS);
// Log event
if (Log) Log->Message( DebugLevel, dlHigh, "Select: FD [%d] - Remove Write", FD );
if (Log) Log->Message( LogLevel, dlHigh, "Select: FD [%d] - Remove Write", FD );
}
// Handle will be removed in Test() if both Read & Write flags are false
}
@@ -181,7 +181,7 @@ bool CSelect::Test()
Events = select( MaxFD, &ReadFDS, &WriteFDS, (fd_set*)NULL, &STimeout );
if (Events < 0)
{
if (Log) Log->Message( DebugLevel, dlHigh, "Select: Select operation failed" );
if (Log) Log->Message( LogLevel, dlHigh, "Select: Select operation failed" );
return false;
}