Module Name: src
Committed By: jmcneill
Date: Tue Jul 12 00:57:19 UTC 2011
Modified Files:
src/sys/dev/dtv: dtv_buffer.c dtv_device.c dtvvar.h
Log Message:
- use separate locks for ingress and egress queues
- increase ts block and buffer sizes
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/dtv/dtv_buffer.c \
src/sys/dev/dtv/dtv_device.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dtv/dtvvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dtv/dtv_buffer.c
diff -u src/sys/dev/dtv/dtv_buffer.c:1.3 src/sys/dev/dtv/dtv_buffer.c:1.4
--- src/sys/dev/dtv/dtv_buffer.c:1.3 Sat Jul 9 21:08:40 2011
+++ src/sys/dev/dtv/dtv_buffer.c Tue Jul 12 00:57:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_buffer.c,v 1.3 2011/07/09 21:08:40 jmcneill Exp $ */
+/* $NetBSD: dtv_buffer.c,v 1.4 2011/07/12 00:57:19 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <[email protected]>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtv_buffer.c,v 1.3 2011/07/09 21:08:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtv_buffer.c,v 1.4 2011/07/12 00:57:19 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -46,7 +46,8 @@
#include <dev/dtv/dtvvar.h>
-#define PAGE_ALIGN(a) (((a) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
+#define BLOCK_SIZE DTV_DEFAULT_BLOCKSIZE
+#define BLOCK_ALIGN(a) (((a) + BLOCK_SIZE - 1) & ~(BLOCK_SIZE - 1))
static void
dtv_buffer_write(struct dtv_softc *sc, const uint8_t *buf, size_t buflen)
@@ -60,16 +61,18 @@
KASSERT(buflen == TS_PKTLEN);
while (resid > 0) {
- mutex_enter(&ds->ds_lock);
+ mutex_enter(&ds->ds_ingress_lock);
if (SIMPLEQ_EMPTY(&ds->ds_ingress)) {
aprint_debug_dev(sc->sc_dev,
"dropping sample (%zu)\n", resid);
- mutex_exit(&ds->ds_lock);
+ mutex_exit(&ds->ds_ingress_lock);
return;
}
db = SIMPLEQ_FIRST(&ds->ds_ingress);
+ mutex_exit(&ds->ds_ingress_lock);
+
avail = min(db->db_length - db->db_bytesused, resid);
if (dtv_scatter_io_init(&ds->ds_data,
db->db_offset + db->db_bytesused, avail, &sio)) {
@@ -80,13 +83,15 @@
}
if (db->db_bytesused == db->db_length) {
+ mutex_enter(&ds->ds_ingress_lock);
SIMPLEQ_REMOVE_HEAD(&ds->ds_ingress, db_entries);
+ mutex_exit(&ds->ds_ingress_lock);
+ mutex_enter(&ds->ds_egress_lock);
SIMPLEQ_INSERT_TAIL(&ds->ds_egress, db, db_entries);
- cv_broadcast(&ds->ds_sample_cv);
selnotify(&ds->ds_sel, 0, 0);
+ cv_broadcast(&ds->ds_sample_cv);
+ mutex_exit(&ds->ds_egress_lock);
}
-
- mutex_exit(&ds->ds_lock);
}
}
@@ -129,7 +134,7 @@
off_t offset;
int error;
- nbufs = PAGE_ALIGN(bufsize) / PAGE_SIZE;
+ nbufs = BLOCK_ALIGN(bufsize) / BLOCK_SIZE;
error = dtv_scatter_buf_set_size(&ds->ds_data, bufsize);
if (error)
@@ -167,8 +172,8 @@
for (i = 0; i < nbufs; i++) {
ds->ds_buf[i]->db_offset = offset;
ds->ds_buf[i]->db_bytesused = 0;
- ds->ds_buf[i]->db_length = PAGE_SIZE;
- offset += PAGE_SIZE;
+ ds->ds_buf[i]->db_length = BLOCK_SIZE;
+ offset += BLOCK_SIZE;
}
return 0;
@@ -201,10 +206,10 @@
struct dtv_stream *ds = &sc->sc_stream;
unsigned int i;
- mutex_enter(&ds->ds_lock);
+ mutex_enter(&ds->ds_ingress_lock);
for (i = 0; i < ds->ds_nbufs; i++)
dtv_stream_enqueue(ds, ds->ds_buf[i]);
- mutex_exit(&ds->ds_lock);
+ mutex_exit(&ds->ds_ingress_lock);
return 0;
}
@@ -214,12 +219,14 @@
{
struct dtv_stream *ds = &sc->sc_stream;
- mutex_enter(&ds->ds_lock);
+ mutex_enter(&ds->ds_ingress_lock);
while (SIMPLEQ_FIRST(&ds->ds_ingress))
SIMPLEQ_REMOVE_HEAD(&ds->ds_ingress, db_entries);
+ mutex_exit(&ds->ds_ingress_lock);
+ mutex_enter(&ds->ds_egress_lock);
while (SIMPLEQ_FIRST(&ds->ds_egress))
SIMPLEQ_REMOVE_HEAD(&ds->ds_egress, db_entries);
- mutex_exit(&ds->ds_lock);
+ mutex_exit(&ds->ds_egress_lock);
return 0;
}
@@ -235,32 +242,35 @@
int error;
while (uio->uio_resid > 0) {
- mutex_enter(&ds->ds_lock);
-
retry:
+ mutex_enter(&ds->ds_egress_lock);
while (SIMPLEQ_EMPTY(&ds->ds_egress)) {
if (flags & IO_NDELAY) {
- mutex_exit(&ds->ds_lock);
- return bread ? 0 : EWOULDBLOCK;
+ mutex_exit(&ds->ds_egress_lock);
+ return EWOULDBLOCK;
}
- error = cv_wait_sig(&ds->ds_sample_cv, &ds->ds_lock);
+ error = cv_wait_sig(&ds->ds_sample_cv,
+ &ds->ds_egress_lock);
if (error) {
- mutex_exit(&ds->ds_lock);
+ mutex_exit(&ds->ds_egress_lock);
return EINTR;
}
}
db = SIMPLEQ_FIRST(&ds->ds_egress);
+ mutex_exit(&ds->ds_egress_lock);
if (db->db_bytesused == 0) {
+ mutex_enter(&ds->ds_egress_lock);
db = dtv_stream_dequeue(ds);
+ mutex_exit(&ds->ds_egress_lock);
+ mutex_enter(&ds->ds_ingress_lock);
dtv_stream_enqueue(ds, db);
+ mutex_exit(&ds->ds_ingress_lock);
ds->ds_bytesread = 0;
goto retry;
}
- mutex_exit(&ds->ds_lock);
-
len = min(uio->uio_resid, db->db_bytesused - ds->ds_bytesread);
offset = db->db_offset + ds->ds_bytesread;
@@ -273,10 +283,12 @@
}
if (ds->ds_bytesread >= db->db_bytesused) {
- mutex_enter(&ds->ds_lock);
+ mutex_enter(&ds->ds_egress_lock);
db = dtv_stream_dequeue(ds);
+ mutex_exit(&ds->ds_egress_lock);
+ mutex_enter(&ds->ds_ingress_lock);
dtv_stream_enqueue(ds, db);
- mutex_exit(&ds->ds_lock);
+ mutex_exit(&ds->ds_ingress_lock);
ds->ds_bytesread = 0;
}
@@ -290,14 +302,26 @@
{
struct dtv_stream *ds = &sc->sc_stream;
int revents = 0;
+#ifdef DTV_BUFFER_DEBUG
+ struct dtv_buffer *db;
+ size_t bufsize = 0;
+#endif
- mutex_enter(&ds->ds_lock);
+ mutex_enter(&ds->ds_egress_lock);
if (!SIMPLEQ_EMPTY(&ds->ds_egress)) {
+#ifdef DTV_BUFFER_DEBUG
+ SIMPLEQ_FOREACH(db, &ds->ds_egress, db_entries)
+ bufsize += db->db_bytesused;
+#endif
revents |= (POLLIN | POLLOUT | POLLPRI);
} else {
selrecord(l, &ds->ds_sel);
}
- mutex_exit(&ds->ds_lock);
+ mutex_exit(&ds->ds_egress_lock);
+
+#ifdef DTV_BUFFER_DEBUG
+ device_printf(sc->sc_dev, "%s: bufsize=%zu\n", __func__, bufsize);
+#endif
return revents;
}
Index: src/sys/dev/dtv/dtv_device.c
diff -u src/sys/dev/dtv/dtv_device.c:1.3 src/sys/dev/dtv/dtv_device.c:1.4
--- src/sys/dev/dtv/dtv_device.c:1.3 Sat Jul 9 19:24:10 2011
+++ src/sys/dev/dtv/dtv_device.c Tue Jul 12 00:57:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_device.c,v 1.3 2011/07/09 19:24:10 jmcneill Exp $ */
+/* $NetBSD: dtv_device.c,v 1.4 2011/07/12 00:57:19 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <[email protected]>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtv_device.c,v 1.3 2011/07/09 19:24:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtv_device.c,v 1.4 2011/07/12 00:57:19 jmcneill Exp $");
#include <sys/types.h>
#include <sys/conf.h>
@@ -57,8 +57,13 @@
.d_open = dtvopen,
.d_close = dtvclose,
.d_read = dtvread,
+ .d_write = nowrite,
.d_ioctl = dtvioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
.d_poll = dtvpoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
.d_flag = D_OTHER|D_MPSAFE,
};
@@ -99,7 +104,8 @@
ds->ds_buf = NULL;
SIMPLEQ_INIT(&ds->ds_ingress);
SIMPLEQ_INIT(&ds->ds_egress);
- mutex_init(&ds->ds_lock, MUTEX_DEFAULT, IPL_VM);
+ mutex_init(&ds->ds_egress_lock, MUTEX_DEFAULT, IPL_VM);
+ mutex_init(&ds->ds_ingress_lock, MUTEX_DEFAULT, IPL_VM);
cv_init(&ds->ds_sample_cv, "dtv");
selinit(&ds->ds_sel);
dtv_scatter_buf_init(&ds->ds_data);
@@ -112,7 +118,7 @@
dtv_device_get_devinfo(sc, &info);
aprint_naive("\n");
- aprint_normal(": '%s'", info.name);
+ aprint_normal(": %s", info.name);
switch (info.type) {
case FE_QPSK:
aprint_normal(" [QPSK]");
@@ -137,7 +143,8 @@
struct dtv_stream *ds = &sc->sc_stream;
cv_destroy(&ds->ds_sample_cv);
- mutex_destroy(&ds->ds_lock);
+ mutex_destroy(&ds->ds_ingress_lock);
+ mutex_destroy(&ds->ds_egress_lock);
seldestroy(&ds->ds_sel);
dtv_buffer_realloc(sc, 0);
dtv_scatter_buf_destroy(&ds->ds_data);
@@ -275,9 +282,6 @@
return dtv_buffer_poll(sc, events, l);
}
- printf("%s: DTVDEV = 0x%x, events = 0x%x\n",
- __func__, DTVDEV(dev), events);
-
return POLLERR;
}
Index: src/sys/dev/dtv/dtvvar.h
diff -u src/sys/dev/dtv/dtvvar.h:1.2 src/sys/dev/dtv/dtvvar.h:1.3
--- src/sys/dev/dtv/dtvvar.h:1.2 Sat Jul 9 17:55:20 2011
+++ src/sys/dev/dtv/dtvvar.h Tue Jul 12 00:57:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtvvar.h,v 1.2 2011/07/09 17:55:20 jmcneill Exp $ */
+/* $NetBSD: dtvvar.h,v 1.3 2011/07/12 00:57:19 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <[email protected]>
@@ -38,7 +38,8 @@
#include <dev/dtv/dtvif.h>
#include <dev/dtv/dtv_scatter.h>
-#define DTV_DEFAULT_BUFSIZE (128 * PAGE_SIZE)
+#define DTV_DEFAULT_BLOCKSIZE (32 * PAGE_SIZE)
+#define DTV_DEFAULT_BUFSIZE (32 * DTV_DEFAULT_BLOCKSIZE)
#define TS_PKTLEN 188
#define TS_HAS_SYNC(_tspkt) ((_tspkt)[0] == 0x47)
@@ -58,7 +59,7 @@
struct dtv_buffer **ds_buf;
struct dtv_scatter_buf ds_data;
struct dtv_sample_queue ds_ingress, ds_egress;
- kmutex_t ds_lock;
+ kmutex_t ds_ingress_lock, ds_egress_lock;
kcondvar_t ds_sample_cv;
struct selinfo ds_sel;
uint32_t ds_bytesread;
