Skip to content

buffer: removing duplicate code - #1144

Closed
thlorenz wants to merge 1 commit into
nodejs:v1.xfrom
thlorenz:buffer-remove-duplication
Closed

thlorenz wants to merge 1 commit into
nodejs:v1.xfrom
thlorenz:buffer-remove-duplication

Conversation

@thlorenz

Copy link
Copy Markdown
Contributor
  • using an overload of Alloc that does the same that was being done
    inside Buffer::New

The overload we now call inside smalloc.cc takes care of the same as
the code that was removed:

if (length == 0)
  return Alloc(env, obj, nullptr, length, type);

char* data = static_cast<char*>(malloc(length));
if (data == nullptr) {
  FatalError("node::smalloc::Alloc(v8::Handle<v8::Object>, size_t,"
              " v8::ExternalArrayType)", "Out Of Memory");
}

Alloc(env, obj, data, length, type);

/cc @trevnorris

- using an overload of Alloc that does the same that was being done
  inside `Buffer::New`

The overload we now call inside `smalloc.cc` takes care of the same as
the code that was removed:

```cc
if (length == 0)
  return Alloc(env, obj, nullptr, length, type);

char* data = static_cast<char*>(malloc(length));
if (data == nullptr) {
  FatalError("node::smalloc::Alloc(v8::Handle<v8::Object>, size_t,"
              " v8::ExternalArrayType)", "Out Of Memory");
}

Alloc(env, obj, data, length, type);
```
@trevnorris

Copy link
Copy Markdown
Contributor

@bnoordhuis I think this is cruft and can be removed. See something I might be missing?

@bnoordhuis

Copy link
Copy Markdown
Member

@thlorenz

Copy link
Copy Markdown
Contributor Author

CI is failing due to github problems :(

@bnoordhuis

Copy link
Copy Markdown
Member

There are two CI runs in progress at the moment, it's possible this one got queued. @rvagg?

@rvagg

rvagg commented Mar 13, 2015

Copy link
Copy Markdown
Member

I fixed the queueing recently so that no build slave could have two jobs on it simultaneously which should solve older queuing problems we were having but Jenkins is kind of terrible at managing its git clones so things get messed up a bit sometimes.

Submitted again @ https://jenkins-iojs.nodesource.com/view/iojs/job/iojs+any-pr+multi/300/ so let's see ..

@trevnorris

Copy link
Copy Markdown
Contributor

None of those look to be failing because of this PR.

@Fishrock123

Copy link
Copy Markdown
Contributor

What's the status on this? CI looks ok.

@Fishrock123 Fishrock123 added the buffer Issues and PRs related to the buffer subsystem. label Mar 19, 2015
thlorenz added a commit that referenced this pull request Mar 19, 2015
- using an overload of Alloc that does the same that was being done
  inside `Buffer::New`

The overload we now call inside `smalloc.cc` takes care of the same as
the code that was removed:

    if (length == 0)
      return Alloc(env, obj, nullptr, length, type);

    char* data = static_cast<char*>(malloc(length));
    if (data == nullptr) {
      FatalError("node::smalloc::Alloc(v8::Handle<v8::Object>, size_t,"
                  " v8::ExternalArrayType)", "Out Of Memory");
    }

    Alloc(env, obj, data, length, type);

PR-URL: #1144
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
@bnoordhuis

Copy link
Copy Markdown
Member

Thanks Thorsten, landed in 813a536.

@bnoordhuis bnoordhuis closed this Mar 19, 2015
@thlorenz
thlorenz deleted the buffer-remove-duplication branch March 25, 2015 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

buffer Issues and PRs related to the buffer subsystem.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants