#include "trace_format.hpp"
-namespace Trace {
+namespace trace {
Writer::Writer() :
}
}
-unsigned Writer::beginEnter(const FunctionSig *sig) {
- _writeByte(Trace::EVENT_ENTER);
+unsigned Writer::beginEnter(const FunctionSig *sig, unsigned thread_id) {
+ _writeByte(trace::EVENT_ENTER);
+ _writeUInt(thread_id);
_writeUInt(sig->id);
if (!lookup(functions, sig->id)) {
_writeString(sig->name);
}
void Writer::endEnter(void) {
- _writeByte(Trace::CALL_END);
+ _writeByte(trace::CALL_END);
}
void Writer::beginLeave(unsigned call) {
- _writeByte(Trace::EVENT_LEAVE);
+ _writeByte(trace::EVENT_LEAVE);
_writeUInt(call);
}
void Writer::endLeave(void) {
- _writeByte(Trace::CALL_END);
+ _writeByte(trace::CALL_END);
}
void Writer::beginArg(unsigned index) {
- _writeByte(Trace::CALL_ARG);
+ _writeByte(trace::CALL_ARG);
_writeUInt(index);
}
void Writer::beginReturn(void) {
- _writeByte(Trace::CALL_RET);
+ _writeByte(trace::CALL_RET);
}
void Writer::beginArray(size_t length) {
- _writeByte(Trace::TYPE_ARRAY);
+ _writeByte(trace::TYPE_ARRAY);
_writeUInt(length);
}
void Writer::beginStruct(const StructSig *sig) {
- _writeByte(Trace::TYPE_STRUCT);
+ _writeByte(trace::TYPE_STRUCT);
_writeUInt(sig->id);
if (!lookup(structs, sig->id)) {
_writeString(sig->name);
}
}
+void Writer::beginRepr(void) {
+ _writeByte(trace::TYPE_REPR);
+}
+
void Writer::writeBool(bool value) {
- _writeByte(value ? Trace::TYPE_TRUE : Trace::TYPE_FALSE);
+ _writeByte(value ? trace::TYPE_TRUE : trace::TYPE_FALSE);
}
void Writer::writeSInt(signed long long value) {
if (value < 0) {
- _writeByte(Trace::TYPE_SINT);
+ _writeByte(trace::TYPE_SINT);
_writeUInt(-value);
} else {
- _writeByte(Trace::TYPE_UINT);
+ _writeByte(trace::TYPE_UINT);
_writeUInt(value);
}
}
void Writer::writeUInt(unsigned long long value) {
- _writeByte(Trace::TYPE_UINT);
+ _writeByte(trace::TYPE_UINT);
_writeUInt(value);
}
void Writer::writeFloat(float value) {
- _writeByte(Trace::TYPE_FLOAT);
+ _writeByte(trace::TYPE_FLOAT);
_writeFloat(value);
}
void Writer::writeDouble(double value) {
- _writeByte(Trace::TYPE_DOUBLE);
+ _writeByte(trace::TYPE_DOUBLE);
_writeDouble(value);
}
Writer::writeNull();
return;
}
- _writeByte(Trace::TYPE_STRING);
+ _writeByte(trace::TYPE_STRING);
_writeString(str);
}
Writer::writeNull();
return;
}
- _writeByte(Trace::TYPE_STRING);
+ _writeByte(trace::TYPE_STRING);
_writeUInt(len);
_write(str, len);
}
Writer::writeNull();
return;
}
- _writeByte(Trace::TYPE_STRING);
+ _writeByte(trace::TYPE_STRING);
_writeString("<wide-string>");
}
Writer::writeNull();
return;
}
- _writeByte(Trace::TYPE_BLOB);
+ _writeByte(trace::TYPE_BLOB);
_writeUInt(size);
if (size) {
_write(data, size);
}
}
-void Writer::writeEnum(const EnumSig *sig) {
- _writeByte(Trace::TYPE_ENUM);
+void Writer::writeEnum(const EnumSig *sig, signed long long value) {
+ _writeByte(trace::TYPE_ENUM);
_writeUInt(sig->id);
if (!lookup(enums, sig->id)) {
- _writeString(sig->name);
- Writer::writeSInt(sig->value);
+ _writeUInt(sig->num_values);
+ for (unsigned i = 0; i < sig->num_values; ++i) {
+ _writeString(sig->values[i].name);
+ writeSInt(sig->values[i].value);
+ }
enums[sig->id] = true;
}
+ writeSInt(value);
}
void Writer::writeBitmask(const BitmaskSig *sig, unsigned long long value) {
- _writeByte(Trace::TYPE_BITMASK);
+ _writeByte(trace::TYPE_BITMASK);
_writeUInt(sig->id);
if (!lookup(bitmasks, sig->id)) {
_writeUInt(sig->num_flags);
for (unsigned i = 0; i < sig->num_flags; ++i) {
if (i != 0 && sig->flags[i].value == 0) {
- OS::DebugMessage("apitrace: warning: sig %s is zero but is not first flag\n", sig->flags[i].name);
+ os::log("apitrace: warning: sig %s is zero but is not first flag\n", sig->flags[i].name);
}
_writeString(sig->flags[i].name);
_writeUInt(sig->flags[i].value);
}
void Writer::writeNull(void) {
- _writeByte(Trace::TYPE_NULL);
+ _writeByte(trace::TYPE_NULL);
}
-void Writer::writeOpaque(const void *addr) {
+void Writer::writePointer(unsigned long long addr) {
if (!addr) {
Writer::writeNull();
return;
}
- _writeByte(Trace::TYPE_OPAQUE);
- _writeUInt((size_t)addr);
+ _writeByte(trace::TYPE_OPAQUE);
+ _writeUInt(addr);
}
-} /* namespace Trace */
+} /* namespace trace */