Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Rosen Penev <rosenp@gmail.com>
To: alsa-devel@alsa-project.org
Subject: [PATCH] alsa-lib: Remove usleep usage
Date: Sun,  1 Sep 2019 18:32:40 -0700	[thread overview]
Message-ID: <20190902013240.16591-1-rosenp@gmail.com> (raw)

usleep was deprecated by POSIX 2008 and is unavailable without deprecated
APIs enabled in uClibc-ng.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/pcm/pcm_shm.c | 3 ++-
 src/ucm/main.c    | 3 ++-
 test/mixtest.c    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
index 26a27a57..30a77cd4 100644
--- a/src/pcm/pcm_shm.c
+++ b/src/pcm/pcm_shm.c
@@ -485,12 +485,13 @@ static int snd_pcm_shm_drain(snd_pcm_t *pcm)
 	snd_pcm_shm_t *shm = pcm->private_data;
 	volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
 	int err;
+	struct timespec req = { 0, 10 * 1000 * 1000 };
 	do {
 		ctrl->cmd = SNDRV_PCM_IOCTL_DRAIN;
 		err = snd_pcm_shm_action(pcm);
 		if (err != -EAGAIN)
 			break;
-		usleep(10000);
+		nanosleep(&req, NULL);
 	} while (1);
 	if (err < 0)
 		return err;
diff --git a/src/ucm/main.c b/src/ucm/main.c
index 99b1cd08..0e5236cb 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -359,6 +359,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr,
 {
 	struct list_head *pos;
 	struct sequence_element *s;
+	struct timespec sleep = { 0, s->data.sleep * 1000 };
 	char *cdev = NULL;
 	snd_ctl_t *ctl = NULL;
 	int err = 0;
@@ -440,7 +441,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr,
 			}
 			break;
 		case SEQUENCE_ELEMENT_TYPE_SLEEP:
-			usleep(s->data.sleep);
+			nanosleep(&sleep, NULL);
 			break;
 		case SEQUENCE_ELEMENT_TYPE_EXEC:
 			err = system(s->data.exec);
diff --git a/test/mixtest.c b/test/mixtest.c
index 57ca5d53..f0940344 100644
--- a/test/mixtest.c
+++ b/test/mixtest.c
@@ -77,7 +77,7 @@ static double detect_cpu_clock()
 	rdtscll(tsc_begin);
 	clock_gettime(CLOCK_MONOTONIC, &tm_begin);
 
-	usleep(1000000);
+	sleep(1);
 
 	rdtscll(tsc_end);
 	clock_gettime(CLOCK_MONOTONIC, &tm_end);
-- 
2.17.1

WARNING: multiple messages have this Message-ID (diff)
From: Rosen Penev <rosenp@gmail.com>
To: alsa-devel@alsa-project.org
Subject: [alsa-devel] [PATCH] alsa-lib: Remove usleep usage
Date: Sun,  1 Sep 2019 18:32:40 -0700	[thread overview]
Message-ID: <20190902013240.16591-1-rosenp@gmail.com> (raw)
Message-ID: <20190902013240.LPKXXaxmnqjUb04NnQwReIDusoTd9iTW5jXxGdbYL4Y@z> (raw)

usleep was deprecated by POSIX 2008 and is unavailable without deprecated
APIs enabled in uClibc-ng.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/pcm/pcm_shm.c | 3 ++-
 src/ucm/main.c    | 3 ++-
 test/mixtest.c    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
index 26a27a57..30a77cd4 100644
--- a/src/pcm/pcm_shm.c
+++ b/src/pcm/pcm_shm.c
@@ -485,12 +485,13 @@ static int snd_pcm_shm_drain(snd_pcm_t *pcm)
 	snd_pcm_shm_t *shm = pcm->private_data;
 	volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
 	int err;
+	struct timespec req = { 0, 10 * 1000 * 1000 };
 	do {
 		ctrl->cmd = SNDRV_PCM_IOCTL_DRAIN;
 		err = snd_pcm_shm_action(pcm);
 		if (err != -EAGAIN)
 			break;
-		usleep(10000);
+		nanosleep(&req, NULL);
 	} while (1);
 	if (err < 0)
 		return err;
diff --git a/src/ucm/main.c b/src/ucm/main.c
index 99b1cd08..0e5236cb 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -359,6 +359,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr,
 {
 	struct list_head *pos;
 	struct sequence_element *s;
+	struct timespec sleep = { 0, s->data.sleep * 1000 };
 	char *cdev = NULL;
 	snd_ctl_t *ctl = NULL;
 	int err = 0;
@@ -440,7 +441,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr,
 			}
 			break;
 		case SEQUENCE_ELEMENT_TYPE_SLEEP:
-			usleep(s->data.sleep);
+			nanosleep(&sleep, NULL);
 			break;
 		case SEQUENCE_ELEMENT_TYPE_EXEC:
 			err = system(s->data.exec);
diff --git a/test/mixtest.c b/test/mixtest.c
index 57ca5d53..f0940344 100644
--- a/test/mixtest.c
+++ b/test/mixtest.c
@@ -77,7 +77,7 @@ static double detect_cpu_clock()
 	rdtscll(tsc_begin);
 	clock_gettime(CLOCK_MONOTONIC, &tm_begin);
 
-	usleep(1000000);
+	sleep(1);
 
 	rdtscll(tsc_end);
 	clock_gettime(CLOCK_MONOTONIC, &tm_end);
-- 
2.17.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

             reply	other threads:[~2019-09-02  1:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-02  1:32 Rosen Penev [this message]
2019-09-02  1:32 ` [alsa-devel] [PATCH] alsa-lib: Remove usleep usage Rosen Penev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190902013240.16591-1-rosenp@gmail.com \
    --to=rosenp@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox