Skip to content

Commit

Permalink
src: changed stdio_pipes_ to std::vector
Browse files Browse the repository at this point in the history
PR-URL: #23615
Reviewed-By: Sam Ruby <rubys@intertwingly.net>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
  • Loading branch information
niboch authored and MylesBorins committed Oct 30, 2018
1 parent 81dc241 commit 850b54f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
26 changes: 12 additions & 14 deletions src/spawn_sync.cc
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ SyncProcessRunner::SyncProcessRunner(Environment* env)

stdio_count_(0),
uv_stdio_containers_(nullptr),
stdio_pipes_(nullptr),
stdio_pipes_initialized_(false),

uv_process_options_(),
Expand Down Expand Up @@ -421,7 +420,7 @@ SyncProcessRunner::SyncProcessRunner(Environment* env)
SyncProcessRunner::~SyncProcessRunner() {
CHECK_EQ(lifecycle_, kHandlesClosed);

stdio_pipes_.reset();
stdio_pipes_.clear();
delete[] file_buffer_;
delete[] args_buffer_;
delete[] cwd_buffer_;
Expand Down Expand Up @@ -500,10 +499,9 @@ Maybe<bool> SyncProcessRunner::TryInitializeAndRunLoop(Local<Value> options) {
}
uv_process_.data = this;

for (uint32_t i = 0; i < stdio_count_; i++) {
SyncProcessStdioPipe* h = stdio_pipes_[i].get();
if (h != nullptr) {
r = h->Start();
for (const auto& pipe : stdio_pipes_) {
if (pipe != nullptr) {
r = pipe->Start();
if (r < 0) {
SetPipeError(r);
return Just(false);
Expand Down Expand Up @@ -563,12 +561,12 @@ void SyncProcessRunner::CloseStdioPipes() {
CHECK_LT(lifecycle_, kHandlesClosed);

if (stdio_pipes_initialized_) {
CHECK(stdio_pipes_);
CHECK(!stdio_pipes_.empty());
CHECK_NOT_NULL(uv_loop_);

for (uint32_t i = 0; i < stdio_count_; i++) {
if (stdio_pipes_[i])
stdio_pipes_[i]->Close();
for (const auto& pipe : stdio_pipes_) {
if (pipe)
pipe->Close();
}

stdio_pipes_initialized_ = false;
Expand Down Expand Up @@ -723,13 +721,13 @@ Local<Object> SyncProcessRunner::BuildResultObject() {

Local<Array> SyncProcessRunner::BuildOutputArray() {
CHECK_GE(lifecycle_, kInitialized);
CHECK(stdio_pipes_);
CHECK(!stdio_pipes_.empty());

EscapableHandleScope scope(env()->isolate());
Local<Context> context = env()->context();
Local<Array> js_output = Array::New(env()->isolate(), stdio_count_);

for (uint32_t i = 0; i < stdio_count_; i++) {
for (uint32_t i = 0; i < stdio_pipes_.size(); i++) {
SyncProcessStdioPipe* h = stdio_pipes_[i].get();
if (h != nullptr && h->writable())
js_output->Set(context, i, h->GetOutputAsBuffer(env())).FromJust();
Expand Down Expand Up @@ -857,8 +855,8 @@ int SyncProcessRunner::ParseStdioOptions(Local<Value> js_value) {
stdio_count_ = js_stdio_options->Length();
uv_stdio_containers_ = new uv_stdio_container_t[stdio_count_];

stdio_pipes_.reset(
new std::unique_ptr<SyncProcessStdioPipe>[stdio_count_]());
stdio_pipes_.clear();
stdio_pipes_.resize(stdio_count_);
stdio_pipes_initialized_ = true;

for (uint32_t i = 0; i < stdio_count_; i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/spawn_sync.h
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class SyncProcessRunner {

uint32_t stdio_count_;
uv_stdio_container_t* uv_stdio_containers_;
std::unique_ptr<std::unique_ptr<SyncProcessStdioPipe>[]> stdio_pipes_;
std::vector<std::unique_ptr<SyncProcessStdioPipe>> stdio_pipes_;
bool stdio_pipes_initialized_;

uv_process_options_t uv_process_options_;
Expand Down

0 comments on commit 850b54f

Please sign in to comment.