system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 00:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it compile on 64-bit architectures.

Browse source 
The biggest issue was that 16-bit atomic operations aren't supported
on all architectures.
This commit is contained in:
Pawel Jakub Dawidek 2004-05-02 17:57:49 +00:00
parent aef39ef75f
commit 0d785336d1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=128835
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sys/geom/gate/g_gate.c
View file

@ -81,7 +81,7 @@ static void
g_gate_wither(struct g_gate_softc *sc) g_gate_wither(struct g_gate_softc *sc)
{ {
atomic_set_16(&sc->sc_flags, G_GATE_FLAG_DESTROY); atomic_set_32(&sc->sc_flags, G_GATE_FLAG_DESTROY);
} }
static int static int
@ -113,7 +113,7 @@ g_gate_destroy(struct g_gate_softc *sc, boolean_t force)
bp = bioq_first(&sc->sc_inqueue); bp = bioq_first(&sc->sc_inqueue);
if (bp != NULL) { if (bp != NULL) {
bioq_remove(&sc->sc_inqueue, bp); bioq_remove(&sc->sc_inqueue, bp);
atomic_subtract_rel_16(&sc->sc_queue_count, 1); atomic_subtract_rel_32(&sc->sc_queue_count, 1);
G_GATE_LOGREQ(1, bp, "Request canceled."); G_GATE_LOGREQ(1, bp, "Request canceled.");
g_io_deliver(bp, ENXIO); g_io_deliver(bp, ENXIO);
} else { } else {
@ -126,7 +126,7 @@ g_gate_destroy(struct g_gate_softc *sc, boolean_t force)
bp = bioq_first(&sc->sc_outqueue); bp = bioq_first(&sc->sc_outqueue);
if (bp != NULL) { if (bp != NULL) {
bioq_remove(&sc->sc_outqueue, bp); bioq_remove(&sc->sc_outqueue, bp);
atomic_subtract_rel_16(&sc->sc_queue_count, 1); atomic_subtract_rel_32(&sc->sc_queue_count, 1);
G_GATE_LOGREQ(1, bp, "Request canceled."); G_GATE_LOGREQ(1, bp, "Request canceled.");
g_io_deliver(bp, ENXIO); g_io_deliver(bp, ENXIO);
} else { } else {
@ -183,7 +183,7 @@ static void
g_gate_start(struct bio *bp) g_gate_start(struct bio *bp)
{ {
struct g_gate_softc *sc; struct g_gate_softc *sc;
uint16_t qcount; uint32_t qcount;
sc = bp->bio_to->geom->softc; sc = bp->bio_to->geom->softc;
if (sc == NULL || (sc->sc_flags & G_GATE_FLAG_DESTROY) != 0) { if (sc == NULL || (sc->sc_flags & G_GATE_FLAG_DESTROY) != 0) {
@ -203,13 +203,13 @@ g_gate_start(struct bio *bp)
return; return;
} }
atomic_store_rel_16(&qcount, sc->sc_queue_count); atomic_store_rel_32(&qcount, sc->sc_queue_count);
if (qcount > sc->sc_queue_size) { if (qcount > sc->sc_queue_size) {
G_GATE_LOGREQ(1, bp, "Queue full, request canceled."); G_GATE_LOGREQ(1, bp, "Queue full, request canceled.");
g_io_deliver(bp, EIO); g_io_deliver(bp, EIO);
return; return;
} }
atomic_add_acq_16(&sc->sc_queue_count, 1); atomic_add_acq_32(&sc->sc_queue_count, 1);
bp->bio_driver1 = (void *)sc->sc_seq; bp->bio_driver1 = (void *)sc->sc_seq;
sc->sc_seq++; sc->sc_seq++;
@ -305,7 +305,7 @@ g_gate_guard(void *arg)
if (curtime.sec - bp->bio_t0.sec < 5) if (curtime.sec - bp->bio_t0.sec < 5)
continue; continue;
bioq_remove(&sc->sc_inqueue, bp); bioq_remove(&sc->sc_inqueue, bp);
atomic_subtract_rel_16(&sc->sc_queue_count, 1); atomic_subtract_rel_32(&sc->sc_queue_count, 1);
G_GATE_LOGREQ(1, bp, "Request timeout."); G_GATE_LOGREQ(1, bp, "Request timeout.");
g_io_deliver(bp, EIO); g_io_deliver(bp, EIO);
} }
@ -315,7 +315,7 @@ g_gate_guard(void *arg)
if (curtime.sec - bp->bio_t0.sec < 5) if (curtime.sec - bp->bio_t0.sec < 5)
continue; continue;
bioq_remove(&sc->sc_outqueue, bp); bioq_remove(&sc->sc_outqueue, bp);
atomic_subtract_rel_16(&sc->sc_queue_count, 1); atomic_subtract_rel_32(&sc->sc_queue_count, 1);
G_GATE_LOGREQ(1, bp, "Request timeout."); G_GATE_LOGREQ(1, bp, "Request timeout.");
g_io_deliver(bp, EIO); g_io_deliver(bp, EIO);
} }
@ -499,9 +499,9 @@ g_gate_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
return (0); return (0);
} }
bioq_remove(&sc->sc_inqueue, bp); bioq_remove(&sc->sc_inqueue, bp);
atomic_subtract_rel_16(&sc->sc_queue_count, 1); atomic_subtract_rel_32(&sc->sc_queue_count, 1);
mtx_unlock(&sc->sc_inqueue_mtx); mtx_unlock(&sc->sc_inqueue_mtx);
ggio->gctl_seq = (u_int)bp->bio_driver1; ggio->gctl_seq = (uintptr_t)bp->bio_driver1;
ggio->gctl_cmd = bp->bio_cmd; ggio->gctl_cmd = bp->bio_cmd;
ggio->gctl_offset = bp->bio_offset; ggio->gctl_offset = bp->bio_offset;
ggio->gctl_length = bp->bio_length; ggio->gctl_length = bp->bio_length;
@ -523,7 +523,7 @@ g_gate_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
} }
mtx_lock(&sc->sc_outqueue_mtx); mtx_lock(&sc->sc_outqueue_mtx);
bioq_insert_tail(&sc->sc_outqueue, bp); bioq_insert_tail(&sc->sc_outqueue, bp);
atomic_add_acq_16(&sc->sc_queue_count, 1); atomic_add_acq_32(&sc->sc_queue_count, 1);
mtx_unlock(&sc->sc_outqueue_mtx); mtx_unlock(&sc->sc_outqueue_mtx);
g_gate_release(sc); g_gate_release(sc);
return (0); return (0);
@ -538,12 +538,12 @@ g_gate_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
return (ENOENT); return (ENOENT);
mtx_lock(&sc->sc_outqueue_mtx); mtx_lock(&sc->sc_outqueue_mtx);
TAILQ_FOREACH(bp, &sc->sc_outqueue.queue, bio_queue) { TAILQ_FOREACH(bp, &sc->sc_outqueue.queue, bio_queue) {
if (ggio->gctl_seq == (u_int)bp->bio_driver1) if (ggio->gctl_seq == (uintptr_t)bp->bio_driver1)
break; break;
} }
if (bp != NULL) { if (bp != NULL) {
bioq_remove(&sc->sc_outqueue, bp); bioq_remove(&sc->sc_outqueue, bp);
atomic_subtract_rel_16(&sc->sc_queue_count, 1); atomic_subtract_rel_32(&sc->sc_queue_count, 1);
} }
mtx_unlock(&sc->sc_outqueue_mtx); mtx_unlock(&sc->sc_outqueue_mtx);
if (bp == NULL) { if (bp == NULL) {
@ -556,7 +556,7 @@ g_gate_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
if (ggio->gctl_error == EAGAIN) { if (ggio->gctl_error == EAGAIN) {
bp->bio_error = 0; bp->bio_error = 0;
G_GATE_LOGREQ(1, bp, "Request desisted."); G_GATE_LOGREQ(1, bp, "Request desisted.");
atomic_add_acq_16(&sc->sc_queue_count, 1); atomic_add_acq_32(&sc->sc_queue_count, 1);
mtx_lock(&sc->sc_inqueue_mtx); mtx_lock(&sc->sc_inqueue_mtx);
bioq_disksort(&sc->sc_inqueue, bp); bioq_disksort(&sc->sc_inqueue, bp);
mtx_unlock(&sc->sc_inqueue_mtx); mtx_unlock(&sc->sc_inqueue_mtx);

24
sys/geom/gate/g_gate.h
View file

@ -69,19 +69,19 @@ struct g_gate_softc {
int sc_unit; /* P: (read-only) */ int sc_unit; /* P: (read-only) */
uint16_t sc_ref; /* P: g_gate_list_mtx */ uint16_t sc_ref; /* P: g_gate_list_mtx */
struct g_provider *sc_provider; /* P: (read-only) */ struct g_provider *sc_provider; /* P: (read-only) */
uint16_t sc_flags; /* P: (read-only) */ uint32_t sc_flags; /* P: (read-only) */
struct bio_queue_head sc_inqueue; /* P: sc_inqueue_mtx */ struct bio_queue_head sc_inqueue; /* P: sc_inqueue_mtx */
struct mtx sc_inqueue_mtx; struct mtx sc_inqueue_mtx;
struct bio_queue_head sc_outqueue; /* P: sc_outqueue_mtx */ struct bio_queue_head sc_outqueue; /* P: sc_outqueue_mtx */
struct mtx sc_outqueue_mtx; struct mtx sc_outqueue_mtx;
uint16_t sc_queue_count; /* P: (atomic) */ uint32_t sc_queue_count; /* P: (atomic) */
uint16_t sc_queue_size; /* P: (read-only) */ uint32_t sc_queue_size; /* P: (read-only) */
u_int sc_timeout; /* P: (read-only) */ u_int sc_timeout; /* P: (read-only) */
struct callout sc_callout; /* P: (modified only struct callout sc_callout; /* P: (modified only
from callout from callout
thread) */ thread) */
u_int sc_seq; /* P: (modified only uintptr_t sc_seq; /* P: (modified only
from g_down from g_down
thread) */ thread) */
LIST_ENTRY(g_gate_softc) sc_next; /* P: g_gate_list_mtx */ LIST_ENTRY(g_gate_softc) sc_next; /* P: g_gate_list_mtx */
@ -131,13 +131,13 @@ struct g_gate_ctl_destroy {
}; };
struct g_gate_ctl_io { struct g_gate_ctl_io {
u_int gctl_version; u_int gctl_version;
int gctl_unit; int gctl_unit;
u_int gctl_seq; uintptr_t gctl_seq;
u_int gctl_cmd; u_int gctl_cmd;
off_t gctl_offset; off_t gctl_offset;
off_t gctl_length; off_t gctl_length;
void *gctl_data; void *gctl_data;
int gctl_error; int gctl_error;
}; };
#endif /* !_G_GATE_H_ */ #endif /* !_G_GATE_H_ */