Merge pull request torvalds#154 from liuyuan10/fixqueuelock

Octavian Purdila · Octavian Purdila · commit 6b9bafd79902 · 2016-05-06T10:05:12.000+03:00
lkl: properly free mutex and semaphore.
diff --git a/tools/lkl/lib/posix-host.c b/tools/lkl/lib/posix-host.c
@@ -90,6 +90,12 @@ static struct lkl_sem_t *sem_alloc(int count)
 
 static void sem_free(struct lkl_sem_t *sem)
 {
+#ifdef _POSIX_SEMAPHORES
+	WARN_UNLESS(sem_destroy(&sem->sem));
+#else
+	WARN_PTHREAD(pthread_cond_destroy(&sem->cond));
+	WARN_PTHREAD(pthread_mutex_destroy(&sem->lock));
+#endif /* _POSIX_SEMAPHORES */
 	free(sem);
 }
 
diff --git a/tools/lkl/lib/virtio_net.c b/tools/lkl/lib/virtio_net.c
@@ -150,7 +150,7 @@ static void free_queue_locks(struct lkl_mutex_t **queues, int num_queues)
 		return;
 
 	for (i = 0; i < num_queues; i++)
-		lkl_host_ops.mem_free(queues[i]);
+		lkl_host_ops.mutex_free(queues[i]);
 
 	lkl_host_ops.mem_free(queues);
 }

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,12 @@ static struct lkl_sem_t *sem_alloc(int count)`
`90`	`90`
`91`	`91`	`static void sem_free(struct lkl_sem_t *sem)`
`92`	`92`	`{`
	`93`	`+#ifdef _POSIX_SEMAPHORES`
	`94`	`+ WARN_UNLESS(sem_destroy(&sem->sem));`
	`95`	`+#else`
	`96`	`+ WARN_PTHREAD(pthread_cond_destroy(&sem->cond));`
	`97`	`+ WARN_PTHREAD(pthread_mutex_destroy(&sem->lock));`
	`98`	`+#endif /* _POSIX_SEMAPHORES */`
`93`	`99`	`free(sem);`
`94`	`100`	`}`
`95`	`101`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ static void free_queue_locks(struct lkl_mutex_t **queues, int num_queues)`
`150`	`150`	`return;`
`151`	`151`
`152`	`152`	`for (i = 0; i < num_queues; i++)`
`153`		`- lkl_host_ops.mem_free(queues[i]);`
	`153`	`+ lkl_host_ops.mutex_free(queues[i]);`
`154`	`154`
`155`	`155`	`lkl_host_ops.mem_free(queues);`
`156`	`156`	`}`