Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 19:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Tweaking DataSeries support.

Browse source
This commit is contained in:
Robin Sommer 2012-04-19 10:41:24 -07:00
parent 18aa41c62b
commit 4b70adcb4b
10 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/logging/writers/DataSeries.cc
View file

@ -194,6 +194,8 @@ std::string DataSeries::GetDSOptionsForType(const threading::Field *field)
if ( ! ds_use_integer_for_time )
s += " pack_scale=\"1000000\"";
else
s += string(" units=\"") + TIME_UNIT() + "\" epoch=\"unix\"";
return s;
}
@ -327,7 +329,13 @@ bool DataSeries::DoInit(string path, int num_fields, const threading::Field* con
else
Warning(Fmt("%s is not a valid compression type. Valid types are: 'lzf', 'lzo', 'gz', 'bz2', 'none', 'any'. Defaulting to 'any'", ds_compression.c_str()));
log_type = log_types.registerType(schema);
const ExtentType& type = log_types.registerTypeR(schema);
// Note: This is a bit dicey as it depends on the implementation of
// registerTypeR(), but its what the DataSeries guys recommended
// given that we function we originally used has been deprecated.
log_type = &type;
log_series.setType(*log_type);
return OpenLog(path);

1
src/logging/writers/DataSeries.h
View file

@ -43,6 +43,7 @@ private:
static const size_t THREAD_MIN = 1; // Minimum number of compression threads that DataSeries may spawn.
static const size_t THREAD_MAX = 128; // Maximum number of compression threads that DataSeries may spawn.
static const size_t TIME_SCALE = 1000000; // Fixed-point multiplier for time values when converted to integers.
const char* TIME_UNIT() { return "microseconds"; } // DS name for time resolution when converted to integers. Must match TIME_SCALE.
struct SchemaValue
{