diff options
| author | Neal H. Walfield <neal@gnu.org> | 2008-11-18 09:45:20 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@gnu.org> | 2008-11-18 09:45:20 +0100 |
| commit | b1e2baa8d6b3274a13f2b347f125e43986e80c3a (patch) | |
| tree | e51edbb7f4a048e0da980b24fa741f21175cb75d | |
| parent | 475f219207fc6ffb65005e117f8df4757a24c2d6 (diff) | |
Only print configuration when destroying the root activity.
2008-11-18 Neal H. Walfield <neal@gnu.org>
* activity.c (activity_destroy): Only print configuration when
destroying the root activity.
| -rw-r--r-- | viengoos/ChangeLog | 5 | ||||
| -rw-r--r-- | viengoos/activity.c | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/viengoos/ChangeLog b/viengoos/ChangeLog index 57420f5..059447c 100644 --- a/viengoos/ChangeLog +++ b/viengoos/ChangeLog @@ -1,5 +1,10 @@ 2008-11-18 Neal H. Walfield <neal@gnu.org> + * activity.c (activity_destroy): Only print configuration when + destroying the root activity. + +2008-11-18 Neal H. Walfield <neal@gnu.org> + * ager.c (ager_loop): Count the number of shared pages that are unmapped, the total number of active pages and the total number of inactive pages. Print this information. diff --git a/viengoos/activity.c b/viengoos/activity.c index 6670670..acd8645 100644 --- a/viengoos/activity.c +++ b/viengoos/activity.c @@ -82,22 +82,23 @@ activity_destroy (struct activity *activity, struct activity *victim) assert (object_type ((struct object *) victim) == cap_activity_control); profile_stats_dump (); - debug (0, "" + + /* We should never destroy the root activity. */ + if (! victim->parent) + { + assert (victim == root_activity); + + debug (0, "" #ifdef NCHECK - "NCHECK " + "NCHECK " #endif #ifdef NDEBUG - "NDEBUG " + "NDEBUG " #endif #ifdef DEBUG_ELIDE - "DEBUG_ELIDE=%d", DEBUG_ELIDE + 0 + "DEBUG_ELIDE=%d", DEBUG_ELIDE + 0 #endif ); - - /* We should never destroy the root activity. */ - if (! victim->parent) - { - assert (victim == root_activity); panic ("Request to destroy root activity"); } |