You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/05/09 17:55:49 UTC
[incubator-nuttx-apps] branch master updated (d7a5313 -> baea789)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from d7a5313 Revert "CI: use 'git diff $commits' as a whole patchset to do checkpatch"
new 3abdf30 examples/thttpd/content/tasks/tasks.c: Update OS internal name
new baea789 examples/thttpd/content/tasks/tasks.c: nxstyle check.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/thttpd/content/tasks/tasks.c | 115 ++++++++++++++--------------------
1 file changed, 47 insertions(+), 68 deletions(-)
[incubator-nuttx-apps] 01/02:
examples/thttpd/content/tasks/tasks.c: Update OS internal name
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 3abdf30e8c62f1a82fc48a0763392ba6c8b0ee2d
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat May 9 11:16:16 2020 -0600
examples/thttpd/content/tasks/tasks.c: Update OS internal name
This logic uses the OS internal nxsched_foreach() function. This is a violation of the POSIX OS interface. But for now, we just update the name.
---
examples/thttpd/content/tasks/tasks.c | 53 +++++++++--------------------------
1 file changed, 14 insertions(+), 39 deletions(-)
diff --git a/examples/thttpd/content/tasks/tasks.c b/examples/thttpd/content/tasks/tasks.c
index b82e8db..9cfabad 100644
--- a/examples/thttpd/content/tasks/tasks.c
+++ b/examples/thttpd/content/tasks/tasks.c
@@ -1,35 +1,20 @@
/****************************************************************************
* examples/thttpd/tasks/tasks.c
*
- * Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
*
****************************************************************************/
@@ -44,17 +29,7 @@
#include <unistd.h>
#include <sched.h>
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
+#include <nuttx/sched.h>
/****************************************************************************
* Private Data
@@ -200,7 +175,7 @@ int main(int argc, char *argv[])
"<pre>\r\n"
"PID PRI SCHD TYPE NP STATE NAME\r\n");
- sched_foreach(show_task, NULL);
+ nxsched_foreach(show_task, NULL);
puts(
"</pre>\r\n"
[incubator-nuttx-apps] 02/02:
examples/thttpd/content/tasks/tasks.c: nxstyle check.
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit baea7891378c5319f65de2e1b869c747da16fa6d
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat May 9 11:26:24 2020 -0600
examples/thttpd/content/tasks/tasks.c: nxstyle check.
---
examples/thttpd/content/tasks/tasks.c | 60 +++++++++++++++++++----------------
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git a/examples/thttpd/content/tasks/tasks.c b/examples/thttpd/content/tasks/tasks.c
index 9cfabad..a353a20 100644
--- a/examples/thttpd/content/tasks/tasks.c
+++ b/examples/thttpd/content/tasks/tasks.c
@@ -79,24 +79,27 @@ static FAR const char *g_policynames[4] =
/* NOTEs:
*
* 1. One limitation in the use of NXFLAT is that functions that are
- * referenced as a pointer-to-a-function must have global scope. Otherwise
- * ARM GCC will generate some bad logic.
- * 2. In general, when called back, there is no guarantee to that PIC registers
- * will be valid and, unless you take special precautions, it could be
- * dangerous to reference global variables in the callback function.
+ * referenced as a pointer-to-a-function must have global scope.
+ * Otherwise ARM GCC will generate some bad logic.
+ * 2. In general, when called back, there is no guarantee to that PIC
+ * registers will be valid and, unless you take special precautions, it
+ * could be dangerous to reference global variables in the callback
+ * function.
*/
-/* static */ void show_task(FAR struct tcb_s *tcb, FAR void *arg)
+void show_task(FAR struct tcb_s *tcb, FAR void *arg)
{
FAR const char *policy;
int i;
/* Show task/thread status */
- policy = g_policynames[(tcb->flags & TCB_FLAG_POLICY_MASK) >> TCB_FLAG_POLICY_SHIFT];
+ policy = g_policynames[(tcb->flags & TCB_FLAG_POLICY_MASK) >>
+ TCB_FLAG_POLICY_SHIFT];
printf("%5d %3d %4s %7s%c%c %8s ",
tcb->pid, tcb->sched_priority, policy,
- g_ttypenames[(tcb->flags & TCB_FLAG_TTYPE_MASK) >> TCB_FLAG_TTYPE_SHIFT],
+ g_ttypenames[(tcb->flags & TCB_FLAG_TTYPE_MASK) >>
+ TCB_FLAG_TTYPE_SHIFT],
tcb->flags & TCB_FLAG_NONCANCELABLE ? 'N' : ' ',
tcb->flags & TCB_FLAG_CANCEL_PENDING ? 'P' : ' ',
g_statenames[tcb->task_state]);
@@ -108,8 +111,8 @@ static FAR const char *g_policynames[4] =
{
FAR struct pthread_tcb_s *ptcb = (FAR struct pthread_tcb_s *)tcb;
- /* It is a pthread. Show any name assigned to the pthread via prtcl() along
- * with the startup value.
+ /* It is a pthread. Show any name assigned to the pthread via prtcl()
+ * along with the startup value.
*/
#if CONFIG_TASK_NAME_SIZE > 0
@@ -139,7 +142,7 @@ static FAR const char *g_policynames[4] =
for (i = 2; ttcb->argv[i]; i++)
{
printf(", %p", ttcb->argv[i]);
- }
+ }
printf(")\n");
}
@@ -160,26 +163,27 @@ int main(int argc, char *argv[])
"Status: 200/html\r\n"
"\r\n"
"<html>\r\n"
- "<head>\r\n"
- "<title>NuttX Tasks</title>\r\n"
- "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style.css\">\r\n"
- "</head>\r\n"
- "<body bgcolor=\"#fffeec\" text=\"black\">\r\n"
- "<div class=\"menu\">\r\n"
- "<div class=\"menubox\"><a href=\"/index.html\">Front page</a></div>\r\n"
- "<div class=\"menubox\"><a href=\"hello\">Say Hello</a></div>\r\n"
- "<div class=\"menubox\"><a href=\"tasks\">Tasks</a></div>\r\n"
- "<br>\r\n"
- "</div>\r\n"
- "<div class=\"contentblock\">\r\n"
- "<pre>\r\n"
- "PID PRI SCHD TYPE NP STATE NAME\r\n");
+ "<head>\r\n"
+ "<title>NuttX Tasks</title>\r\n"
+ "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style.css\">\r\n"
+ "</head>\r\n"
+ "<body bgcolor=\"#fffeec\" text=\"black\">\r\n"
+ "<div class=\"menu\">\r\n"
+ "<div class=\"menubox\"><a href=\"/index.html\">Front page</a></div>\r\n"
+ "<div class=\"menubox\"><a href=\"hello\">Say Hello</a></div>\r\n"
+ "<div class=\"menubox\"><a href=\"tasks\">Tasks</a></div>\r\n"
+ "<br>\r\n"
+ "</div>\r\n"
+ "<div class=\"contentblock\">\r\n"
+ "<pre>\r\n"
+ "PID PRI SCHD TYPE NP STATE NAME\r\n");
nxsched_foreach(show_task, NULL);
puts(
- "</pre>\r\n"
- "</body>\r\n"
- "</html>\r\n");
+ "</pre>\r\n"
+ "</body>\r\n"
+ "</html>\r\n");
+
return 0;
}