summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/core-util.c
Commit message (Collapse)AuthorAgeFilesLines
* revive solaris moduleFinn Thain2009-03-311-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Wed, 4 Mar 2009, Lennart Poettering wrote: [snip] > > This patch disables link map/library versioning unless ld is GNU ld. > > Another approach for solaris would be to use that linker's -M option, > > but I couldn't make that work (due to undefined mainloop, browse and > > simple symbols when linking pacat. I can post the errors if anyone is > > intested.) > > The linking in PA is a bit weird since we have a cyclic dependency > between libpulse and libpulsecommon which however is not explicit. Could that affect the pacat link somehow? What are the implications for client apps that link with the non-versioned libraries I've been building on solaris? [snip] > > struct userdata { > > pa_core *core; > > @@ -87,15 +92,24 @@ struct userdata { > > > > pa_memchunk memchunk; > > > > - unsigned int page_size; > > - > > uint32_t frame_size; > > - uint32_t buffer_size; > > - unsigned int written_bytes, read_bytes; > > + int32_t buffer_size; > > + volatile uint64_t written_bytes, read_bytes; > > + pa_mutex *written_bytes_lock; > > Hmm, we generally try do do things without locking in PA. This smells as > if it was solvable using atomic ints as well. > > Actually, looking at this again I get the impression these mutex are > completely unnecessary here. All functions that lock these mutexes are > called from the IO thread so no locking should be nessary. > > Please don't use volatile here. I am pretty sure it is a misuse. Also > see http://kernel.org/doc/Documentation/volatile-considered-harmful.txt > which applies here too I think. OK, I've removed the locks. For some reason I thought that the get_latency function was called from two different threads. > > +static void sink_set_volume(pa_sink *s) { > > + struct userdata *u; > > + audio_info_t info; > > + > > + pa_assert_se(u = s->userdata); > > + > > + if (u->fd >= 0) { > > + AUDIO_INITINFO(&info); > > + > > + info.play.gain = pa_cvolume_avg(&s->virtual_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM; > > + assert(info.play.gain <= AUDIO_MAX_GAIN); > > I'd prefer if you'd use pa_cvolume_max here instead of pa_cvolume_avg() > because this makes the volume independant of the balance. > > > - info.play.error = 0; > > + info.play.gain = pa_cvolume_avg(&s->virtual_volume) * AUDIO_MAX_GAIN / PA_VOLUME_NORM; > > + assert(info.play.gain <= AUDIO_MAX_GAIN); > > Same here. (i.e. for the source) Done and done. > > + if (u->sink->thread_info.rewind_requested) > > + pa_sink_process_rewind(u->sink, 0); > > This is correct. > > > > > err = ioctl(u->fd, AUDIO_GETINFO, &info); > > pa_assert(err >= 0); > > Hmm, if at all this should be pa_assert_se(), not pa_assert() (so that > it is not defined away by -DNDEBUG). However I'd prefer if the error > would be could correctly. (I see that this code is not yours, but > still...) Done. > > + case EINTR: > > + break; > > I think you should simply try again in this case... Done. > > + case EAGAIN: > > + u->buffer_size = u->buffer_size * 18 / 25; > > + u->buffer_size -= u->buffer_size % u->frame_size; > > + u->buffer_size = PA_MAX(u->buffer_size, (int32_t)MIN_BUFFER_SIZE); > > + pa_sink_set_max_request(u->sink, u->buffer_size); > > + pa_log("EAGAIN. Buffer size is now %u bytes (%llu buffered)", u->buffer_size, buffered_bytes); > > + break; > > Hmm, care to explain this? EAGAIN happens when the user requests a buffer size that is too large for the STREAMS layer to accept. We end up looping with EAGAIN every time we try to write out the rest of the buffer, which burns enough CPU time to trip the CPU limit. So, I reduce the buffer size with each EAGAIN. This gets us reasonably close to the largest usable buffer size. (Perhaps there's a better way to determine what that limit is, but I don't know how.) > > + > > + pa_rtpoll_set_timer_absolute(u->rtpoll, xtime0 + pa_bytes_to_usec(buffered_bytes / 2, &u->sink->sample_spec)); > > + } else { > > + pa_rtpoll_set_timer_disabled(u->rtpoll); > > } > > Hmm, you schedule audio via timers? Is that a good idea? Perhaps not. I won't know until I test on more hardware. But, given that we have rt priority and high resolution timers on solaris, I think it is OK in theory... The reason I used a timer was to minimise CPU usage and avoid the CPU limit. Recall that getting woken up by poll is not an option for playback unfortunately. We can arrange for a signal when the FD becomes writable, but that throws out the whole buffer size concept, which acts to reduce latency. > That really only makes sense if you have to deal with large buffers and > support rewinding. I've implemented rewind support, but I'm still not sure that I have understood the concept; I take it that we "rewind" (from the point-of-view of the renderer, not the sink) so that some rendered but as yet unplayed portion of the memblock/buffers can then be rendered again? > Please keep in mind that the system clock and the sound card clock > deviate. If you use the system timers to do PCM scheduling ou might need > a pa_smoother object that is able to estimate the deviation for you. Actually, in an earlier version I did use a smoother (after reading about that in the wiki). But because of the non-monotonic sample counter (bug?) I decided that it probably wasn't worth the added complexity so I removed it. I'll put the smoother back if I can figure out the problem with the sample counter. > > > + u->frame_size = pa_frame_size(&ss); > > > > - if ((fd = open(p = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), mode | O_NONBLOCK)) < 0) > > + u->buffer_size = 16384; > > It would appear more appropriate to me if the buffer size is adjusted by > the sample spec used. Done. > One last thing: it would probably be a good idea to allocate a pa_card > object and attach the sink and the source to it. It is possible to open /dev/audio twice by loading the solaris module twice -- once for the sink (passing record=0) and once for source (passing playback=0), thus giving seperate threads/LWPs for source and sink. It might be misleading to allocate two cards in that situation? > Right now pa_cards are mostly useful for switching profiles but even if > you do not allow switching profiles on-the-fly it is of some value to > find out via the cards object which source belongs to which sink. > > Otherwise I am happy! > > Thanks for your patch! I'd be thankful if you could fix the issues > pointed out and prepare another patch on top of current git! No problem. Patch follows. It also includes a portability fix for pa_realpath and a fix for a bug in the pa_signal_new() error path that causes signal data be freed if you attempt to register the same signal twice. > I hope I answered all your questions, Your answers were very helpful, thanks. Finn > > Lennart > >
* Small fix for MacOSX compatLennart Poettering2009-03-271-1/+1
| | | | Issue originally pointed out by Igor Zubkov.
* revive solaris moduleFinn Thain2009-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Hi All, This patch fixes the solaris audio device source and sink, and fixes some portability issues that break the build on solaris. Questions and comments welcomed. I've tested this patch only with OpenSolaris Express snv 103. Eventually I hope to be able to test a few older releases and older hardware (though it is hard to say whether there is much interest in those). This is my first brush with pulseaudio and so I read the wiki docs and some of the source code but I'm still unsure of a few things. In particular I'm wondering about rewind processing, corking and what (if anything) the module needs for those. I'm also unclear on the implications of thread_info.buffer_size, .fragment_size and .max_request, and whether my code is correct or not. This patch disables link map/library versioning unless ld is GNU ld. Another approach for solaris would be to use that linker's -M option, but I couldn't make that work (due to undefined mainloop, browse and simple symbols when linking pacat. I can post the errors if anyone is intested.) Thanks, Finn Thain
* pulsecore: don't leak p when make_random_dir_and_link()Marc-André Lureau2009-02-191-0/+1
|
* pulsecore: don't leak d in case of errorMarc-André Lureau2009-02-191-0/+1
|
* pulsecore: use r returned from fgets()Marc-André Lureau2009-02-191-1/+1
|
* introduce pa_realpath()Lennart Poettering2009-02-181-0/+25
|
* export pa_match()Lennart Poettering2009-02-181-3/+3
|
* A few MacOS X portability fixesLennart Poettering2009-02-061-0/+4
| | | | | | Based on patches contributed by "Tron". See bug #478.
* add new calls pa_replace() and pa_unescape()Lennart Poettering2009-02-041-0/+47
|
* add API pa_ncpus()Lennart Poettering2009-01-221-0/+12
|
* NetBSD doesn't know getgrnam_r()/getpwnam_r()Jared D. McNeill2009-01-221-9/+39
| | | | Signed-off-by: Lennart Poettering <lennart@poettering.net>
* Add new pa_reduce() and pa_gcd() functionsLennart Poettering2009-01-101-0/+24
|
* add new API function pa_in_valgrind() to check forLennart Poettering2008-10-041-0/+15
|
* a few FreeBSD fixes, from alexisLennart Poettering2008-10-011-1/+1
| | | | Signed-off-by: Lennart Poettering <lennart@poettering.net>
* have make_random_dir respect $TMPDIRStelian Ionescu2008-09-291-7/+19
| | | | | | | with the attached patch, make_random_dir first tries to use $TMPDIR, then $TMP finally defaulting to "/tmp" Signed-off-by: Lennart Poettering <lennart@poettering.net>
* make sure ~/.pulse exists before we create the runtime dir link beneath itLennart Poettering2008-09-121-3/+8
|
* include build and runtime host information in debug outputLennart Poettering2008-09-051-0/+8
|
* Rework pa_machine_id() a bitLennart Poettering2008-09-031-10/+27
| | | | | Guarantee this function never fails, use POSIX gethostid as last resort. Add comments.
* call close() in a loop to catch EINTRLennart Poettering2008-08-261-1/+9
|
* add a few missing castsLennart Poettering2008-08-201-1/+1
|
* add a few more gcc warning flags and fix quite a few problems found by doing soLennart Poettering2008-08-191-35/+38
|
* free regex_t after useLennart Poettering2008-08-091-4/+11
|
* set errno properly in all functions from core-util.cLennart Poettering2008-08-091-23/+95
|
* add locale support to pa_parse_boolean()Lennart Poettering2008-08-091-0/+35
|
* remove some leftover debug stringLennart Poettering2008-08-071-1/+1
|
* Modify pa_state_path() to take an additional argument for prepending the ↵Lennart Poettering2008-08-071-5/+18
| | | | machine id to the file name.
* Rework state/runtime directory logicLennart Poettering2008-08-071-26/+221
| | | | | | | The runtime directory is now guaranteed to be in /tmp which will hopefully provide support for POSIX file locking and UNIX sockets. The state directory stays in $HOME.
* add new function pa_machine_id()Lennart Poettering2008-08-071-0/+44
|
* fix a few potential bad memory accessesLennart Poettering2008-08-061-2/+7
|
* don't pass rediculously high values to umask()Lennart Poettering2008-07-301-1/+1
|
* fix two thinkos in signal reset/close_all codeLennart Poettering2008-07-291-9/+14
|
* Properly check for home directoryLennart Poettering2008-06-211-6/+4
|
* get rid of svn $ keywordsLennart Poettering2008-06-181-2/+0
|
* replace pa_atof() by pa_atod() because floats are lameLennart Poettering2008-06-111-9/+5
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2506 fefdeb5f-60dc-0310-8127-8f9354f1896f
* add new functions pa_state_path()/pa_get_state_dir(), change return value of ↵Lennart Poettering2008-05-211-11/+53
| | | | | | pa_startswith()/pa_endswith() pa_bool, add pa_in_system_mode() and pa_streq(); alow pa_unlock_lockfile() without file name spec git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2470 fefdeb5f-60dc-0310-8127-8f9354f1896f
* fix pa_close_all() to make it actually work as advertisedLennart Poettering2008-05-181-11/+20
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2464 fefdeb5f-60dc-0310-8127-8f9354f1896f
* merge glitch-free branch back into trunkLennart Poettering2008-05-151-94/+517
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
* make sure to create ~/.pulse before using any configuration file from itLennart Poettering2007-11-241-1/+8
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2078 fefdeb5f-60dc-0310-8127-8f9354f1896f
* Properly terminate pa_readlink() strings. Patch from Sjoerd Simons. Closes #149Lennart Poettering2007-11-041-1/+1
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2019 fefdeb5f-60dc-0310-8127-8f9354f1896f
* make rtprio and nice level actually configurableLennart Poettering2007-11-011-24/+63
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2014 fefdeb5f-60dc-0310-8127-8f9354f1896f
* fix commentLennart Poettering2007-11-011-1/+1
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2006 fefdeb5f-60dc-0310-8127-8f9354f1896f
* make gcc shut up a bit moreLennart Poettering2007-10-291-1/+1
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1987 fefdeb5f-60dc-0310-8127-8f9354f1896f
* add new pa_readlink() APILennart Poettering2007-10-291-0/+24
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1974 fefdeb5f-60dc-0310-8127-8f9354f1896f
* merge 'lennart' branch back into trunk.Lennart Poettering2007-10-281-167/+472
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
* Kill spaces on EOLLennart Poettering2007-05-291-2/+2
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1465 fefdeb5f-60dc-0310-8127-8f9354f1896f
* build fix for systems lacking capability suppoort. (Problem identified and ↵Lennart Poettering2007-05-281-0/+4
| | | | | | original patch supplied by Diego Petteno git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1462 fefdeb5f-60dc-0310-8127-8f9354f1896f
* when called with the setid bit change euid to uid sooner to make sure that ↵Lennart Poettering2007-05-251-3/+33
| | | | | | we can access our own files even when we dropped most capabilities. (Closes #21) git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1455 fefdeb5f-60dc-0310-8127-8f9354f1896f
* Add a wrapper around close() to work around Windows' ass backwards way ofPierre Ossman2007-02-141-1/+21
| | | | | | | handling sockets. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1429 fefdeb5f-60dc-0310-8127-8f9354f1896f
* Add copyright notices to all relevant files. (based on svn log)Pierre Ossman2007-02-131-0/+4
| | | | git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1426 fefdeb5f-60dc-0310-8127-8f9354f1896f
generated by cgit (git 2.34.1) at 2024-04-24 22:43:57 +0000