Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buffer: expose internals on binding #770

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions lib/buffer.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
'use strict';

const buffer = process.binding('buffer');
const binding = process.binding('buffer');
const smalloc = process.binding('smalloc');
const util = require('util');
const alloc = smalloc.alloc;
const truncate = smalloc.truncate;
const sliceOnto = smalloc.sliceOnto;
const kMaxLength = smalloc.kMaxLength;
var internal = {};

exports.Buffer = Buffer;
exports.SlowBuffer = SlowBuffer;
Expand Down Expand Up @@ -124,7 +123,7 @@ NativeBuffer.prototype = Buffer.prototype;


// add methods to Buffer prototype
buffer.setupBufferJS(NativeBuffer, internal);
binding.setupBufferJS(NativeBuffer);


// Static methods
Expand All @@ -142,7 +141,7 @@ Buffer.compare = function compare(a, b) {
if (a === b)
return 0;

return internal.compare(a, b);
return binding.compare(a, b);
};


Expand Down Expand Up @@ -215,7 +214,7 @@ Buffer.byteLength = function(str, enc) {
ret = str.length >>> 1;
break;
default:
ret = internal.byteLength(str, enc);
ret = binding.byteLength(str, enc);
}
return ret;
};
Expand Down Expand Up @@ -274,7 +273,7 @@ Buffer.prototype.equals = function equals(b) {
if (this === b)
return true;

return internal.compare(this, b) === 0;
return binding.compare(this, b) === 0;
};


Expand All @@ -298,7 +297,7 @@ Buffer.prototype.compare = function compare(b) {
if (this === b)
return 0;

return internal.compare(this, b);
return binding.compare(this, b);
};


Expand All @@ -319,7 +318,7 @@ Buffer.prototype.fill = function fill(val, start, end) {
val = code;
}

internal.fill(this, val, start, end);
binding.fill(this, val, start, end);

return this;
};
Expand Down Expand Up @@ -663,31 +662,31 @@ Buffer.prototype.readFloatLE = function readFloatLE(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 4, this.length);
return internal.readFloatLE(this, offset);
return binding.readFloatLE(this, offset);
};


Buffer.prototype.readFloatBE = function readFloatBE(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 4, this.length);
return internal.readFloatBE(this, offset);
return binding.readFloatBE(this, offset);
};


Buffer.prototype.readDoubleLE = function readDoubleLE(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 8, this.length);
return internal.readDoubleLE(this, offset);
return binding.readDoubleLE(this, offset);
};


Buffer.prototype.readDoubleBE = function readDoubleBE(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 8, this.length);
return internal.readDoubleBE(this, offset);
return binding.readDoubleBE(this, offset);
};


Expand Down Expand Up @@ -910,7 +909,7 @@ Buffer.prototype.writeFloatLE = function writeFloatLE(val, offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkFloat(this, val, offset, 4);
internal.writeFloatLE(this, val, offset);
binding.writeFloatLE(this, val, offset);
return offset + 4;
};

Expand All @@ -920,7 +919,7 @@ Buffer.prototype.writeFloatBE = function writeFloatBE(val, offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkFloat(this, val, offset, 4);
internal.writeFloatBE(this, val, offset);
binding.writeFloatBE(this, val, offset);
return offset + 4;
};

Expand All @@ -930,7 +929,7 @@ Buffer.prototype.writeDoubleLE = function writeDoubleLE(val, offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkFloat(this, val, offset, 8);
internal.writeDoubleLE(this, val, offset);
binding.writeDoubleLE(this, val, offset);
return offset + 8;
};

Expand All @@ -940,7 +939,7 @@ Buffer.prototype.writeDoubleBE = function writeDoubleBE(val, offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkFloat(this, val, offset, 8);
internal.writeDoubleBE(this, val, offset);
binding.writeDoubleBE(this, val, offset);
return offset + 8;
};

Expand Down
38 changes: 17 additions & 21 deletions src/node_buffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -636,34 +636,30 @@ void SetupBufferJS(const FunctionCallbackInfo<Value>& args) {
proto->ForceSet(env->offset_string(),
Uint32::New(env->isolate(), 0),
v8::ReadOnly);

CHECK(args[1]->IsObject());

Local<Object> internal = args[1].As<Object>();
ASSERT(internal->IsObject());

env->SetMethod(internal, "byteLength", ByteLength);
env->SetMethod(internal, "compare", Compare);
env->SetMethod(internal, "fill", Fill);

env->SetMethod(internal, "readDoubleBE", ReadDoubleBE);
env->SetMethod(internal, "readDoubleLE", ReadDoubleLE);
env->SetMethod(internal, "readFloatBE", ReadFloatBE);
env->SetMethod(internal, "readFloatLE", ReadFloatLE);

env->SetMethod(internal, "writeDoubleBE", WriteDoubleBE);
env->SetMethod(internal, "writeDoubleLE", WriteDoubleLE);
env->SetMethod(internal, "writeFloatBE", WriteFloatBE);
env->SetMethod(internal, "writeFloatLE", WriteFloatLE);
}


void Initialize(Handle<Object> target,
Handle<Value> unused,
Handle<Context> context) {
Environment* env = Environment::GetCurrent(context);
target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "setupBufferJS"),
env->NewFunctionTemplate(SetupBufferJS)->GetFunction());

env->SetMethod(target, "setupBufferJS", SetupBufferJS);

env->SetMethod(target, "byteLength", ByteLength);
env->SetMethod(target, "byteLength", ByteLength);
env->SetMethod(target, "compare", Compare);
env->SetMethod(target, "fill", Fill);

env->SetMethod(target, "readDoubleBE", ReadDoubleBE);
env->SetMethod(target, "readDoubleLE", ReadDoubleLE);
env->SetMethod(target, "readFloatBE", ReadFloatBE);
env->SetMethod(target, "readFloatLE", ReadFloatLE);

env->SetMethod(target, "writeDoubleBE", WriteDoubleBE);
env->SetMethod(target, "writeDoubleLE", WriteDoubleLE);
env->SetMethod(target, "writeFloatBE", WriteFloatBE);
env->SetMethod(target, "writeFloatLE", WriteFloatLE);
}


Expand Down