Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

small fixes.

Browse source
This commit is contained in:
Bernhard Amann 2013-05-27 22:59:27 -07:00
parent d61973a92d
commit 08656c976b
4 changed files with 50 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/input/readers/Raw.cc
View file

@ -18,7 +18,7 @@ using namespace input::reader;
using threading::Value; using threading::Value;
using threading::Field; using threading::Field;
const int Raw::block_size = 512; // how big do we expect our chunks of data to be... const int Raw::block_size = 4096; // how big do we expect our chunks of data to be...
Raw::Raw(ReaderFrontend *frontend) : ReaderBackend(frontend) Raw::Raw(ReaderFrontend *frontend) : ReaderBackend(frontend)
@ -102,7 +102,6 @@ bool Raw::Execute()
dup2(pipes[stderr_out], stderr_fileno); dup2(pipes[stderr_out], stderr_fileno);
} }
//execv("/usr/bin/uname",test);
execl("/bin/sh", "sh", "-c", fname.c_str(), NULL); execl("/bin/sh", "sh", "-c", fname.c_str(), NULL);
fprintf(stderr, "Exec failed :(......\n"); fprintf(stderr, "Exec failed :(......\n");
exit(255); exit(255);
@ -294,7 +293,8 @@ bool Raw::DoInit(const ReaderInfo& info, int num_fields, const Field* const* fie
int64_t Raw::GetLine(FILE* arg_file) int64_t Raw::GetLine(FILE* arg_file)
{ {
errno = 0; errno = 0;
int pos = 0; // strstr_n only works on ints - so no use to use something bigger here int pos = 0; // strstr_n only works on ints - so no use to use something different here
int offset = 0;
if ( buf == 0 ) if ( buf == 0 )
buf = new char[block_size]; buf = new char[block_size];
@ -303,9 +303,10 @@ int64_t Raw::GetLine(FILE* arg_file)
for (;;) for (;;)
{ {
size_t readbytes = fread(buf+bufpos, 1, block_size-bufpos, arg_file); size_t readbytes = fread(buf+bufpos+offset, 1, block_size-bufpos, arg_file);
pos += bufpos + readbytes; pos += bufpos + readbytes;
bufpos = 0; // read full block size in next read... //printf("Pos: %d\n", pos);
bufpos = offset = 0; // read full block size in next read...
if ( pos == 0 && errno != 0 ) if ( pos == 0 && errno != 0 )
break; break;
@ -336,6 +337,7 @@ int64_t Raw::GetLine(FILE* arg_file)
memcpy(newbuf, buf, block_size*(repeats-1)); memcpy(newbuf, buf, block_size*(repeats-1));
delete buf; delete buf;
buf = newbuf; buf = newbuf;
offset = block_size*(repeats-1);
} }
else else
{ {
@ -348,11 +350,11 @@ int64_t Raw::GetLine(FILE* arg_file)
{ {
// we have leftovers. copy them into the buffer for the next line // we have leftovers. copy them into the buffer for the next line
buf = new char[block_size]; buf = new char[block_size];
memcpy(buf, buf + found + sep_length, pos - found - sep_length); memcpy(buf, outbuf + found + sep_length, pos - found - sep_length);
bufpos = pos - found - sep_length; bufpos = pos - found - sep_length;
} }
return found; return found;
} }
} }
@ -511,7 +513,7 @@ bool Raw::DoUpdate()
// and let's check if the child process is still alive // and let's check if the child process is still alive
int return_code; int return_code;
if ( waitpid(childpid, &return_code, WNOHANG) != 0 ) { if ( childpid != -1 && waitpid(childpid, &return_code, WNOHANG) != 0 ) {
// child died :( // child died :(
bool signal = false; bool signal = false;
int code = 0; int code = 0;

2
src/input/readers/Raw.h
View file

@ -45,7 +45,7 @@ private:
unsigned int sep_length; // length of the separator unsigned int sep_length; // length of the separator
static const int block_size; static const int block_size;
uint64_t bufpos; int bufpos;
char* buf; char* buf;
char* outbuf; char* outbuf;

2
testing/btest/Baseline/scripts.base.frameworks.input.raw.long/out Normal file
View file

@ -0,0 +1,2 @@
Input::EVENT_NEW
8193

37
testing/btest/scripts/base/frameworks/input/raw/long.bro Normal file
View file

@ -0,0 +1,37 @@
# @TEST-EXEC: dd if=/dev/zero of=input.log bs=8193 count=1
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out
#
# this test should be longer than one block-size. to test behavior of input-reader if it has to re-allocate stuff.
redef exit_only_after_terminate = T;
global outfile: file;
global try: count;
module A;
type Val: record {
s: string;
};
event line(description: Input::EventDescription, tpe: Input::Event, s: string)
{
print outfile, tpe;
print outfile, |s|;
try = try + 1;
if ( try == 1 )
{
close(outfile);
terminate();
}
}
event bro_init()
{
try = 0;
outfile = open("../out");
Input::add_event([$source="../input.log", $reader=Input::READER_RAW, $mode=Input::STREAM, $name="input", $fields=Val, $ev=line, $want_record=F]);
Input::remove("input");
}