The disk API makes more sense now

Author: facekapow

js/core/disk/disk-driver.js js/core/disk/disk-interface.jsjs/core/disk/disk-driver.js renamed to js/core/disk/disk-interface.js

@@ -14,17 +14,34 @@
 
 'use strict';
 
-const nameHandle = Symbol('name');
+const privates = new WeakMap();
 
 class DiskDriver {
-  constructor(name = '') {
-    this[nameHandle] = name;
+  constructor(name = '', init = {}) {
+    privates.set(this, {
+      name,
+    });
     this.onread = null;
     this.onwrite = null;
     this.ongetformatinfo = null;
+    this.ongetonline = null;
+    if (typeof init === 'object') {
+      if (typeof init.read === 'function') {
+        this.onread = init.read;
+      }
+      if (typeof init.write === 'function') {
+        this.write = init.write;
+      }
+      if (typeof init.formatInfo === 'object') {
+        this.ongetformatinfo = () => init.formatInfo;
+      }
+      if (typeof init.isOnline === 'function') {
+        this.ongetonline = init.isOnline;
+      }
+    }
   }
   get name() {
-    return this[nameHandle];
+    return privates.get(this).name;
   }
   read(sector, u8) {
     if (!this.onread) {
@@ -44,6 +61,12 @@ class DiskDriver {
     }
     return this.ongetformatinfo();
   }
+  get isOnline() {
+    if (!this.ongetonline) {
+      throw new Error('driver was not initialized');
+    }
+    return this.ongetonline();
+  }
 }
 
 module.exports = DiskDriver;

js/core/disk/disks.js

@@ -0,0 +1,27 @@
+// Copyright 2016-present runtime.js project authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+const availableDisks = Object.create(null);
+
+module.exports = {
+  registerDisk(disk) {
+    availableDisks[disk.name] = disk;
+
+    console.log(`[disk] registered disk ${disk.name}`);
+  },
+  getDisks() {
+    return availableDisks;
+  },
+};

js/core/disk/drivers.js

@@ -13,24 +13,13 @@
 // limitations under the License.
 
 'use strict';
-const DiskDriver = require('./disk-driver');
-const { addDriver, getDefaultDriver, getCopyOfDrivers } = require('./drivers');
+const DiskInterface = require('./disk-interface');
+const { registerDisk, getDisks } = require('./disks');
 
 module.exports = {
-  DiskDriver,
-  addDriver,
-  read(sector, data) {
-    return getDefaultDriver().read(sector, data);
-  },
-  write(sector, data) {
-    return getDefaultDriver().write(sector, data);
-  },
-  get formatInfo() {
-    return getDefaultDriver().formatInfo;
-  },
-  // we expose drivers because the user may want
-  // to access different drives with different drivers
-  get drivers() {
-    return getCopyOfDrivers();
+  DiskInterface,
+  registerDisk,
+  get disks() {
+    return getDisks();
   }
 };

js/core/disk/index.js

@@ -72,42 +72,46 @@ function initializeBlockDevice(pciDevice) {
     return u8;
   }
 
-  const diskDriver = new runtime.disk.DiskDriver('blk');
-  diskDriver.onread = (sector, data) => {
-    return new Promise((resolve, reject) => {
-      if (sector > totalSectorCount) {
-        setImmediate(() => {
-          reject(new RangeError(`sector ${sector} out of bounds (max ${totalSectorCount}, non-inclusive)`));
-        });
-        return;
-      }
-      const status = new Uint8Array(1);
-      promiseQueue.push([resolve, reject, VIRTIO_BLK_T_IN, data, status]);
-      reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_IN, sector), data, status], [false, true, true]);
-
-      if (reqQueue.isNotificationNeeded()) {
-        dev.queueNotify(QUEUE_ID_REQ);
-      }
-    });
-  };
-  diskDriver.onwrite = (sector, data) => {
-    return new Promise((resolve, reject) => {
-      const status = new Uint8Array(1);
-      promiseQueue.push([resolve, reject, VIRTIO_BLK_T_OUT, data, status]);
-      reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_OUT, sector), data, status], [false, false, true]);
-
-      if (reqQueue.isNotificationNeeded()) {
-        dev.queueNotify(QUEUE_ID_REQ);
-      }
-    });
-  };
-  diskDriver.ongetformatinfo = () => ({
-    sectorSize,
-    sectorCount,
-    totalSectorCount,
+  const diskDriver = new runtime.disk.DiskInterface('hda', {
+    read(sector, data) {
+      return new Promise((resolve, reject) => {
+        if (sector > totalSectorCount) {
+          setImmediate(() => {
+            reject(new RangeError(`sector ${sector} out of bounds (max ${totalSectorCount}, non-inclusive)`));
+          });
+          return;
+        }
+        const status = new Uint8Array(1);
+        promiseQueue.push([resolve, reject, VIRTIO_BLK_T_IN, data, status]);
+        reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_IN, sector), data, status], [false, true, true]);
+
+        if (reqQueue.isNotificationNeeded()) {
+          dev.queueNotify(QUEUE_ID_REQ);
+        }
+      });
+    },
+    write(sector, data) {
+      return new Promise((resolve, reject) => {
+        const status = new Uint8Array(1);
+        promiseQueue.push([resolve, reject, VIRTIO_BLK_T_OUT, data, status]);
+        reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_OUT, sector), data, status], [false, false, true]);
+
+        if (reqQueue.isNotificationNeeded()) {
+          dev.queueNotify(QUEUE_ID_REQ);
+        }
+      });
+    },
+    formatInfo: {
+      sectorSize,
+      sectorCount,
+      totalSectorCount,
+    },
+    isOnline() {
+      return true; // TODO: actually check if the disk is online or not
+    }
   });
 
-  runtime.disk.addDriver(diskDriver);
+  runtime.disk.registerDisk(diskDriver);
 
   function recvBuffer() {
     if (promiseQueue.length === 0) {