#include <assert.h>
#include <stdlib.h>
-#include <zlib.h>
-
+#include "trace_file.hpp"
#include "trace_parser.hpp"
Parser::Parser() {
- file = NULL;
+ file = new Trace::ZLibFile;
next_call_no = 0;
version = 0;
}
Parser::~Parser() {
close();
+ delete file;
}
bool Parser::open(const char *filename) {
- file = gzopen(filename, "rb");
- if (!file) {
+ if (!file->open(filename, File::Read)) {
return false;
}
}
void Parser::close(void) {
- if (file) {
- gzclose(file);
- file = NULL;
- }
+ file->close();
deleteAll(calls);
deleteAll(functions);
FunctionSig *sig = lookup(functions, id);
if (!sig) {
sig = new FunctionSig;
+ sig->id = id;
sig->name = read_string();
sig->num_args = read_uint();
const char **arg_names = new const char *[sig->num_args];
Value *Parser::parse_float() {
float value;
- gzread(file, &value, sizeof value);
+ file->read(&value, sizeof value);
return new Float(value);
}
Value *Parser::parse_double() {
double value;
- gzread(file, &value, sizeof value);
+ file->read(&value, sizeof value);
return new Float(value);
}
size_t id = read_uint();
BitmaskSig *sig = lookup(bitmasks, id);
if (!sig) {
- size_t count = read_uint();
- BitmaskVal *values = new BitmaskVal[count];
- for (BitmaskVal *it = values; it != values + count; ++it) {
+ sig = new BitmaskSig;
+ sig->id = id;
+ sig->num_flags = read_uint();
+ BitmaskFlag *flags = new BitmaskFlag[sig->num_flags];
+ for (BitmaskFlag *it = flags; it != flags + sig->num_flags; ++it) {
it->name = read_string();
it->value = read_uint();
- if (it->value == 0 && it != values) {
+ if (it->value == 0 && it != flags) {
std::cerr << "warning: bitmask " << it->name << " is zero but is not first flag\n";
}
}
- sig = new BitmaskSig;
- sig->id = id;
- sig->count = count;
- sig->values = values;
+ sig->flags = flags;
bitmasks[id] = sig;
}
assert(sig);
size_t size = read_uint();
Blob *blob = new Blob(size);
if (size) {
- gzread(file, blob->buf, (unsigned)size);
+ file->read(blob->buf, (unsigned)size);
}
return blob;
}
size_t len = read_uint();
char * value = new char[len + 1];
if (len) {
- gzread(file, value, (unsigned)len);
+ file->read(value, (unsigned)len);
}
value[len] = 0;
#if TRACE_VERBOSE
int c;
unsigned shift = 0;
do {
- c = gzgetc(file);
+ c = file->getc();
if (c == -1) {
break;
}
inline int Parser::read_byte(void) {
- int c = gzgetc(file);
+ int c = file->getc();
#if TRACE_VERBOSE
if (c < 0)
std::cerr << "\tEOF" << "\n";