Simplify memory manager

Author: jart

ctl/is_void.h

@@ -0,0 +1,24 @@
+// -*-mode:c++;indent-tabs-mode:nil;c-basic-offset:4;tab-width:8;coding:utf-8-*-
+// vi: set et ft=cpp ts=4 sts=4 sw=4 fenc=utf-8 :vi
+#ifndef CTL_IS_VOID_H_
+#define CTL_IS_VOID_H_
+#include "integral_constant.h"
+#include "remove_cv.h"
+
+namespace ctl {
+
+template<typename>
+struct is_void_ : public ctl::false_type
+{};
+
+template<>
+struct is_void_<void> : public ctl::true_type
+{};
+
+template<typename _Tp>
+struct is_void : public is_void_<typename ctl::remove_cv<_Tp>::type>::type
+{};
+
+} // namespace ctl
+
+#endif // CTL_IS_VOID_H_

ctl/vector.h

@@ -525,7 +525,7 @@ class vector
         capacity_ = new_capacity;
     }
 
-    Allocator alloc_;
+    [[no_unique_address]] Allocator alloc_;
     pointer data_;
     size_type size_;
     size_type capacity_;

examples/greenbean.c

@@ -24,6 +24,7 @@
 #include <sys/socket.h>
 #include <time.h>
 #include "libc/mem/leaks.h"
+#include "libc/runtime/runtime.h"
 
 /**
  * @fileoverview greenbean lightweight threaded web server
@@ -336,10 +337,9 @@ int main(int argc, char *argv[]) {
   sigaddset(&block, SIGHUP);
   sigaddset(&block, SIGQUIT);
   pthread_attr_t attr;
-  int pagesz = getauxval(AT_PAGESZ);
   unassert(!pthread_attr_init(&attr));
   unassert(!pthread_attr_setstacksize(&attr, 65536));
-  unassert(!pthread_attr_setguardsize(&attr, pagesz));
+  unassert(!pthread_attr_setguardsize(&attr, getpagesize()));
   unassert(!pthread_attr_setsigmask_np(&attr, &block));
   unassert(!pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, 0));
   pthread_t *th = gc(calloc(threads, sizeof(pthread_t)));

libc/calls/madvise.c

@@ -30,7 +30,7 @@
  * @return 0 on success, or -1 w/ errno
  * @raise EINVAL if `advice` isn't valid or supported by system
  * @raise EINVAL on Linux if addr/length isn't page size aligned with
- *     respect to `getauxval(AT_PAGESZ)`
+ *     respect to `getpagesize()`
  * @raise ENOMEM on Linux if addr/length overlaps unmapped regions
  * @see libc/sysv/consts.sh
  * @see fadvise()

libc/calls/posix_madvise.c

@@ -25,7 +25,7 @@
  * @return 0 on success, or errno on error
  * @raise EINVAL if `advice` isn't valid or supported by system
  * @raise EINVAL on Linux if addr/length isn't page size aligned with
- *     respect to `getauxval(AT_PAGESZ)`
+ *     respect to `getpagesize()`
  * @raise ENOMEM on Linux if addr/length overlaps unmapped regions
  * @returnserrno
  */

libc/calls/setrlimit.c

@@ -21,6 +21,7 @@
 #include "libc/calls/struct/rlimit.internal.h"
 #include "libc/calls/syscall-sysv.internal.h"
 #include "libc/dce.h"
+#include "libc/errno.h"
 #include "libc/intrin/describeflags.internal.h"
 #include "libc/intrin/strace.internal.h"
 #include "libc/macros.internal.h"
@@ -77,6 +78,7 @@
  */
 int setrlimit(int resource, const struct rlimit *rlim) {
   int rc;
+  int olde = errno;
   if (resource == 127) {
     rc = einval();
   } else if (!rlim) {
@@ -85,18 +87,16 @@ int setrlimit(int resource, const struct rlimit *rlim) {
     rc = _sysret(__syslib->__setrlimit(resource, rlim));
   } else if (!IsWindows()) {
     rc = sys_setrlimit(resource, rlim);
-    if (IsXnu() && !rc && resource == RLIMIT_AS) {
-      // TODO(jart): What's up with XNU and NetBSD?
-      __virtualmax = rlim->rlim_cur;
-    }
   } else if (resource == RLIMIT_STACK) {
     rc = enotsup();
-  } else if (resource == RLIMIT_AS) {
-    __virtualmax = rlim->rlim_cur;
-    rc = 0;
   } else {
     rc = einval();
   }
+  if (resource == RLIMIT_AS) {
+    __virtualmax = rlim->rlim_cur;
+    errno = olde;
+    rc = 0;
+  }
   STRACE("setrlimit(%s, %s) → %d% m", DescribeRlimitName(resource),
          DescribeRlimit(0, rlim), rc);
   return rc;

libc/dlopen/dlopen.c

@@ -303,7 +303,7 @@ static wontreturn dontinstrument void foreign_helper(void **p) {
 static dontinline void elf_exec(const char *file, char **envp) {
 
   // get microprocessor page size
-  long pagesz = getauxval(AT_PAGESZ);
+  long pagesz = getpagesize();
 
   // load helper executable into address space
   struct Loaded prog;

libc/intrin/getauxval.c

@@ -16,8 +16,11 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/dce.h"
 #include "libc/errno.h"
 #include "libc/intrin/getauxval.internal.h"
+#include "libc/nt/struct/systeminfo.h"
+#include "libc/nt/systeminfo.h"
 #include "libc/runtime/runtime.h"
 #include "libc/sysv/consts/auxv.h"
 
@@ -35,11 +38,17 @@ unsigned long getauxval(unsigned long key) {
   x = __getauxval(key);
   if (key == AT_PAGESZ) {
     if (!x.isfound) {
+      if (!IsWindows()) {
 #ifdef __aarch64__
-      x.value = 16384;
+        x.value = 16384;
 #else
-      x.value = 4096;
+        x.value = 4096;
 #endif
+      } else {
+        struct NtSystemInfo si;
+        GetSystemInfo(&si);
+        x.value = si.dwPageSize;
+      }
     }
     x.isfound = true;
   }

libc/intrin/getmainstack.c

@@ -105,7 +105,7 @@ static size_t __get_stack_size(int pagesz, uintptr_t start, uintptr_t top) {
  * This function works on every OS except Windows.
  */
 struct AddrSize __get_main_stack(void) {
-  int pagesz = getauxval(AT_PAGESZ);
+  int pagesz = getpagesize();
   uintptr_t start = (uintptr_t)__argv;
   uintptr_t top = __get_main_top(pagesz);
   uintptr_t bot = top - __get_stack_size(pagesz, start, top);

libc/runtime/getpagesize.c renamed to libc/intrin/getpagesize.c

@@ -17,11 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/runtime/runtime.h"
+#include "libc/sysv/consts/auxv.h"
 
 /**
  * Returns granularity of memory manager.
  * @see sysconf(_SC_PAGE_SIZE) which is portable
  */
 int getpagesize(void) {
-  return __granularity();
+  return getauxval(AT_PAGESZ);
 }