Commit Diff

Commit:
c6304ab9772cc896b95f92e3f953d98d6e08d975
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
use fd instead of pid for tx locking c->iev.ibuf.pid is our pid, not sure why, but fd is just as well as easier to use.
Actions:
Patch | Tree
commit - 99b9b3affcc7e67fc9d38ae93a48193110cef0d7
commit + c6304ab9772cc896b95f92e3f953d98d6e08d975
blob - a84579341527eb8607efab9ae3b3f48a15889d8d
blob + e00746ebf384ba0bc7a061e3cad4c88fbc8c60b9
--- control.c
+++ control.c
@@ -46,7 +46,7 @@ struct {
 	struct event	evt;
 	int		fd;
 	struct playlist	play;
-	pid_t		tx;
+	int		tx;
 } control_state = {.fd = -1, .tx = -1};
 
 struct ctl_conn {
@@ -206,7 +206,7 @@ control_close(int fd)
 	}
 
 	/* abort the transaction if running by this user */
-	if (c->iev.ibuf.pid == control_state.tx) {
+	if (control_state.tx != -1 && c->iev.ibuf.fd == control_state.tx) {
 		playlist_free(&control_state.play);
 		control_state.tx = -1;
 	}
@@ -331,13 +331,13 @@ control_dispatch_imsg(int fd, short event, void *bula)
 				main_senderr(&c->iev, "locked");
 				break;
 			}
-			control_state.tx = c->iev.ibuf.pid;
+			control_state.tx = c->iev.ibuf.fd;
 			imsg_compose_event(&c->iev, IMSG_CTL_BEGIN, 0, 0, -1,
 			    NULL, 0);
 			break;
 		case IMSG_CTL_ADD:
 			if (control_state.tx != -1 &&
-			    control_state.tx != c->iev.ibuf.pid) {
+			    control_state.tx != c->iev.ibuf.fd) {
 				main_senderr(&c->iev, "locked");
 				break;
 			}
@@ -345,7 +345,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
 			   &control_state.play,&c->iev, &imsg);
 			break;
 		case IMSG_CTL_COMMIT:
-			if (control_state.tx != c->iev.ibuf.pid) {
+			if (control_state.tx != c->iev.ibuf.fd) {
 				main_senderr(&c->iev, "locked");
 				break;
 			}