fixup! test: log error

Signed-off-by: Darshan Sen <[email protected]>

Author: RaisinTen

src/heap_utils.cc

@@ -220,8 +220,7 @@ void BuildEmbedderGraph(const FunctionCallbackInfo<Value>& args){
 namespace{
 classFileOutputStream : publicv8::OutputStream{
 public:
-FileOutputStream(Environment* env, int fd, uv_fs_t* req)
- : env_(env), fd_(fd), req_(req){}
+FileOutputStream(int fd, uv_fs_t* req) : fd_(fd), req_(req){}
 
 intGetChunkSize() override{
 return65536; // big chunks == faster
@@ -230,21 +229,20 @@ class FileOutputStream : public v8::OutputStream{
 voidEndOfStream() override{}
 
  WriteResult WriteAsciiChunk(char* data, int size) override{
-DCHECK(!aborted_);
+DCHECK_EQ(status_, 0);
 int offset = 0;
 while (offset < size){
 uv_buf_t buf = uv_buf_init(data + offset, size - offset);
-int num_bytes_written = uv_fs_write(nullptr,
- req_,
- fd_,
- &buf,
-1,
- -1,
-nullptr);
+constint num_bytes_written = uv_fs_write(nullptr,
+req_,
+fd_,
+&buf,
+1,
+-1,
+nullptr);
 uv_fs_req_cleanup(req_);
 if (num_bytes_written < 0){
- aborted_ = true;
- env_->ThrowErrnoException(-num_bytes_written, "write");
+ status_ = num_bytes_written;
 returnkAbort;
  }
 DCHECK_LE(num_bytes_written, buf.len);
@@ -254,13 +252,12 @@ class FileOutputStream : public v8::OutputStream{
 returnkContinue;
  }
 
-boolaborted() const{returnaborted_}
+intstatus() const{returnstatus_}
 
 private:
- Environment* env_;
 int fd_;
 uv_fs_t* req_;
-bool aborted_ = false;
+int status_ = 0;
 };
 
 classHeapSnapshotStream : publicAsyncWrap,
@@ -353,29 +350,31 @@ inline void TakeSnapshot(Environment* env, v8::OutputStream* out){
 
 Maybe<void> WriteSnapshot(Environment* env, constchar* filename){
 uv_fs_t req;
-
-int fd = uv_fs_open(nullptr,
- &req,
- filename,
- O_WRONLY | O_CREAT | O_TRUNC,
- S_IWUSR | S_IRUSR,
-nullptr);
+int err;
+
+constint fd = uv_fs_open(nullptr,
+ &req,
+ filename,
+ O_WRONLY | O_CREAT | O_TRUNC,
+ S_IWUSR | S_IRUSR,
+nullptr);
 uv_fs_req_cleanup(&req);
-if (fd < 0){
- env->ThrowErrnoException(-fd, "open");
+if ((err = fd) < 0){
+ env->ThrowUVException(err, "open", nullptr, filename);
 return Nothing<void>();
  }
 
- FileOutputStream stream(env, fd, &req);
+ FileOutputStream stream(fd, &req);
 TakeSnapshot(env, &stream);
-if (stream.aborted()){
+if ((err = stream.status()) < 0){
+ env->ThrowUVException(err, "write", nullptr, filename);
 return Nothing<void>();
  }
 
-interr = uv_fs_close(nullptr, &req, fd, nullptr);
+ err = uv_fs_close(nullptr, &req, fd, nullptr);
 uv_fs_req_cleanup(&req);
 if (err < 0){
- env->ThrowErrnoException(-err, "close");
+ env->ThrowUVException(err, "close", nullptr, filename);
 return Nothing<void>();
  }
 

test/sequential/test-heapdump.js

@@ -30,7 +30,6 @@ process.chdir(tmpdir.path);
 assert.throws(()=>{
 writeHeapSnapshot(directory);
 },(e)=>{
-console.debug(e);
 assert.ok(e,'writeHeapSnapshot should error');
 assert.strictEqual(e.code,'EISDIR');
 assert.strictEqual(e.syscall,'open');