Changeset 5f97ef44 in mainline for uspace/app

Timestamp:

2018-07-13T14:10:15Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3787a0

Parents:

9912f49

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-13 14:08:57)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-13 14:10:15)

Message:

Sleep is more natural as part of the fibril API.
(the implementation will move later)

Location:

uspace/app

Files:

• bdsh/cmds/modules/sleep/sleep.c (modified) (1 diff)
• mkbd/main.c (modified) (1 diff)
• rcutest/rcutest.c (modified) (12 diffs)
• tester/stdio/logger2.c (modified) (1 diff)
• vuhid/life.c (modified) (1 diff)
• wavplay/dplay.c (modified) (1 diff)
• wavplay/drec.c (modified) (1 diff)
• wavplay/main.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/sleep/sleep.c

@@ -132 +132 @@
         }
 
-        async_usleep(duration);
+        fibril_usleep(duration);
 
         return CMD_SUCCESS;

uspace/app/mkbd/main.c

@@ -295 +295 @@
                 }
 
-                async_usleep(10000);
+                fibril_usleep(10000);
         }
 

uspace/app/rcutest/rcutest.c

@@ -321 +321 @@
         printf("r-sleep{");
         /* 2 sec */
-        async_usleep(2 * USECS_PER_SEC);
+        fibril_usleep(2 * USECS_PER_SEC);
         ++arg->done_sleeps_cnt;
         printf("}");
@@ -346 +346 @@
 
         /* 1 sec, waits for the reader to enter its critical section and sleep. */
-        async_usleep(1 * USECS_PER_SEC);
+        fibril_usleep(1 * USECS_PER_SEC);
 
         if (!info.entered_cs || info.exited_cs) {
@@ -369 +369 @@
                  */
                 /* 1.5 sec */
-                async_usleep(1500 * 1000);
+                fibril_usleep(1500 * 1000);
                 return false;
         } else {
@@ -402 +402 @@
         /* Wait for rcu_sync() to start waiting for us. */
         while (!arg->synching) {
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
         printf(" }");
@@ -411 +411 @@
         /* Wait for the new reader to enter its reader section. */
         while (!arg->new_entered_cs) {
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
         printf(" }");
@@ -437 +437 @@
         /* Wait until rcu_sync() starts. */
         while (!arg->synching) {
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
 
@@ -444 +444 @@
          * some more to make sure it really does start executing.
          */
-        async_usleep(WAIT_STEP_US);
+        fibril_usleep(WAIT_STEP_US);
 
         printf("new-lock(");
@@ -452 +452 @@
         /* Wait for rcu_sync() exit, ie stop waiting for the preexisting reader. */
         while (!arg->synched) {
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
 
@@ -487 +487 @@
         /* Waits for the preexisting_reader to enter its CS.*/
         while (!info.old_entered_cs) {
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
 
@@ -533 +533 @@
                  * are using it.
                  */
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
 
@@ -565 +565 @@
         /* Wait for rcu_sync() to start waiting for us. */
         while (!arg->synching) {
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
         printf(" }");
@@ -591 +591 @@
         /* Waits for the preexisting_reader to enter its CS.*/
         while (!info.entered_cs) {
-                async_usleep(WAIT_STEP_US);
+                fibril_usleep(WAIT_STEP_US);
         }
 

uspace/app/tester/stdio/logger2.c

@@ -56 +56 @@
                             "Printing level %d (%s) into bravo sub-log.",
                             (int) level, log_level_str(level));
-                        async_usleep(1000 * 100);
+                        fibril_usleep(1000 * 100);
                 }
         }

uspace/app/vuhid/life.c

@@ -44 +44 @@
         data->data_in_pos = 0;
         data->data_in_last_pos = (size_t) -1;
-        async_usleep(1000 * 1000 * 5);
+        fibril_usleep(1000 * 1000 * 5);
         usb_log_debug("%s", data->msg_born);
         while (data->data_in_pos < data->data_in_count) {
-                async_usleep(1000 * data->data_in_pos_change_delay);
+                fibril_usleep(1000 * data->data_in_pos_change_delay);
                 // FIXME: proper locking
                 data->data_in_pos++;

uspace/app/wavplay/dplay.c

@@ -312 +312 @@
                     pos, usecs, real_delay, to_play);
                 if (real_delay)
-                        async_usleep(real_delay);
+                        fibril_usleep(real_delay);
                 /* update buffer position */
                 const errno_t ret = audio_pcm_get_buffer_pos(pb->device, &pos);

uspace/app/wavplay/drec.c

@@ -167 +167 @@
         /* XXX Control returns even before we can be sure callbacks finished */
         printf("Delay before playback termination\n");
-        async_usleep(1000000);
+        fibril_usleep(1000000);
         printf("Terminate playback\n");
 }

uspace/app/wavplay/main.c

@@ -341 +341 @@
         /* Wait for all fibrils to finish */
         while (atomic_get(&playcount) > 0)
-                async_usleep(1000000);
+                fibril_usleep(1000000);
 
         /* Destroy parallel playback context, if initialized */