d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove so*_locked(), which were backed out by mistake.

Browse Source
This commit is contained in:
Seigo Tanimura 2002-06-18 07:42:02 +00:00
parent a1aa5c8053
commit 03e4918190
9 changed files with 42 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
sys/kern/uipc_sockbuf.c
View File

@ -106,38 +106,6 @@ soisconnecting(so)
so->so_state |= SS_ISCONNECTING;
}
void
soisconnected_locked(so)
struct socket *so;
{
struct socket *head = so->so_head;
so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
so->so_state |= SS_ISCONNECTED;
if (head && (so->so_state & SS_INCOMP)) {
if ((so->so_options & SO_ACCEPTFILTER) != 0) {
so->so_upcall = head->so_accf->so_accept_filter->accf_callback;
so->so_upcallarg = head->so_accf->so_accept_filter_arg;
so->so_rcv.sb_flags |= SB_UPCALL;
so->so_options &= ~SO_ACCEPTFILTER;
so->so_upcall(so, so->so_upcallarg, 0);
return;
}
TAILQ_REMOVE(&head->so_incomp, so, so_list);
head->so_incqlen--;
so->so_state &= ~SS_INCOMP;
TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
head->so_qlen++;
so->so_state |= SS_COMP;
sorwakeup_locked(head);
wakeup_one(&head->so_timeo);
} else {
wakeup(&so->so_timeo);
sorwakeup_locked(so);
sowwakeup_locked(so);
}
}
void
soisconnected(so)
struct socket *so;
@ -161,12 +129,12 @@ soisconnected(so)
TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
head->so_qlen++;
so->so_state |= SS_COMP;
sorwakeup_locked(head);
sorwakeup(head);
wakeup_one(&head->so_timeo);
} else {
wakeup(&so->so_timeo);
sorwakeup_locked(so);
sowwakeup_locked(so);
sorwakeup(so);
sowwakeup(so);
}
}
@ -178,20 +146,8 @@ soisdisconnecting(so)
so->so_state &= ~SS_ISCONNECTING;
so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
wakeup((caddr_t)&so->so_timeo);
sowwakeup_locked(so);
sorwakeup_locked(so);
}
void
soisdisconnected_locked(so)
register struct socket *so;
{
so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED);
wakeup((caddr_t)&so->so_timeo);
sowwakeup_locked(so);
sorwakeup_locked(so);
sowwakeup(so);
sorwakeup(so);
}
void
@ -199,7 +155,11 @@ soisdisconnected(so)
register struct socket *so;
{
soisdisconnected_locked(so);
so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED);
wakeup((caddr_t)&so->so_timeo);
sowwakeup(so);
sorwakeup(so);
}
/*
@ -255,7 +215,7 @@ sonewconn(head, connstatus)
head->so_incqlen++;
}
if (connstatus) {
sorwakeup_locked(head);
sorwakeup(head);
wakeup((caddr_t)&head->so_timeo);
so->so_state |= connstatus;
}
@ -278,7 +238,7 @@ socantsendmore(so)
{
so->so_state |= SS_CANTSENDMORE;
sowwakeup_locked(so);
sowwakeup(so);
}
void
@ -287,7 +247,7 @@ socantrcvmore(so)
{
so->so_state |= SS_CANTRCVMORE;
sorwakeup_locked(so);
sorwakeup(so);
}
/*

66
sys/kern/uipc_socket2.c
View File

@ -106,38 +106,6 @@ soisconnecting(so)
so->so_state |= SS_ISCONNECTING;
}
void
soisconnected_locked(so)
struct socket *so;
{
struct socket *head = so->so_head;
so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
so->so_state |= SS_ISCONNECTED;
if (head && (so->so_state & SS_INCOMP)) {
if ((so->so_options & SO_ACCEPTFILTER) != 0) {
so->so_upcall = head->so_accf->so_accept_filter->accf_callback;
so->so_upcallarg = head->so_accf->so_accept_filter_arg;
so->so_rcv.sb_flags |= SB_UPCALL;
so->so_options &= ~SO_ACCEPTFILTER;
so->so_upcall(so, so->so_upcallarg, 0);
return;
}
TAILQ_REMOVE(&head->so_incomp, so, so_list);
head->so_incqlen--;
so->so_state &= ~SS_INCOMP;
TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
head->so_qlen++;
so->so_state |= SS_COMP;
sorwakeup_locked(head);
wakeup_one(&head->so_timeo);
} else {
wakeup(&so->so_timeo);
sorwakeup_locked(so);
sowwakeup_locked(so);
}
}
void
soisconnected(so)
struct socket *so;
@ -161,12 +129,12 @@ soisconnected(so)
TAILQ_INSERT_TAIL(&head->so_comp, so, so_list);
head->so_qlen++;
so->so_state |= SS_COMP;
sorwakeup_locked(head);
sorwakeup(head);
wakeup_one(&head->so_timeo);
} else {
wakeup(&so->so_timeo);
sorwakeup_locked(so);
sowwakeup_locked(so);
sorwakeup(so);
sowwakeup(so);
}
}
@ -178,20 +146,8 @@ soisdisconnecting(so)
so->so_state &= ~SS_ISCONNECTING;
so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
wakeup((caddr_t)&so->so_timeo);
sowwakeup_locked(so);
sorwakeup_locked(so);
}
void
soisdisconnected_locked(so)
register struct socket *so;
{
so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED);
wakeup((caddr_t)&so->so_timeo);
sowwakeup_locked(so);
sorwakeup_locked(so);
sowwakeup(so);
sorwakeup(so);
}
void
@ -199,7 +155,11 @@ soisdisconnected(so)
register struct socket *so;
{
soisdisconnected_locked(so);
so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED);
wakeup((caddr_t)&so->so_timeo);
sowwakeup(so);
sorwakeup(so);
}
/*
@ -255,7 +215,7 @@ sonewconn(head, connstatus)
head->so_incqlen++;
}
if (connstatus) {
sorwakeup_locked(head);
sorwakeup(head);
wakeup((caddr_t)&head->so_timeo);
so->so_state |= connstatus;
}
@ -278,7 +238,7 @@ socantsendmore(so)
{
so->so_state |= SS_CANTSENDMORE;
sowwakeup_locked(so);
sowwakeup(so);
}
void
@ -287,7 +247,7 @@ socantrcvmore(so)
{
so->so_state |= SS_CANTRCVMORE;
sorwakeup_locked(so);
sorwakeup(so);
}
/*

2
sys/net/rtsock.c
View File

@ -147,7 +147,7 @@ rts_attach(struct socket *so, int proto, struct thread *td)
}
rp->rcb_faddr = &route_src;
route_cb.any_count++;
soisconnected_locked(so);
soisconnected(so);
so->so_options |= SO_USELOOPBACK;
splx(s);
return 0;

2
sys/netinet/accf_data.c
View File

@ -62,6 +62,6 @@ sohasdata(struct socket *so, void *arg, int waitflag)
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
soisconnected_locked(so);
soisconnected(so);
return;
}

6
sys/netinet/accf_http.c
View File

@ -203,7 +203,7 @@ fallout:
DPRINT("fallout");
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
soisconnected_locked(so);
soisconnected(so);
return;
}
@ -285,7 +285,7 @@ fallout:
DPRINT("fallout");
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
soisconnected_locked(so);
soisconnected(so);
return;
}
@ -355,6 +355,6 @@ readmore:
gotit:
so->so_upcall = NULL;
so->so_rcv.sb_flags &= ~SB_UPCALL;
soisconnected_locked(so);
soisconnected(so);
return;
}

2
sys/netinet/tcp_input.c
View File

@ -1871,7 +1871,7 @@ process_ACK:
* we'll hang forever.
*/
if (so->so_state & SS_CANTRCVMORE) {
soisdisconnected_locked(so);
soisdisconnected(so);
callout_reset(tp->tt_2msl, tcp_maxidle,
tcp_timer_2msl, tp);
}

2
sys/netinet/tcp_reass.c
View File

@ -1871,7 +1871,7 @@ process_ACK:
* we'll hang forever.
*/
if (so->so_state & SS_CANTRCVMORE) {
soisdisconnected_locked(so);
soisdisconnected(so);
callout_reset(tp->tt_2msl, tcp_maxidle,
tcp_timer_2msl, tp);
}

2
sys/netkey/keysock.c
View File

@ -427,7 +427,7 @@ key_attach(struct socket *so, int proto, struct thread *td)
key_cb.any_count++;
kp->kp_raw.rcb_laddr = &key_src;
kp->kp_raw.rcb_faddr = &key_dst;
soisconnected_locked(so);
soisconnected(so);
so->so_options |= SO_USELOOPBACK;
splx(s);

26
sys/sys/socketvar.h
View File

@ -276,23 +276,15 @@ struct xsocket {
sofree(so); \
} while(0)
#define sorwakeup_locked(so) do { \
if (sb_notify(&(so)->so_rcv)) \
sowakeup((so), &(so)->so_rcv); \
} while (0)
#define sorwakeup(so) do { \
if (sb_notify(&(so)->so_rcv)) \
sowakeup((so), &(so)->so_rcv); \
} while (0)
#define sorwakeup(so) do { \
sorwakeup_locked(so); \
} while (0)
#define sowwakeup_locked(so) do { \
if (sb_notify(&(so)->so_snd)) \
sowakeup((so), &(so)->so_snd); \
} while (0)
#define sowwakeup(so) do { \
sowwakeup_locked(so); \
} while (0)
#define sowwakeup(so) do { \
if (sb_notify(&(so)->so_snd)) \
sowakeup((so), &(so)->so_snd); \
} while (0)
#ifdef _KERNEL
@ -402,14 +394,12 @@ int soconnect2(struct socket *so1, struct socket *so2);
int socreate(int dom, struct socket **aso, int type, int proto,
struct ucred *cred, struct thread *td);
int sodisconnect(struct socket *so);
void soisconnected_locked(struct socket *so);
void sofree(struct socket *so);
int sogetopt(struct socket *so, struct sockopt *sopt);
void sohasoutofband(struct socket *so);
void soisconnected(struct socket *so);
void soisconnecting(struct socket *so);
void soisdisconnected(struct socket *so);
void soisdisconnected_locked(struct socket *so);
void soisdisconnecting(struct socket *so);
int solisten(struct socket *so, int backlog, struct thread *td);
struct socket *