Skip to content

remove_log_entry_bin_for_thread #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anton98i wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remove_log_entry_bin_for_thread #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions src/dm_logger.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace DMLogger
public static const uint16 LOG_ENTRY_RECORD_TYPE_HINT = 5;
public static const uint16 LOG_ENTRY_RECORD_TYPE_FLUSH = 6;
public static const uint16 LOG_ENTRY_RECORD_TYPE_TID_ENTRY_BIN = 7;
public static const uint16 LOG_ENTRY_RECORD_TYPE_REMOVE_TID_ENTRY_BIN = 8;

public static const uint16 LOG_ENTRY_NONE = 0;
public static const uint16 LOG_ENTRY_DEBUG = 1;
Expand Down Expand Up @@ -261,6 +262,17 @@ namespace DMLogger
this.parameters = { };
}

/**
* Creates a new LogEntry with the record type @see DMLogger.LOG_ENTRY_RECORD_TYPE_REMOVE_TID_ENTRY_BIN.
* Is used to execute the method @see Logger.remove_log_entry_bin_for_thread in a thread-safe way.
*/
public LogEntry.remove_tid_entry_bin( )
{
this( 0, "", 0, LOG_ENTRY_NONE, 0, 0, false );
this.record_type = LOG_ENTRY_RECORD_TYPE_REMOVE_TID_ENTRY_BIN;
this.parameters = { };
}

/**
* Parses the given message and inserts the given parameters into it.
* @param _message The message to be parsed.
Expand Down Expand Up @@ -714,6 +726,25 @@ namespace DMLogger
}
}

/**
* Removes the Thread-ID of the tid_entry_bin hash table.
*
* @param tid the ID of the Thread
* @param thread_safe If the DMLogger was started threaded, this parameter states if the log entry bin creation
* should be done in a thread-safe way ( via the @see DMLogger.log_queue ) or immediately.
*/
public void remove_log_entry_bin_for_thread( uint64 tid, bool thread_safe = true )
{
if ( this.threaded && thread_safe )
{
DMLogger.log_queue.push( new LogEntry.remove_tid_entry_bin( ) );
}
else
{
DMLogger.log.tid_entry_bin.remove( OpenDMLib.gettid( ) );
}
}

/**
* This method can be used to set the FileStream which should be used when printing out messages.
* @param out_stream The new FileStream which should be used.
Expand Down Expand Up @@ -743,6 +774,12 @@ namespace DMLogger
continue;
}

if ( ( (!)e ).record_type == LOG_ENTRY_RECORD_TYPE_REMOVE_TID_ENTRY_BIN )
{
this.remove_log_entry_bin_for_thread( e.tid, false );
continue;
}

if ( ( (!)e ).record_type == LOG_ENTRY_RECORD_TYPE_FLUSH )
{
if ( this.tid_entry_bin != null && this.tid_entry_bin.get( e.tid ) != null )
Expand Down