You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/05/21 15:28:00 UTC
[incubator-nuttx-apps] branch master updated: ostest:priority_inheritance Added priority restoration test
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 3821121a2 ostest:priority_inheritance Added priority restoration test
3821121a2 is described below
commit 3821121a2e75f7ce4e2ff9269100e438ebe02202
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Fri May 20 06:05:13 2022 -0700
ostest:priority_inheritance Added priority restoration test
---
testing/ostest/prioinherit.c | 134 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 134 insertions(+)
diff --git a/testing/ostest/prioinherit.c b/testing/ostest/prioinherit.c
index c6750f9e2..2fbe02a3c 100644
--- a/testing/ostest/prioinherit.c
+++ b/testing/ostest/prioinherit.c
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <unistd.h>
#include <semaphore.h>
+#include <stdlib.h>
#include <pthread.h>
#include <errno.h>
@@ -32,6 +33,8 @@
# include <nuttx/arch.h>
#endif
+#include <sys/wait.h>
+
#include "ostest.h"
#if defined(CONFIG_PRIORITY_INHERITANCE) && !defined(CONFIG_DISABLE_PTHREAD)
@@ -68,6 +71,10 @@
# define NHIGHPRI_THREADS 1
#endif
+#define NUMBER_OF_COMPETING_THREADS 3
+#define COMPETING_THREAD_START_PRIORITY 200
+#define PRIORIY_SPREED 10
+
/****************************************************************************
* Private Data
****************************************************************************/
@@ -88,10 +95,76 @@ static sem_t g_sem;
static volatile enum thstate_e g_middlestate;
static volatile enum thstate_e g_highstate[NHIGHPRI_THREADS];
static volatile enum thstate_e g_lowstate[NLOWPRI_THREADS];
+static volatile int g_priority_tracking[NUMBER_OF_COMPETING_THREADS];
static int g_highpri;
static int g_medpri;
static int g_lowpri;
+/****************************************************************************
+ * Name: sleep_and_display
+ ****************************************************************************/
+
+static void sleep_and_display(int n, int us)
+{
+ struct sched_param sparam;
+
+ us /= 100;
+
+ do
+ {
+ int status = sched_getparam(getpid(), &sparam);
+
+ if (status != 0)
+ {
+ printf("priority_inheritance: sched_getparam failed\n");
+ }
+
+ if (us == 0 || g_priority_tracking[n] != sparam.sched_priority)
+ {
+ if (g_priority_tracking[n] == 0)
+ {
+ printf("priority_inheritance: "
+ "Task%1d initial priority is:%d\n",
+ n, sparam.sched_priority);
+ }
+ else
+ {
+ printf("priority_inheritance: "
+ "Task%1d priority was:%d is:%d\n",
+ n, g_priority_tracking[n], sparam.sched_priority);
+ }
+
+ g_priority_tracking[n] = sparam.sched_priority;
+ FFLUSH();
+ }
+
+ usleep(100);
+ us--;
+ }
+ while (us > 0);
+}
+
+/****************************************************************************
+ *
+ ****************************************************************************/
+
+static int adversary(int argc, FAR char *argv[])
+{
+ int index = atoi(argv[1]);
+ int inital_delay = atoi(argv[2]);
+ int hold_delay = atoi(argv[3]);
+
+ sleep_and_display(index, inital_delay);
+ printf("priority_inheritance: "
+ "%s Started, waiting %d uS to take count\n", argv[0], inital_delay);
+ sem_wait(&g_sem);
+ sleep_and_display(index, hold_delay);
+ sem_post(&g_sem);
+ printf("priority_inheritance: %s Posted\n", argv[0]);
+ sleep_and_display(index, 0);
+ return 0;
+}
+
/****************************************************************************
* Name: nhighpri_waiting
****************************************************************************/
@@ -416,6 +489,12 @@ void priority_inheritance(void)
int my_pri;
int status;
int i;
+ pid_t pids[NUMBER_OF_COMPETING_THREADS];
+ char args[3][32];
+ FAR char *argv[4];
+ char name[32];
+ int priority;
+ int restoration_result;
printf("priority_inheritance: Started\n");
@@ -588,6 +667,61 @@ void priority_inheritance(void)
dump_nfreeholders("priority_inheritance:");
}
+ /* Perform restoration test */
+
+ printf("priority_inheritance: Restoration Test:\n");
+
+ sem_init(&g_sem, 0, 1);
+ priority = COMPETING_THREAD_START_PRIORITY;
+ argv[0] = args[0];
+ argv[1] = args[1];
+ argv[2] = args[2];
+ argv[3] = NULL;
+
+ for (i = 0; i < NUMBER_OF_COMPETING_THREADS; i++)
+ {
+ g_priority_tracking[i] = 0;
+ snprintf(name, sizeof(name), "Task%1d", i);
+ snprintf(args[0], sizeof(args[0]), "%d", i);
+ snprintf(args[1], sizeof(args[1]), "%d", i * 10000);
+ snprintf(args[2], sizeof(args[2]), "%d", i == 0 ? 100000 : 1000);
+
+ pids[i] = task_create(name, priority, 1024, adversary,
+ (FAR char * const *)argv);
+ priority += PRIORIY_SPREED;
+ }
+
+ priority = COMPETING_THREAD_START_PRIORITY;
+ restoration_result = 0;
+ for (i = 0; i < NUMBER_OF_COMPETING_THREADS; i++)
+ {
+ printf("priority_inheritance: "
+ "Waiting for Task-%d to complete\n", i);
+
+ waitpid(pids[i], &status, 0);
+ if (priority != g_priority_tracking[i])
+ {
+ printf("priority_inheritance: "
+ "Task-%d Priority is %d, and was not restored to %d\n",
+ i, g_priority_tracking[i], priority);
+
+ restoration_result |= 1 << i;
+ }
+
+ priority += PRIORIY_SPREED;
+ }
+
+ if (restoration_result != 0)
+ {
+ printf("priority_inheritance: ERROR: FAIL Priorities were not "
+ "correctly restored.\n");
+ }
+ else
+ {
+ printf("priority_inheritance: PASSED Priority were correctly"
+ " restored.\n");
+ }
+
printf("priority_inheritance: Finished\n");
sem_destroy(&g_sem);
dump_nfreeholders("priority_inheritance:");