mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Upon server-initiated closure of the sound device, rdesktop(1) hangs in

Browse Source 
a tight loop if the sound packet buffer is not empty.  This usually
occurs after a long playback, and is indicated by an endless stream of
"ERROR: select: Bad file descriptor" messages on stderr.

Fix: forcibly empty the sound packet buffer after closing the sound device.

PR:		115692
Submitted by:	"Eugene M. Kim" <freebsd.org@ab.ote.we.lv>
This commit is contained in:
David E. O'Brien 2007-08-23 23:53:59 +00:00
parent 78e4a1a65f
commit 12169db351
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=198228
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
net/rdesktop/files/patch-rdpsnd_oss.c Normal file
View File

@ -0,0 +1,57 @@
--- rdpsnd_oss.c.orig 2007-08-20 23:20:40.000000000 -0700
+++ rdpsnd_oss.c 2007-08-20 23:21:51.000000000 -0700
@@ -51,6 +51,35 @@
} packet_queue[MAX_QUEUE];
static unsigned int queue_hi, queue_lo;
+/** Frees the first audio packet in the queue (that is, packet_queue[queue_lo]),
+ * sending a completion notification back to the server.
+ *
+ * @return True if the packet queue has become empty; False otherwise.&nbsp;
+ *
+ * If the packet queue is not empty, queue_lo will point at the next packet to
+ * play.
+ */
+static BOOL
+packet_done(void)
+{
+ struct audio_packet *packet = &packet_queue[queue_lo++];
+ queue_lo %= MAX_QUEUE;
+ rdpsnd_send_completion(packet->tick, packet->index);
+ free(packet->s.data);
+ return (queue_lo == queue_hi);
+}
+
+/** Discards all audio packets queued, sending completion notifications back to
+ * the server as necessary.
+ */
+static void
+clear_queue(void)
+{
+ while (queue_lo != queue_hi)
+ packet_done();
+ g_dsp_busy = False;
+}
+
BOOL
wave_out_open(void)
{
@@ -74,6 +103,7 @@
wave_out_close(void)
{
close(g_dsp_fd);
+ clear_queue();
}
BOOL
@@ -277,9 +307,7 @@
if (elapsed >= (duration * 85) / 100)
{
- rdpsnd_send_completion(packet->tick, packet->index);
- free(out->data);
- queue_lo = (queue_lo + 1) % MAX_QUEUE;
+ packet_done();
started = False;
}
else