Changeset 7100108 in rtems-libbsd

Timestamp:

Apr 17, 2014, 7:45:42 AM (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

b6d5758

Parents:

9219a29

git-author:

Sebastian Huber <sebastian.huber@…> (04/17/14 07:45:42)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/14/14 07:11:37)

Message:

Update due to workspace allocation changes

File:

• testsuite/thread01/test_main.c (modified) (4 diffs)

testsuite/thread01/test_main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
@@ -31 +31 @@
 
 #include <machine/rtems-bsd-kernel-space.h>
+#include <machine/rtems-bsd-thread.h>
 
 #include <stdlib.h>
@@ -209 +210 @@
 {
         rtems_resource_snapshot snapshot;
-        uintptr_t take_away;
         void *greedy;
+        uintptr_t take_away = 2 * BSD_MINIMUM_TASK_STACK_SIZE;
 
         puts("test kthread_add()");
 
-        greedy = rtems_workspace_greedy_allocate_all_except_largest(&take_away);
+        greedy = rtems_workspace_greedy_allocate(&take_away, 1);
 
         rtems_resource_snapshot_take(&snapshot);
@@ -221 +222 @@
 
         while (take_away > 0) {
-                struct thread *td = NULL;
                 void *away;
-                int eno;
-
-                /*
-                 * FIXME: This direct workspace access is a hack to get
-                 * reasonable test run times with RTEMS_DEBUG enabled.
-                 */
-                _Thread_Disable_dispatch();
-                away = _Workspace_Allocate(take_away);
-                _Thread_Enable_dispatch();
-
-                eno = kthread_add(
-                        test_kthread_add_thread,
-                        TEST_KTHREAD_ADD,
-                        NULL,
-                        &td,
-                        0,
-                        0,
-                        "%s",
-                        &test_kthread_name[0]
-                );
-
-                _Thread_Disable_dispatch();
-                _Workspace_Free(away);
-                _Thread_Enable_dispatch();
-
-                if (eno == 0) {
-                        wait_for_worker_thread();
-                        assert(td != NULL);
-
-                        take_away = 0;
-                } else {
-                        assert(eno == ENOMEM);
-                        assert(rtems_resource_snapshot_check(&snapshot));
-
-                        --take_away;
+                bool ok;
+
+                ok = rtems_workspace_allocate(take_away, &away);
+                if (ok) {
+                        struct thread *td = NULL;
+                        int eno;
+
+                        eno = kthread_add(
+                                test_kthread_add_thread,
+                                TEST_KTHREAD_ADD,
+                                NULL,
+                                &td,
+                                0,
+                                0,
+                                "%s",
+                                &test_kthread_name[0]
+                        );
+
+                        ok = rtems_workspace_free(away);
+                        assert(ok);
+
+                        if (eno == 0) {
+                                wait_for_worker_thread();
+                                assert(td != NULL);
+
+                                break;
+                        } else {
+                                assert(eno == ENOMEM);
+                                assert(rtems_resource_snapshot_check(&snapshot));
+                        }
                 }
+
+                --take_away;
         }
+
+        assert(take_away > 0);
 
         rtems_workspace_greedy_free(greedy);