5af666a94e
Currently timeout and buffer size are hard-coded in the fx2lafw driver which is non-optimal if we want to get good results at both high and low sample rates. The timeout is hard-coded to 40ms, which doesn't work well when sampling at a low sample rate. E.g. at 20kHz filling all available buffer space alone takes 6 seconds. So naturally we'll see a lot of transfers timeout in this case. The buffer size is hard-coded to 4096 bytes, which does not work well with high sample rates. E.g. at 24MHz these 4096 bytes are enough space for 0.17ms of data. The total buffer size is enough for about 5ms of data. Sooner or later the application won't be able to resubmit a transfer within this time span and the device will abort data acquisition. Usually this happens within the first few seconds of sampling. This patch adds a few new helper functions which calculate the buffer size and timeout based on the current sample rate. The buffer size is chosen to be large enough to hold about 10ms of data and it also must be a multiple of 512 bytes since the firmware will send us the data in 512 byte chunks. The timeout is set to the time it would take to fill the whole available buffer space plus a 25% headroom to accommodate for jitter. This is more than enough, but there is no need to make the timeout a tight deadline, since it is only meant as a last resort in case the device stops submitting data. And in this case data acquisition will be aborted anyway. The patch also limits the the number of transfers so that the total buffer space is not much more of 500ms. This will ensure that we do not have to wait too long when aborting data acquisition. This patch also significantly reduces the number of context switches when sampling at a higher sample rate. On my system for example the CPU load of sigrok-cli when sampling at 24MHz goes down from ~25% to 3-4%. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
||
|---|---|---|
| contrib | ||
| hardware | ||
| input | ||
| output | ||
| .gitignore | ||
| COPYING | ||
| Doxyfile | ||
| Makefile.am | ||
| NEWS | ||
| README | ||
| autogen.sh | ||
| backend.c | ||
| configure.ac | ||
| datastore.c | ||
| device.c | ||
| filter.c | ||
| hwdriver.c | ||
| libsigrok.pc.in | ||
| log.c | ||
| session.c | ||
| session_driver.c | ||
| session_file.c | ||
| sigrok-internal.h | ||
| sigrok-proto.h | ||
| sigrok.h.in | ||
| strutil.c | ||
| version.c | ||
README
------------------------------------------------------------------------------- README ------------------------------------------------------------------------------- The sigrok project aims at creating a portable, cross-platform, Free/Libre/Open-Source logic analyzer software that supports various logic analyzer hardware products. libsigrok is a shared library written in C which provides the basic API for talking to logic analyzer hardware and reading/writing the acquired data into various input/output file formats. Requirements ------------ - git - gcc (>= 4.0) - make - autoconf >= 2.63 - automake >= 1.11 - libtool - pkg-config >= 0.22 - libglib >= 2.28.0 - libusb >= 1.0.5 (for most logic analyzer hardware) - libzip >= 0.8 - libftdi >= 0.16 (for some logic analyzer hardware) - libudev >= 151 (for some logic analyzer hardware) Building and installing ----------------------- In order to get the libsigrok source code and build it, run: $ git clone git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok $ cd sigrok/libsigrok $ ./autogen.sh $ ./configure $ make For installing libsigrok: $ make install Please see the following wiki pages for more detailed instructions: http://sigrok.org/wiki/Linux http://sigrok.org/wiki/Mac_OS_X http://sigrok.org/wiki/Windows http://sigrok.org/wiki/FreeBSD Firmware -------- Some devices supported by libsigrok need a firmware to be uploaded before the device can be used. The default location where libsigrok expects the firmware files is: $prefix/share/sigrok-firmware ($prefix is usually /usr/local or /usr, depending on your ./configure options) For further information see: http://sigrok.org/wiki/Firmware Mailing lists ------------- There are two mailing lists for sigrok/libsigrok: https://lists.sourceforge.net/lists/listinfo/sigrok-devel https://lists.sourceforge.net/lists/listinfo/sigrok-commits IRC --- You can find the sigrok developers in the #sigrok IRC channel on Freenode. Website ------- http://sigrok.org