Changeset 6fbe8c in git for kernel

Timestamp:

Sep 29, 2021, 3:17:38 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4bd78f5e4c58b72e2ec9c8c2cc6ae6bb69b2a9c6

Parents:

5d7d03a80f539e219c587a909c4ffb0edfe71bf0

Message:

Revert "update vspace"

incompatible with old gcc

This reverts commit f80133aa286554c3e339eb7ac76f2f9050c5dbbe.

Location:

kernel

Files:

• GBEngine/kChinese.cc (modified) (1 diff)
• GBEngine/kverify.cc (modified) (1 diff)
• oswrapper/vspace.cc (modified) (6 diffs)
• oswrapper/vspace.h (modified) (7 diffs)

kernel/GBEngine/kChinese.cc

@@ -20 +20 @@
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 // send a number via a string s

kernel/GBEngine/kverify.cc

@@ -16 +16 @@
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #endif
 

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

kernel/oswrapper/vspace.h

@@ -1 +1 @@
 #ifndef VSPACE_H
 #define VSPACE_H
-
-#include "kernel/mod2.h"
-
-#ifdef HAVE_VSPACE
-
 #include <fcntl.h>
-#include <cstdio>
-#include <cstring>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <assert.h>
 #include <new> // for placement new
-
+#include "kernel/mod2.h"
+
+#ifdef HAVE_VSPACE
 
 #if __cplusplus >= 201100
@@ -20 +22 @@
 #endif
 
-// VSpace is a C++ library designed to allow processes in a
+// vspace is a C++ library designed to allow processes in a
 // multi-process environment to interoperate via mmapped shared memory.
 // The library provides facilities for shared memory allocation and
@@ -231 +233 @@
 struct VSeg {
   unsigned char *base;
-  inline bool is_free() {
-    return base == NULL;
-  }
   inline Block *block_ptr(segaddr_t addr) {
     return (Block *) (base + addr);
@@ -254 +253 @@
   MetaPage *metapage;
   int fd;
-  std::FILE *file_handle;
+  FILE *file_handle;
   int current_process; // index into process table
   vaddr_t *freelist; // reference to metapage information
@@ -280 +279 @@
   inline void ensure_is_mapped(vaddr_t vaddr) {
     int seg = vaddr >> LOG2_SEGMENT_SIZE;
-    if (segments[seg].is_free())
-      segments[seg] = mmap_segment(seg);
+    if (segments[seg].base != NULL)
+      return;
+    segments[seg] = mmap_segment(seg);
   }
   inline void *to_ptr(vaddr_t vaddr) {
@@ -734 +734 @@
 public:
   VString(const char *s) {
-    _len = std::strlen(s);
+    _len = strlen(s);
     _buffer = vnew_uninitialized_array<char>(_len + 1);
-    std::strcpy(_buffer.as_ptr(), s);
+    strcpy(_buffer.as_ptr(), s);
   }
   VString(const char *s, size_t len) {
@@ -742 +742 @@
     _buffer = vnew_uninitialized_array<char>(len + 1);
     char *buffer = _buffer.as_ptr();
-    std::memcpy(buffer, s, len);
+    memcpy(buffer, s, len);
     buffer[len] = '\0';
   }