src: fixups after v8 upgrade

bnoordhuis · bnoordhuis · commit c3d3c8e8cd8d · 2014-11-14T16:34:59.000+01:00
* v8::Platform has a new MonotonicallyIncreasingTime() method,
  implement it.

* The ASCII apocalypse continues with the replacement of external
  ASCII strings with external one byte strings.
diff --git a/src/node_v8_platform.cc b/src/node_v8_platform.cc
@@ -81,6 +81,17 @@ void Platform::CallOnForegroundThread(Isolate* isolate, Task* task) {
 }
 
 
+double Platform::MonotonicallyIncreasingTime() {
+  // uv_hrtime() returns a uint64_t but doubles can only represent integrals up
+  // to 2^53 accurately.  Take steps to prevent loss of precision on overflow.
+  const uint64_t timestamp = uv_hrtime();
+  const uint64_t billion = 1000 * 1000 * 1000;
+  const uint64_t seconds = timestamp / billion;
+  const uint64_t nanoseconds = timestamp % billion;
+  return seconds + 1.0 / nanoseconds;
+}
+
+
 void Platform::WorkerBody(void* arg) {
   Platform* p = static_cast<Platform*>(arg);
 
diff --git a/src/node_v8_platform.h b/src/node_v8_platform.h
@@ -55,6 +55,7 @@ class Platform : public v8::Platform {
   void CallOnBackgroundThread(v8::Task* task,
                               ExpectedRuntime expected_runtime);
   void CallOnForegroundThread(v8::Isolate* isolate, v8::Task* task);
+  double MonotonicallyIncreasingTime();
 
  protected:
   static void WorkerBody(void* arg);
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
@@ -106,7 +106,7 @@ class ExternString: public ResourceType {
 };
 
 
-typedef ExternString<String::ExternalAsciiStringResource,
+typedef ExternString<String::ExternalOneByteStringResource,
                      char> ExternOneByteString;
 typedef ExternString<String::ExternalStringResource,
                      uint16_t> ExternTwoByteString;
@@ -270,9 +270,9 @@ bool StringBytes::GetExternalParts(Isolate* isolate,
 
   Local<String> str = val.As<String>();
 
-  if (str->IsExternalAscii()) {
-    const String::ExternalAsciiStringResource* ext;
-    ext = str->GetExternalAsciiStringResource();
+  if (str->IsExternalOneByte()) {
+    const String::ExternalOneByteStringResource* ext;
+    ext = str->GetExternalOneByteStringResource();
     *data = ext->data();
     *len = ext->length();
     return true;
