geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug #12838: Fix lock test client vs. server master race and misplaced closes.

main
Robert Noland 2007-10-17 13:25:31 -07:00 committed by Eric Anholt
parent e7523d3379
commit 2c5c18fbd3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/lock.c
View File

@ -87,8 +87,6 @@ client_auth(int drmfd)
struct drm_auth auth; struct drm_auth auth;
int ret; int ret;
wait_event(0, SERVER_READY);
/* Get a client magic number and pass it to the master for auth. */ /* Get a client magic number and pass it to the master for auth. */
ret = ioctl(drmfd, DRM_IOCTL_GET_MAGIC, &auth); ret = ioctl(drmfd, DRM_IOCTL_GET_MAGIC, &auth);
if (ret == -1) if (ret == -1)
@ -172,8 +170,6 @@ static void test_open_close_locked(drmfd)
ret = drmUnlock(drmfd, lock1); ret = drmUnlock(drmfd, lock1);
if (ret != 0) if (ret != 0)
errx(1, "lock lost during open/close by same pid"); errx(1, "lock lost during open/close by same pid");
close(drmfd);
} }
static void client() static void client()
@ -181,6 +177,8 @@ static void client()
int drmfd, ret; int drmfd, ret;
unsigned int time; unsigned int time;
wait_event(0, SERVER_READY);
/* XXX: Should make sure we open the same DRM as the master */ /* XXX: Should make sure we open the same DRM as the master */
drmfd = drm_open_any(); drmfd = drm_open_any();
@ -201,6 +199,7 @@ static void client()
send_event(0, CLIENT_LOCKED); send_event(0, CLIENT_LOCKED);
ret = write(commfd[0], &time, sizeof(time)); ret = write(commfd[0], &time, sizeof(time));
close(drmfd);
exit(0); exit(0);
} }
@ -238,6 +237,8 @@ static void server()
if (client_time < unlock_time) if (client_time < unlock_time)
errx(1, "Client took lock before server released it"); errx(1, "Client took lock before server released it");
close(drmfd);
} }
int main(int argc, char **argv) int main(int argc, char **argv)