x

2ceeaa4f · Nickolai Zeldovich · eab5dac8 · 2ceeaa4f · 2ceeaa4f · 2ceeaa4f
--- a/include/wq.hh
+++ b/include/wq.hh
@@ -52,6 +52,7 @@ public:
  void dump();

  static void* operator new(unsigned long);
+  static void operator delete(void*);

 private:
  work *steal(int c);

--- a/include/wqkernel.hh
+++ b/include/wqkernel.hh
@@ -12,6 +12,12 @@ allocwq(unsigned long nbytes)
 }

 static inline void
+freewq(void* p)
+{
+  ksfree(slab_wq, p);
+}
+
+static inline void
 wqlock_acquire(wqlock_t *lock)
 {
  acquire(lock);

--- a/include/wquser.hh
+++ b/include/wquser.hh
@@ -14,6 +14,12 @@ allocwq(unsigned long nbytes)
  return malloc(nbytes);
 }

+static inline void
+freewq(void* p)
+{
+  free(p);
+}
+
 static inline uwq_ipcbuf*
 allocipc(void)
 {

--- a/lib/Makefrag
+++ b/lib/Makefrag
@@ -2,7 +2,7 @@ $(O)/lib/%.S: CFLAGS:=$(CFLAGS) -DXV6_USER
 $(O)/lib/%.S: CXXFLAGS:=$(CXXFLAGS) -DXV6_USER

 ULIB = ulib.o usys.o printf.o umalloc.o uthread.o fmt.o stream.o ipc.o \
-       threads.o crt.o wqlib.o wquser.o perf.o wqalloc.o
+       threads.o crt.o wqlib.o wquser.o perf.o wqalloc.o rt.o
 ULIB := $(addprefix $(O)/lib/, $(ULIB))

 .PRECIOUS: $(O)/lib/%.o

--- a/lib/rt.c
+++ b/lib/rt.c
+#include "types.h"
+#include "user.h"
+
+void
+abort(void)
+{
+  char* p = (char*) 1;
+  *p = 1;
+  exit();
+}
+
+int
+dl_iterate_phdr(void)
+{
+  return -1;
+}
--- a/lib/wqlib.cc
+++ b/lib/wqlib.cc
@@ -19,6 +19,12 @@ wq::operator new(unsigned long nbytes)
  return allocwq(nbytes);
 }

+void
+wq::operator delete(void* p)
+{
+  freewq(p);
+}
+
 wq::wq(void)
 {
  int i;