Summary: | [PATCH] audio/jack: ALSA driver is broken | ||
---|---|---|---|
Product: | Ports & Packages | Reporter: | Dmitry Marakasov <amdmi3> |
Component: | Individual Port(s) | Assignee: | freebsd-multimedia (Nobody) <multimedia> |
Status: | Closed FIXED | ||
Severity: | Affects Only Me | CC: | multimedia |
Priority: | Normal | ||
Version: | Latest | ||
Hardware: | Any | ||
OS: | Any |
Description
Dmitry Marakasov
2012-05-16 17:20:02 UTC
Responsible Changed From-To: freebsd-ports-bugs->freebsd-multimedia Over to maintainer (via the GNATS Auto Assign Tool) * Dmitry Marakasov (amdmi3@amdmi3.ru) wrote: > Since the second argument of clock_nanosleep (flags) is 0, ts still specifies a relative time, so theoretically the call may be replaced with simple nanosleep(&ts, NULL). I'm, however, unaware of differences between CLOCK_MONOTONIC and other clock types, as well as which of them is used by FreeBSD's nanosleep(), so it may have implications. NB: the same fix is used in multimedia/gavl file:///usr/ports/multimedia/gavl/files/patch-gavl-time.c and, judging from Linux man it should be safe: http://linux.die.net/man/2/nanosleep: --- POSIX.1 specifies that nanosleep() should measure time against the CLOCK_REALTIME clock. However, Linux measures the time using the CLOCK_MONOTONIC clock. This probably does not matter, since the POSIX.1 specification for clock_settime(2) says that discontinuous changes in CLOCK_REALTIME should not affect nanosleep() --- Thus, if FreeBSD nanosleep conforms to POSIX.1, it shouldn't matter for FreeBSD as well, so clock_nanosleep(CLOCK_MONOTONIC, 0, ...) -> nanosleep(...) replacement is safe. Thus, the PR is fixed by this patch (http://people.freebsd.org/~amdmi3/patch-drivers-alsa-midi-alsa_rawmidi.c): --- ./drivers/alsa-midi/alsa_rawmidi.c.orig 2008-05-29 16:26:07.000000000 +0400 +++ ./drivers/alsa-midi/alsa_rawmidi.c 2012-05-16 20:10:24.645166068 +0400 @@ -853,7 +853,7 @@ struct timespec ts; ts.tv_sec = 0; ts.tv_nsec = wait_nanosleep; - clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, NULL); + nanosleep(&ts, NULL); } int res = poll((struct pollfd*)&pfds, npfds, poll_timeout); //debug_log("midi_thread(%s): poll exit: %d", str->name, res); -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru nox 2012-05-24 19:35:56 UTC FreeBSD ports repository Modified files: audio/jack Makefile Added files: audio/jack/files patch-drivers-alsa-midi-alsa_rawmidi.c Log: - Fix alsa driver. - Bump PORTREVISION. PR: ports/167971 Submitted by: amdmi3 Revision Changes Path 1.65 +1 -1 ports/audio/jack/Makefile 1.1 +11 -0 ports/audio/jack/files/patch-drivers-alsa-midi-alsa_rawmidi.c (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Committed. Thanks! |