mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 08:38:20 +00:00
move Value and Field from the logging namespace to the threading namespace, because other modules using threading will need them.
This commit is contained in:
parent
70fe7876a1
commit
a0487ecb30
15 changed files with 512 additions and 472 deletions
|
@ -55,7 +55,7 @@ public:
|
|||
*
|
||||
* @return False if an error occured.
|
||||
*/
|
||||
bool Init(string path, int num_fields, const Field* const* fields);
|
||||
bool Init(string path, int num_fields, const threading::Field* const* fields);
|
||||
|
||||
/**
|
||||
* Writes one log entry.
|
||||
|
@ -72,7 +72,7 @@ public:
|
|||
*
|
||||
* @return False if an error occured.
|
||||
*/
|
||||
bool Write(int num_fields, int num_writes, Value*** vals);
|
||||
bool Write(int num_fields, int num_writes, threading::Value*** vals);
|
||||
|
||||
/**
|
||||
* Sets the buffering status for the writer, assuming the writer
|
||||
|
@ -129,7 +129,7 @@ public:
|
|||
/**
|
||||
* Returns the log fields as passed into the constructor.
|
||||
*/
|
||||
const Field* const * Fields() const { return fields; }
|
||||
const threading::Field* const * Fields() const { return fields; }
|
||||
|
||||
/**
|
||||
* Returns the current buffering state.
|
||||
|
@ -170,7 +170,7 @@ protected:
|
|||
* implementation should also call Error() to indicate what happened.
|
||||
*/
|
||||
virtual bool DoInit(string path, int num_fields,
|
||||
const Field* const* fields) = 0;
|
||||
const threading::Field* const* fields) = 0;
|
||||
|
||||
/**
|
||||
* Writer-specific output method implementing recording of fone log
|
||||
|
@ -182,8 +182,8 @@ protected:
|
|||
* disabled and eventually deleted. When returning false, an
|
||||
* implementation should also call Error() to indicate what happened.
|
||||
*/
|
||||
virtual bool DoWrite(int num_fields, const Field* const* fields,
|
||||
Value** vals) = 0;
|
||||
virtual bool DoWrite(int num_fields, const threading::Field* const* fields,
|
||||
threading::Value** vals) = 0;
|
||||
|
||||
/**
|
||||
* Writer-specific method implementing a change of fthe buffering
|
||||
|
@ -287,7 +287,7 @@ private:
|
|||
/**
|
||||
* Deletes the values as passed into Write().
|
||||
*/
|
||||
void DeleteVals(int num_writes, Value*** vals);
|
||||
void DeleteVals(int num_writes, threading::Value*** vals);
|
||||
|
||||
// Frontend that instantiated us. This object must not be access from
|
||||
// this class, it's running in a different thread!
|
||||
|
@ -295,7 +295,7 @@ private:
|
|||
|
||||
string path; // Log path.
|
||||
int num_fields; // Number of log fields.
|
||||
const Field* const* fields; // Log fields.
|
||||
const threading::Field* const* fields; // Log fields.
|
||||
bool buffering; // True if buffering is enabled.
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue