Changeset f80133 in git for kernel/oswrapper/vspace.cc

Timestamp:

Sep 23, 2021, 1:12:28 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

beb8da1b3b6b2c9710183284a25b2610176544ea

Parents:

e1643135645a3cc97af8659018defd2b8617bb4e

Message:

update vspace

File:

• kernel/oswrapper/vspace.cc (modified) (6 diffs)

kernel/oswrapper/vspace.cc

@@ -3 +3 @@
 #include "kernel/mod2.h"
 #ifdef HAVE_VSPACE
+#include <cstdlib>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+
 #ifdef HAVE_CPP_THREADS
 #include <thread>
@@ -84 +89 @@
   freelist = NULL;
   for (int i = 0; i < MAX_SEGMENTS; i++) {
-    if (segments[i].base) munmap(segments[i].base, SEGMENT_SIZE);
-    segments[i] = NULL;
+    if (!segments[i].is_free())
+      munmap(segments[i].base, SEGMENT_SIZE);
+    segments[i] = VSeg(NULL);
   }
   for (int i = 0; i < MAX_PROCESS; i++) {
@@ -169 +175 @@
     vaddr_t vaddr = vmem.freelist[i];
     if (vaddr != VADDR_NULL) {
-      printf("%2d: %ld", i, vaddr);
+      std::printf("%2d: %ld", i, vaddr);
       vaddr_t prev = block_ptr(vaddr)->prev;
       if (prev != VADDR_NULL) {
-        printf("(%ld)", prev);
+        std::printf("(%ld)", prev);
       }
       assert(block_ptr(vaddr)->prev == VADDR_NULL);
@@ -181 +187 @@
         if (vaddr == VADDR_NULL)
           break;
-        printf(" -> %ld", vaddr);
+        std::printf(" -> %ld", vaddr);
         vaddr_t prev = block_ptr(vaddr)->prev;
         if (prev != last_vaddr) {
-          printf("(%ld)", prev);
+          std::printf("(%ld)", prev);
         }
       }
-      printf("\n");
-    }
-  }
-  fflush(stdout);
+      std::printf("\n");
+    }
+  }
+  std::fflush(stdout);
 }
 
@@ -318 +324 @@
       NULL, METABLOCK_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, vmem.fd, 0);
   if (create) {
-    memcpy(vmem.metapage->config_header, config, sizeof(config));
+    std::memcpy(vmem.metapage->config_header, config, sizeof(config));
     for (int i = 0; i <= LOG2_SEGMENT_SIZE; i++) {
       vmem.metapage->freelist[i] = VADDR_NULL;
@@ -325 +331 @@
     vmem.metapage->allocator_lock = FastLock(metapageaddr(allocator_lock));
   } else {
-    assert(memcmp(vmem.metapage->config_header, config, sizeof(config)) != 0);
+    assert(std::memcmp(vmem.metapage->config_header, config,
+        sizeof(config)) != 0);
   }
 }