Fix for TTD with fs stat changes. (#194)

mrkmarron · digitalinfinity · commit 87ce098018d5 · 2017-03-21T18:05:00.000-07:00
Fix for TTD break after change to FS Stats access. PR-URL: #194 Signed-off-by: Mark Marron <marron@microsoft.com> Signed-off-by: Hitesh Kanwathirtha <hiteshk@microsoft.com>
diff --git a/deps/chakrashim/include/v8.h b/deps/chakrashim/include/v8.h
@@ -533,6 +533,7 @@ class PersistentBase {
 
  private:
   template<class F> friend class Local;
+  template<class F> friend class Global;
   template<class F1, class F2> friend class Persistent;
 
   explicit V8_INLINE PersistentBase(T* val)
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -199,7 +199,7 @@ inline Environment::Environment(IsolateData* isolate_data,
 #endif
       handle_cleanup_waiting_(0),
       http_parser_buffer_(nullptr),
-      fs_stats_field_array_(nullptr),
+      fs_stats_field_array_(),
       context_(context->GetIsolate(), context) {
   // We'll be creating new objects so make sure we've entered the context.
   v8::HandleScope handle_scope(isolate());
@@ -245,6 +245,8 @@ inline Environment::~Environment() {
   while (handle_cleanup_waiting_ != 0)
     uv_run(event_loop(), UV_RUN_ONCE);
 
+  fs_stats_field_array_.Empty();
+
   context()->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex,
                                              nullptr);
 #define V(PropertyName, TypeName) PropertyName ## _.Reset();
@@ -381,13 +383,13 @@ inline void Environment::set_http_parser_buffer(char* buffer) {
   http_parser_buffer_ = buffer;
 }
 
-inline double* Environment::fs_stats_field_array() const {
-  return fs_stats_field_array_;
+inline v8::Local<v8::Float64Array> Environment::fs_stats_field_array() const {
+  return v8::Local<v8::Float64Array>::New(isolate_, fs_stats_field_array_);
 }
 
-inline void Environment::set_fs_stats_field_array(double* fields) {
-  CHECK_EQ(fs_stats_field_array_, nullptr);  // Should be set only once.
-  fs_stats_field_array_ = fields;
+inline void Environment::set_fs_stats_field_array(v8::Local<v8::Float64Array> fields) {
+  CHECK_EQ(fs_stats_field_array_.IsEmpty(), true);  // Should be set only once.
+  fs_stats_field_array_ = v8::Global<v8::Float64Array>::Global(isolate_, fields);
 }
 
 inline Environment* Environment::from_cares_timer_handle(uv_timer_t* handle) {
diff --git a/src/env.h b/src/env.h
@@ -491,8 +491,8 @@ class Environment {
   inline char* http_parser_buffer() const;
   inline void set_http_parser_buffer(char* buffer);
 
-  inline double* fs_stats_field_array() const;
-  inline void set_fs_stats_field_array(double* fields);
+  inline v8::Local<v8::Float64Array> fs_stats_field_array() const;
+  inline void set_fs_stats_field_array(v8::Local<v8::Float64Array> fields);
 
   inline void ThrowError(const char* errmsg);
   inline void ThrowTypeError(const char* errmsg);
@@ -602,7 +602,8 @@ class Environment {
 
   char* http_parser_buffer_;
 
-  double* fs_stats_field_array_;
+  //We depend on the property in fs.js to manage the lifetime appropriately
+  v8::Global<v8::Float64Array> fs_stats_field_array_;
 
 #define V(PropertyName, TypeName)                                             \
   v8::Persistent<TypeName> PropertyName ## _;
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -448,7 +448,10 @@ static void Close(const FunctionCallbackInfo<Value>& args) {
 }
 
 
-void FillStatsArray(double* fields, const uv_stat_t* s) {
+void FillStatsArray(v8::Local<v8::Float64Array> fields_array, const uv_stat_t* s, int offset) {
+  Local<ArrayBuffer> ab = fields_array->Buffer();
+  double* fields = static_cast<double*>(ab->GetContents().Data()) + offset;
+
   fields[0] = s->st_dev;
   fields[1] = s->st_mode;
   fields[2] = s->st_nlink;
@@ -477,6 +480,12 @@ void FillStatsArray(double* fields, const uv_stat_t* s) {
   X(12, ctim)
   X(13, birthtim)
 #undef X
+
+#if ENABLE_TTD_NODE
+  if(s_doTTRecord || s_doTTReplay) {
+    ab->TTDRawBufferModifyNotifySync(offset * sizeof(double), 14 * sizeof(double));
+  }
+#endif
 }
 
 // Used to speed up module loading.  Returns the contents of the file as
@@ -1392,18 +1401,20 @@ static void Mkdtemp(const FunctionCallbackInfo<Value>& args) {
 
 void GetStatValues(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
-  double* fields = env->fs_stats_field_array();
-  if (fields == nullptr) {
+  Local<Float64Array> fields = env->fs_stats_field_array();
+
+  if (fields.IsEmpty()) {
     // stat fields contains twice the number of entries because `fs.StatWatcher`
     // needs room to store data for *two* `fs.Stats` instances.
-    fields = new double[2 * 14];
+    Local<ArrayBuffer> ab = ArrayBuffer::New(env->isolate(),
+        new double[2 * 14],
+        sizeof(double) * 2 * 14);
+    fields = Float64Array::New(ab, 0, 2 * 14);
+
     env->set_fs_stats_field_array(fields);
   }
-  Local<ArrayBuffer> ab = ArrayBuffer::New(env->isolate(),
-                                           fields,
-                                           sizeof(double) * 2 * 14);
-  Local<Float64Array> fields_array = Float64Array::New(ab, 0, 2 * 14);
-  args.GetReturnValue().Set(fields_array);
+
+  args.GetReturnValue().Set(fields);
 }
 
 void InitFs(Local<Object> target,
diff --git a/src/node_internals.h b/src/node_internals.h
@@ -162,7 +162,7 @@ NO_RETURN void FatalError(const char* location, const char* message);
 
 void ProcessEmitWarning(Environment* env, const char* fmt, ...);
 
-void FillStatsArray(double* fields, const uv_stat_t* s);
+void FillStatsArray(v8::Local<v8::Float64Array> fields_array, const uv_stat_t* s, int offset = 0);
 
 void SetupProcessObject(Environment* env,
                         int argc,
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc
@@ -88,7 +88,7 @@ void StatWatcher::Callback(uv_fs_poll_t* handle,
   Context::Scope context_scope(env->context());
 
   FillStatsArray(env->fs_stats_field_array(), curr);
-  FillStatsArray(env->fs_stats_field_array() + 14, prev);
+  FillStatsArray(env->fs_stats_field_array(), prev, 14);
   Local<Value> arg = Integer::New(env->isolate(), status);
   wrap->MakeCallback(env->onchange_string(), 1, &arg);
 }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void StatWatcher::Callback(uv_fs_poll_t* handle,`
`88`	`88`	`Context::Scope context_scope(env->context());`
`89`	`89`
`90`	`90`	`FillStatsArray(env->fs_stats_field_array(), curr);`
`91`		`- FillStatsArray(env->fs_stats_field_array() + 14, prev);`
	`91`	`+ FillStatsArray(env->fs_stats_field_array(), prev, 14);`
`92`	`92`	`Local<Value> arg = Integer::New(env->isolate(), status);`
`93`	`93`	`wrap->MakeCallback(env->onchange_string(), 1, &arg);`
`94`	`94`	`}`