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

Renamed a plugin hook in sumstats framework.

Browse source
This commit is contained in:
Seth Hall 2013-04-22 15:27:03 -04:00
parent 9574499382
commit 91362717da
9 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/base/frameworks/sumstats/main.bro
View file

@ -182,7 +182,7 @@ global thresholds_store: table[string, Key] of bool = table();
global data_added: function(ss: SumStat, key: Key, result: Result); global data_added: function(ss: SumStat, key: Key, result: Result);
# Prototype the hook point for plugins to do calculations. # Prototype the hook point for plugins to do calculations.
global add_to_reducer_hook: hook(r: Reducer, val: double, data: Observation, rv: ResultVal); global observe_hook: hook(r: Reducer, val: double, data: Observation, rv: ResultVal);
# Prototype the hook point for plugins to initialize any result values. # Prototype the hook point for plugins to initialize any result values.
global init_resultval_hook: hook(r: Reducer, rv: ResultVal); global init_resultval_hook: hook(r: Reducer, rv: ResultVal);
# Prototype the hook point for plugins to merge Results. # Prototype the hook point for plugins to merge Results.
@ -323,7 +323,7 @@ function observe(id: string, key: Key, obs: Observation)
if ( obs?$num || obs?$dbl ) if ( obs?$num || obs?$dbl )
val = obs?$dbl ? obs$dbl : obs$num; val = obs?$dbl ? obs$dbl : obs$num;
hook add_to_reducer_hook(r, val, obs, result_val); hook observe_hook(r, val, obs, result_val);
data_added(ss, key, result); data_added(ss, key, result);
} }
} }

2
scripts/base/frameworks/sumstats/plugins/average.bro
View file

@ -14,7 +14,7 @@ export {
}; };
} }
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{ {
if ( AVERAGE in r$apply ) if ( AVERAGE in r$apply )
{ {

2
scripts/base/frameworks/sumstats/plugins/max.bro
View file

@ -14,7 +14,7 @@ export {
}; };
} }
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{ {
if ( MAX in r$apply ) if ( MAX in r$apply )
{ {

2
scripts/base/frameworks/sumstats/plugins/min.bro
View file

@ -14,7 +14,7 @@ export {
}; };
} }
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{ {
if ( MIN in r$apply ) if ( MIN in r$apply )
{ {

2
scripts/base/frameworks/sumstats/plugins/sample.bro
View file

@ -29,7 +29,7 @@ function get_samples(rv: ResultVal): vector of Observation
return s; return s;
} }
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{ {
if ( r$samples > 0 ) if ( r$samples > 0 )
{ {

2
scripts/base/frameworks/sumstats/plugins/std-dev.bro
View file

@ -22,7 +22,7 @@ function calc_std_dev(rv: ResultVal)
} }
# This depends on the variance plugin which uses priority -5 # This depends on the variance plugin which uses priority -5
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) &priority=-10 hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) &priority=-10
{ {
if ( STD_DEV in r$apply ) if ( STD_DEV in r$apply )
calc_std_dev(rv); calc_std_dev(rv);

2
scripts/base/frameworks/sumstats/plugins/sum.bro
View file

@ -34,7 +34,7 @@ hook init_resultval_hook(r: Reducer, rv: ResultVal)
rv$sum = 0; rv$sum = 0;
} }
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{ {
if ( SUM in r$apply ) if ( SUM in r$apply )
rv$sum += val; rv$sum += val;

2
scripts/base/frameworks/sumstats/plugins/unique.bro
View file

@ -23,7 +23,7 @@ redef record ResultVal += {
unique_vals: set[Observation] &optional; unique_vals: set[Observation] &optional;
}; };
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{ {
if ( UNIQUE in r$apply ) if ( UNIQUE in r$apply )
{ {

2
scripts/base/frameworks/sumstats/plugins/variance.bro
View file

@ -29,7 +29,7 @@ function calc_variance(rv: ResultVal)
} }
# Reduced priority since this depends on the average # Reduced priority since this depends on the average
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) &priority=-5 hook observe_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) &priority=-5
{ {
if ( VARIANCE in r$apply ) if ( VARIANCE in r$apply )
{ {