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

http_parser: do not dealloc during kOnExecute #2956

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
25 changes: 24 additions & 1 deletion src/node_http_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,9 @@ class Parser : public BaseObject {

static void Close(const FunctionCallbackInfo<Value>& args) {
Parser* parser = Unwrap<Parser>(args.Holder());
delete parser;

if (--parser->refcount_ == 0)
delete parser;
}


Expand Down Expand Up @@ -504,6 +506,22 @@ class Parser : public BaseObject {
}

protected:
class ScopedRetainParser {
public:
explicit ScopedRetainParser(Parser* p) : p_(p) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to have a const here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that delete may be called on const pointer... Am I wrong?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@indutny I just tried this

# include <cstdio>

class Test {
  public:
    Test(const char * str) : my_str(str) {
    }

    ~Test() {
      fprintf(stderr, "Cleaning up");
      delete my_str;
    }

  private:
    const char * my_str;
};

int main() {
  Test test(new char[50]);
}

with

➜  Desktop  g++ Test.cpp && ./a.out
Cleaning up
➜  Desktop

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-Wall?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@indutny Hmmm, I tried that now. No warnings.

➜  Desktop  g++ -Wall Test.cpp && ./a.out
Cleaning up
➜  Desktop  

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I think you're right.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Anyway, I'm changing the refcount of the parser, so it won't work.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@indutny Ah, right. Sorry for the fuss.

CHECK_GT(p_->refcount_, 0);
p_->refcount_++;
}

~ScopedRetainParser() {
if (0 == --p_->refcount_)
delete p_;
}

private:
Parser* const p_;
};

static const size_t kAllocBufferSize = 64 * 1024;

static void OnAllocImpl(size_t suggested_size, uv_buf_t* buf, void* ctx) {
Expand Down Expand Up @@ -540,6 +558,8 @@ class Parser : public BaseObject {
if (nread == 0)
return;

ScopedRetainParser retain(parser);

parser->current_buffer_.Clear();
Local<Value> ret = parser->Execute(buf->base, nread);

Expand Down Expand Up @@ -668,7 +688,10 @@ class Parser : public BaseObject {
char* current_buffer_data_;
StreamResource::Callback<StreamResource::AllocCb> prev_alloc_cb_;
StreamResource::Callback<StreamResource::ReadCb> prev_read_cb_;
int refcount_ = 1;
static const struct http_parser_settings settings;

friend class ScopedRetainParser;
};


Expand Down
51 changes: 51 additions & 0 deletions test/parallel/test-http-regr-gh-2928.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const httpCommon = require('_http_common');
const HTTPParser = process.binding('http_parser').HTTPParser;
const net = require('net');

const PARALLEL = 30;
const COUNT = httpCommon.parsers.max + 100;

const parsers = new Array(COUNT);
for (var i = 0; i < parsers.length; i++)
parsers[i] = httpCommon.parsers.alloc();

var gotRequests = 0;
var gotResponses = 0;

function execAndClose() {
process.stdout.write('.');
if (parsers.length === 0)
return;

const parser = parsers.pop();
parser.reinitialize(HTTPParser.RESPONSE);
const socket = net.connect(common.PORT);
parser.consume(socket._handle._externalStream);

parser.onIncoming = function onIncoming() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrap it in common.mustCall(function(){...}, COUNT), and we can get rid off gotResponses

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nvm. It may not work here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah... Let's leave it as it is.

process.stdout.write('+');
gotResponses++;
parser.unconsume(socket._handle._externalStream);
httpCommon.freeParser(parser);
socket.destroy();
setImmediate(execAndClose);
};
}

var server = net.createServer(function(c) {
if (++gotRequests === COUNT)
server.close();
c.end('HTTP/1.1 200 OK\r\n\r\n', function() {
c.destroySoon();
});
}).listen(common.PORT, function() {
for (var i = 0; i < PARALLEL; i++)
execAndClose();
});

process.on('exit', function() {
assert.equal(gotResponses, COUNT);
});