You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/04 02:09:14 UTC
incubator-mynewt-core git commit: shell, newtmgr, iotivity;
task stacks were too small when running on sim.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop b51f07485 -> 7ff265a0c
shell, newtmgr, iotivity; task stacks were too small when running on sim.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/7ff265a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/7ff265a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/7ff265a0
Branch: refs/heads/develop
Commit: 7ff265a0c1c113c418ad668f308bd02076f29ac6
Parents: b51f074
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Oct 3 19:08:39 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Oct 3 19:08:39 2016 -0700
----------------------------------------------------------------------
libs/iotivity/src/port/mynewt/adaptor.c | 4 ++--
libs/newtmgr/src/newtmgr.c | 4 ++--
sys/shell/src/shell.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7ff265a0/libs/iotivity/src/port/mynewt/adaptor.c
----------------------------------------------------------------------
diff --git a/libs/iotivity/src/port/mynewt/adaptor.c b/libs/iotivity/src/port/mynewt/adaptor.c
index 0367c67..9fccc88 100644
--- a/libs/iotivity/src/port/mynewt/adaptor.c
+++ b/libs/iotivity/src/port/mynewt/adaptor.c
@@ -55,7 +55,7 @@ oc_network_event_handler_mutex_unlock(void)
}
/* need a task to process OCF messages */
-#define OC_NET_TASK_STACK_SIZE MYNEWT_VAL(OC_TASK_STACK_SIZE)
+#define OC_NET_TASK_STACK_SIZE OS_STACK_ALIGN(MYNEWT_VAL(OC_TASK_STACK_SIZE))
#define OC_NET_TASK_PRIORITY MYNEWT_VAL(OC_TASK_PRIORITY)
struct os_task oc_task;
os_stack_t *oc_stack;
@@ -228,4 +228,4 @@ oc_connectivity_init(void)
oc_connectivity_init_err:
oc_connectivity_shutdown();
return rc;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7ff265a0/libs/newtmgr/src/newtmgr.c
----------------------------------------------------------------------
diff --git a/libs/newtmgr/src/newtmgr.c b/libs/newtmgr/src/newtmgr.c
index d0cef0e..9b90296 100644
--- a/libs/newtmgr/src/newtmgr.c
+++ b/libs/newtmgr/src/newtmgr.c
@@ -668,8 +668,8 @@ nmgr_task_init(void)
}
rc = os_task_init(&g_nmgr_task, "newtmgr", nmgr_task, NULL,
- MYNEWT_VAL(NEWTMGR_TASK_PRIO), OS_WAIT_FOREVER,
- newtmgr_stack, MYNEWT_VAL(NEWTMGR_STACK_SIZE));
+ MYNEWT_VAL(NEWTMGR_TASK_PRIO), OS_WAIT_FOREVER,
+ newtmgr_stack, OS_STACK_ALIGN(MYNEWT_VAL(NEWTMGR_STACK_SIZE)));
if (rc != 0) {
goto err;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7ff265a0/sys/shell/src/shell.c
----------------------------------------------------------------------
diff --git a/sys/shell/src/shell.c b/sys/shell/src/shell.c
index 58481de..3606e54 100644
--- a/sys/shell/src/shell.c
+++ b/sys/shell/src/shell.c
@@ -573,7 +573,7 @@ shell_init(void)
console_init(shell_console_rx_cb);
rc = os_task_init(&shell_task, "shell", shell_task_func,
- NULL, MYNEWT_VAL(SHELL_TASK_PRIO), OS_WAIT_FOREVER, shell_stack,
- MYNEWT_VAL(SHELL_STACK_SIZE));
+ NULL, MYNEWT_VAL(SHELL_TASK_PRIO), OS_WAIT_FOREVER, shell_stack,
+ OS_STACK_ALIGN(MYNEWT_VAL(SHELL_STACK_SIZE)));
SYSINIT_PANIC_ASSERT(rc == 0);
}