10000 Debug stuff · Mars2018/arangodb@22f0239 · GitHub
[go: up one dir, main page]
Skip to content

Commit 22f0239

Browse files
goedderzgoedderz
committed
Debug stuff
1 parent c12bf27 commit 22f0239

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

‎js/common/bootstrap/modules/fs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,8 @@ global.DEFINE_MODULE('fs', (function () {
553553
// //////////////////////////////////////////////////////////////////////////////
554554

555555
exports.writeFileSync = function (filename, content) {
556+
console.log("[DBG] writeFileSync(filename, content) called: ",
557+
{filename, content, trace: (new Error()).toString()});
556558
return exports.write(filename, content);
557559
};
558560

‎js/server/bootstrap/modules/internal.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@
304304
const $_RAW_BODY_BUFFER = Symbol.for('@arangodb/request.rawBodyBuffer');
305305
const getRawBodyBuffer = global.SYS_RAW_REQUEST_BODY;
306306
exports.rawRequestBody = function (req) {
307+
console.log("[DBG] rawRequestBody(req) called: ", {req, trace: (new Error()).toString()});
307308
return req[$_RAW_BODY_BUFFER] || getRawBodyBuffer(req);
308309
};
309310
delete global.SYS_RAW_REQUEST_BODY;

‎lib/Logger/LogMacros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110
/// @brief logs a message for debugging during development
111111
////////////////////////////////////////////////////////////////////////////////
112112

113-
#define LOG_DEVEL LOG_TOPIC(ERR,Logger::FIXME) << "###### "
114-
#define LOG_DEVEL_IF(cond) LOG_TOPIC_IF(ERR,Logger::FIXME,(cond)) << "###### "
113+
#define LOG_DEVEL LOG_TOPIC(ERR,arangodb::Logger::FIXME) << "###### "
114+
#define LOG_DEVEL_IF(cond) LOG_TOPIC_IF(ERR,arangodb::Logger::FIXME,(cond)) << "###### "
115115
116116
////////////////////////////////////////////////////////////////////////////////
117117
/// @brief logs a message every N.the time

‎lib/V8/v8-buffer.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#ifndef ARANGODB_V8_V8__BUFFER_H
5050
#define ARANGODB_V8_V8__BUFFER_H 1
5151

52+
#include <lib/Logger/Logger.h>
5253
#include "Basics/Common.h"
5354

5455
#include "V8/v8-globals.h"
@@ -101,6 +102,7 @@ class V8Buffer : public V8Wrapper<V8Buffer, TRI_V8_BUFFER_CID> {
101102
//////////////////////////////////////////////////////////////////////////////
102103

103104
static inline char* data(v8::Handle<v8::Value> val) {
105+
LOG_DEVEL << "V8Buffer::data()";
104106
TRI_ASSERT(val->IsObject());
105107
auto o = val->ToObject();
106108
int32_t offsetValue = 0;
@@ -127,14 +129,29 @@ class V8Buffer : public V8Wrapper<V8Buffer, TRI_V8_BUFFER_CID> {
127129
}
128130

129131
V8Buffer* buffer = unwrap(o);
132+
133+
LOG_DEVEL_IF(buffer == nullptr) << "buffer == nullptr";
134+
LOG_DEVEL_IF(offsetValue < 0) << "offsetValue < 0 (== " << offsetValue << ")";
135+
130136
if (buffer == nullptr || offsetValue < 0) {
131137
return nullptr;
132138
}
133139

134140
size_t length = buffer->_length;
141+
LOG_DEVEL << "buffer->_length == " << length;
142+
LOG_DEVEL << "offsetValue == " << offsetValue;
143+
LOG_DEVEL << "buffer->_data == " << (buffer->_data == nullptr ? "nullptr" : buffer->_data);
135144
if (static_cast<size_t>(offsetValue) >= length) {
145+
LOG_DEVEL << "OOB, returning nullptr";
136146
return nullptr; //OOB
137147
}
148+
LOG_DEVEL_IF(static_cast<size_t>(offsetValue) >= length) << "previous OOB";
149+
150+
TRI_ASSERT(buffer->_data != nullptr);
151+
152+
LOG_DEVEL << "returning " << (void*)buffer->_data << " + " << offsetValue
153+
<< " = " << ((void*)(buffer->_data + offsetValue)) << " = "
154+
<< buffer->_data + offsetValue;
138155

139156
return buffer->_data + offsetValue;
140157
}

0 commit comments

Comments
 (0)
0