2007-11-16 Neal H. Walfield <neal@gnu.org>

	* viengoos/Makefile.am: New file based on ../wortel/Makefile.am.
	* viengoos/headers.m4: New file.
	* viengoos/config.m4: New file based on ../wortel/config.m4.

	* viengoos/viengoos.h: New file.
	* viengoos/viengoos.c: New file.
	* viengoos/activity.h: Likewise.
	* viengoos/activity.c: Likewise.
	* viengoos/as.h: Likewise.
	* viengoos/as.c: Likewise.
	* viengoos/cap-lookup.c: Likewise.
	* viengoos/cap.h: Likewise.
	* viengoos/cap.c: Likewise.
	* viengoos/thread.h: New file.
	* viengoos/thread.c: New file.
	* viengoos/object.h: New file.
	* viengoos/object.c: New file.
	* viengoos/rm.h: New file.
	* viengoos/server.c: New file.
	* viengoos/server.h: New file.

	* viengoos/zalloc.h: Copied from ../physmem.
	* viengoos/zalloc.c: Copied from ../physmem.
	Don't include "output.h".
	Include <hurd/stddef.h>.
	Change uses of min_page_size to PAGESIZE.
	* viengoos/memory.h: New file.
	* viengoos/memory.c: New file.
	* viengoos/sigma0.c: Copy from ../wortel.
	* viengoos/sigma0.h: Copy from ../wortel.
	Don't include "shutdown.h".
	Include <hurd/stddef.h>.

	* viengoos/bits.h: Likewise.

	* viengoos/panic.c: New file.
	* viengoos/debug.c: Likewise.
	* viengoos/debug.h: Likewise.

	* viengoos/boot-modules.h: Likewise.
	* viengoos/boot-modules.c: Likewise.
	* viengoos/elf.h: Copied from ../wortel.
	* viengoos/loader.c: New file based on ../wortel/loader.c.
	* viengoos/loader.h: New file.
	* viengoos/multiboot.h: Copied from Grub.

	* viengoos/mmap.c: New file based on ../physmem/mmap.c.
	* viengoos/malloc-wrap.c: New file based on ../physmem/malloc-wrap.c.
	* viengoos/malloc.c: Version 2.8.3 of Doug Lea's malloc.c.
	* viengoos/malloc.h: Version 2.8.3 of Doug Lea's malloc.h.

	* viengoos/ia32-cmain.c: New file based on ../wortel/ia32-cmain.c.
	* viengoos/ia32-crt0.S: Copied from ../wortel.
	(STACK_SIZE): Use a 16 page stack.
	* viengoos/ia32-output.c: Copied from ../wortel.
	* viengoos/ia32-shutdown.c: Likewise.

	* viengoos/output.h: New file based on ../wortel/output.h.
	Include <stdarg.h>.
	(cprintf): New definition.
	(output_debug): Don't define.
	(debug): Don't define.
	* viengoos/output.c: New file based on ../wortel/output.c.
	Don't include <stdlib.h>.
	(vprintf): New function.
	(printf): Implement in terms of vprintf.
	* viengoos/output-none.c: Copied from ../wortel.
	* viengoos/output-serial.c: Likewise.
	* viengoos/output-stdio.c: New file.
	* viengoos/output-vga.c: Copied from ../wortel.

	* viengoos/shutdown.h: New file based on ../wortel/shutdown.h.
	Don't include "output.h".
	(panic): Don't define.
	(shutdown): Rename from this...
	(shutdown_machine): ... to this.
	* viengoos/shutdown.c: New file based on ../wortel/shutdown.c.
	(reset) [_L4_TEST_ENVIRONMENT]: Call abort.
	(halt) [_L4_TEST_ENVIRONMENT]: Call abort.
	(shutdown): Rename from this...
	(shutdown_machine): ... to this.

	* viengoos/t-environment.h: New file based on
	../libl4/tests/environment.h.
	Protect from multiple inclusion.
	Include <hurd/stddef.h>.
	Include <string.h>.
	Include <l4/stubs.h>.
	(program_name): New declaration.
	(check_nr): Don't assume that val1 and val2 are _L4_word_t, use
	typeof instead.
	(main): Call output_init.
	* viengoos/t-as.c: New file.

1 files changed, 137 insertions, 0 deletions

diff --git a/viengoos/activity.c b/viengoos/activity.c
new file mode 100644
index 0000000..3432461
--- /dev/null
+++ b/viengoos/activity.c
@@ -0,0 +1,137 @@
+/* activity.c - Activity object implementation.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   Written by Neal H. Walfield <neal@gnu.org>.
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 3 of the
+   License, or (at your option) any later version.
+
+   The GNU Hurd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <assert.h>
+#include <hurd/cap.h>
+
+#include "activity.h"
+#include "object.h"
+
+error_t
+activity_allocate (struct activity *parent,
+		   struct thread *caller,
+		   addr_t faddr, l4_word_t index,
+		   addr_t aaddr, addr_t caddr,
+		   l4_word_t priority, l4_word_t weight,
+		   l4_word_t storage_quota)
+{
+  if (! (0 <= index && index < FOLIO_OBJECTS))
+    return EINVAL;
+
+  struct cap folio_cap = object_lookup_rel (parent, &caller->aspace,
+					    faddr, cap_folio, NULL);
+  if (folio_cap.type == cap_void)
+    return ENOENT;
+  struct object *folio = cap_to_object (parent, &folio_cap);
+  if (! folio)
+    return ENOENT;
+
+  struct cap *acap = slot_lookup_rel (parent, &caller->aspace, aaddr,
+				      -1, NULL);
+  if (! acap)
+    return ENOENT;
+  struct cap *ccap = slot_lookup_rel (parent, &caller->aspace, caddr,
+				      -1, NULL);
+  if (! ccap)
+    return ENOENT;
+
+  struct object *o;
+  folio_object_alloc (parent, (struct folio *) folio, index,
+		      cap_activity, &o);
+  struct activity *activity = (struct activity *) o;
+  *ccap = *acap = object_to_cap (o);
+  ccap->type = cap_activity_control;
+
+  activity->priority = priority;
+  activity->weight = weight;
+  activity->storage_quota = storage_quota;
+
+  return 0;
+}
+
+void
+activity_destroy (struct activity *activity,
+		  struct cap *cap, struct activity *target)
+{
+  /* XXX: If we implement storage reparenting, we need to be careful
+     to avoid a recursive loop as an activity's storage may be stored
+     in a folio allocated to itself.  */
+  assert (! cap || cap->type == cap_activity_control);
+
+  /* We should never destroy the root activity.  */
+  if (target->parent.type == cap_void)
+    panic ("Request to destroy root activity");
+
+  /* XXX: Rewrite this to avoid recusion!!!  */
+
+  /* Destroy all folios allocated to this activity.  */
+  while (target->folios.type != cap_void)
+    {
+      struct object *f = cap_to_object (activity, &target->folios);
+      /* If F was destroyed, it should have been removed from its
+	 respective activity's allocation list.  */
+      assert (f);
+      folio_free (activity, (struct folio *) f);
+    }
+
+  /* Activity's that are sub-activity's of ACTIVITY are not
+     necessarily allocated out of storage allocated to ACTIVITY.  */
+  while (target->children.type != cap_void)
+    {
+      struct object *a = cap_to_object (activity, &activity->children);
+      /* If A was destroyed, it should have been removed from its
+	 respective activity's allocation list.  */
+      assert (a);
+      activity_destroy (target, NULL, (struct activity *) a);
+    }
+
+  /* Remove from parent's activity list.  */
+  struct activity *prev = NULL;
+  if (target->sibling_prev.type != cap_void)
+    prev = (struct activity *) cap_to_object (activity, &target->sibling_prev);
+
+  struct activity *next = NULL;
+  if (target->sibling_next.type != cap_void)
+    next = (struct activity *) cap_to_object (activity, &target->sibling_next);
+
+  struct activity *p
+    = (struct activity *) cap_to_object (activity, &target->parent);
+  assert (p);
+  struct object_desc *pdesc = object_to_object_desc ((struct object *) p);
+
+  if (prev)
+    prev->sibling_next = target->sibling_next;
+  else
+    {
+      assert (p->children.oid == pdesc->oid);
+      assert (p->children.version == pdesc->version);
+    }
+
+  if (next)
+    {
+      next->sibling_prev = target->sibling_prev;
+      if (! prev)
+	/* NEXT is new head.  */
+	p->children = activity->sibling_next;
+    }
+
+  object_free (activity, (struct object *) target);
+}