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

Important Update:

Browse Source 
- LogCore:
  - Removed global DebugLevel var, now passed as parameter
  - Implemented binary output values
- FunctionCore, SelectCore and SelectableCore:
  - internal DebugLevel param implemented
  - new internal DisplayOutput param (Normal/Hex/Bin)
- BufferCore:
  - Bug fix: allow for empty search string/marker
This commit is contained in:
Charl Wentzel
2016-06-09 06:53:09 +02:00
parent 13b0a4736c
commit b418fa73e0
9 changed files with 115 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SelectCore.cpp
View File

@@ -23,7 +23,7 @@ extern char ProcessName[];
//---------------------------------------------------------------------------
// Create Select
CSelect::CSelect( long SelectTimeout )
CSelect::CSelect( long SelectTimeout, EDebugLevel pDebugLevel )
{
// Clear List
FirstHandle = NULL;
@@ -38,8 +38,11 @@ CSelect::CSelect( long SelectTimeout )
// Set Timeout
SetInterval( &Timeout, SelectTimeout );
// Output
DebugLevel = pDebugLevel;
// Show status
LogMessage( dlLow, "%s: Select - Created", ProcessName );
LogMessage( DebugLevel, dlLow, "%s: Select - Created", ProcessName );
}
//---------------------------------------------------------------------------
@@ -57,7 +60,7 @@ CSelect::~CSelect()
}
// Show status
LogMessage( dlLow, "%s: Select - Destroyed", ProcessName );
LogMessage( DebugLevel, dlLow, "%s: Select - Destroyed", ProcessName );
return;
}
//---------------------------------------------------------------------------
@@ -102,7 +105,7 @@ void CSelect::Add( int FD, bool Read, bool Write, CSelectableCore * Function )
FD_SET( FD, &ReadTestFDS );
// Log event
LogMessage( dlHigh, "Select: FD [%d] - Add Read", FD );
LogMessage( DebugLevel, dlHigh, "Select: FD [%d] - Add Read", FD );
}
// Add Write Select
@@ -111,7 +114,7 @@ void CSelect::Add( int FD, bool Read, bool Write, CSelectableCore * Function )
FD_SET( FD, &WriteTestFDS );
// Log event
LogMessage( dlHigh, "Select: FD [%d] - Add Write", FD );
LogMessage( DebugLevel, dlHigh, "Select: FD [%d] - Add Write", FD );
}
// Check Maximum File Handle
@@ -139,7 +142,7 @@ void CSelect::Remove( int FD, bool Read, bool Write )
FD_CLR( FD, &ReadTestFDS);
// Log event
LogMessage( dlHigh, "Select: FD [%d] - Remove Read", FD );
LogMessage( DebugLevel, dlHigh, "Select: FD [%d] - Remove Read", FD );
}
// Remove from set for select write check
@@ -148,7 +151,7 @@ void CSelect::Remove( int FD, bool Read, bool Write )
FD_CLR( FD, &WriteTestFDS);
// Log event
LogMessage( dlHigh, "Select: FD [%d] - Remove Write", FD );
LogMessage( DebugLevel, dlHigh, "Select: FD [%d] - Remove Write", FD );
}
// Handle will be removed in Test() if both Read & Write flags are false
}
@@ -170,7 +173,7 @@ bool CSelect::Test()
Events = select( MaxFD, &ReadFDS, &WriteFDS, (fd_set*)NULL, &STimeout );
if (Events < 0)
{
LogMessage( dlHigh, "Select: Select operation failed" );
LogMessage( DebugLevel, dlHigh, "Select: Select operation failed" );
return false;
}