Skip to contentSkip to conversation

pcm: returning semop error code for semaphore up/down failures.

PATCH In review [email protected] 2 participants 2 messages Jan 9, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pcm: returning semop error code for semaphore up/down failures.

From: Mounesh Sutar <[email protected]>

src/pcm/pcm_direct.h +12 -2
index 91e816c..a7c0439 100644
@@ -263,7 +263,12 @@ static inline int snd_pcm_direct_semaphore_down(snd_pcm_direct_t *dmix, int sem_
 {
 	struct sembuf op[2] = { { sem_num, 0, 0 }, { sem_num, 1, SEM_UNDO } };
 	int err = semop(dmix->semid, op, 2);
-	if (err == 0) dmix->locked[sem_num]++;
+	if (err == 0) {
+		dmix->locked[sem_num]++;
+	}
+	else if (err == -1) {
+		err = -errno;
+	}
 	return err;
 }
 
@@ -271,7 +276,12 @@ static inline int snd_pcm_direct_semaphore_up(snd_pcm_direct_t *dmix, int sem_nu
 {
 	struct sembuf op = { sem_num, -1, SEM_UNDO | IPC_NOWAIT };
 	int err = semop(dmix->semid, &op, 1);
-	if (err == 0) dmix->locked[sem_num]--;
+	if (err == 0) {
+		dmix->locked[sem_num]--;
+	}
+	else if (err == -1) {
+		err = -errno;
+	}
 	return err;
 }
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 10 lines · On Mon, 09 Jan 2017 12:24:11 +0100, [email protected] wrote:

From: Mounesh Sutar <[email protected]>

src/pcm/pcm_direct.h +0 -0
index 91e816c..a7c0439 100644

src/pcm/pcm_direct.h static inline int snd_pcm_direct_semaphore_down(snd_pcm_direct_t *dmix, int sem_ · line 271

Quoted 10 lines
src/pcm/pcm_direct.h +6 -1
@@ -263,7 +263,12 @@ static inline int snd_pcm_direct_semaphore_down(snd_pcm_direct_t *dmix, int sem_
 {
 	struct sembuf op[2] = { { sem_num, 0, 0 }, { sem_num, 1, SEM_UNDO } };
 	int err = semop(dmix->semid, op, 2);
-	if (err == 0) dmix->locked[sem_num]++;
+	if (err == 0) {
+		dmix->locked[sem_num]++;
+	}
+	else if (err == -1) {
+		err = -errno;
+	}

Just a minor coding style preference:
no need for braces for a single line if/else in general.

	if (err == 0)
		dmix->locked[sem_num]++;
	else if (err == -1)
		err = -errno;

thanks,

Takashi

Quoted 20 lines
src/pcm/pcm_direct.h +6 -1
 	return err;
 }
 
@@ -271,7 +276,12 @@ static inline int snd_pcm_direct_semaphore_up(snd_pcm_direct_t *dmix, int sem_nu
 {
 	struct sembuf op = { sem_num, -1, SEM_UNDO | IPC_NOWAIT };
 	int err = semop(dmix->semid, &op, 1);
-	if (err == 0) dmix->locked[sem_num]--;
+	if (err == 0) {
+		dmix->locked[sem_num]--;
+	}
+	else if (err == -1) {
+		err = -errno;
+	}
 	return err;
 }
 
Signature · 1 line
2.7.4