Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-25 22:07:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Eric Norum to correct bug induced by select() patch.

Browse Source
This commit is contained in:
Joel Sherrill
1999-02-05 00:29:23 +00:00
parent 2f87c84349
commit ecec2ba7bd
8 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h
View File

@@ -188,5 +188,8 @@ int rtems_bsdnet_makeFdForSocket (void *);
#define NETISR_IP_EVENT (1 << NETISR_IP)
#define NETISR_ARP_EVENT (1 << NETISR_ARP)
#define NETISR_EVENTS (NETISR_IP_EVENT|NETISR_ARP_EVENT)
#if (SBWAIT_EVENT & SOSLEEP_EVENT & NETISR_EVENTS)
# error "Network event conflict"
#endif
#endif /* _RTEMS_BSDNET_INTERNAL_H_ */

13
c/src/exec/libnetworking/rtems/rtems_glue.c
View File

@@ -295,6 +295,11 @@ sbwait(sb)
rtems_task_ident (RTEMS_SELF, 0, &tid);
sb->sb_sel.si_pid = tid;
/*
* Show that socket is waiting
*/
sb->sb_flags |= SB_WAIT;
/*
* Release the network semaphore.
*/
@@ -329,11 +334,9 @@ sowakeup(so, sb)
register struct socket *so;
register struct sockbuf *sb;
{
rtems_id tid;
if ((tid = sb->sb_sel.si_pid) != 0) {
sb->sb_sel.si_pid = 0;
rtems_event_send (tid, SBWAIT_EVENT);
if (sb->sb_flags & SB_WAIT) {
sb->sb_flags &= ~SB_WAIT;
rtems_event_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
}
}

3
c/src/lib/libnetworking/rtems/rtems_bsdnet_internal.h
View File

@@ -188,5 +188,8 @@ int rtems_bsdnet_makeFdForSocket (void *);
#define NETISR_IP_EVENT (1 << NETISR_IP)
#define NETISR_ARP_EVENT (1 << NETISR_ARP)
#define NETISR_EVENTS (NETISR_IP_EVENT|NETISR_ARP_EVENT)
#if (SBWAIT_EVENT & SOSLEEP_EVENT & NETISR_EVENTS)
# error "Network event conflict"
#endif
#endif /* _RTEMS_BSDNET_INTERNAL_H_ */

13
c/src/lib/libnetworking/rtems/rtems_glue.c
View File

@@ -295,6 +295,11 @@ sbwait(sb)
rtems_task_ident (RTEMS_SELF, 0, &tid);
sb->sb_sel.si_pid = tid;
/*
* Show that socket is waiting
*/
sb->sb_flags |= SB_WAIT;
/*
* Release the network semaphore.
*/
@@ -329,11 +334,9 @@ sowakeup(so, sb)
register struct socket *so;
register struct sockbuf *sb;
{
rtems_id tid;
if ((tid = sb->sb_sel.si_pid) != 0) {
sb->sb_sel.si_pid = 0;
rtems_event_send (tid, SBWAIT_EVENT);
if (sb->sb_flags & SB_WAIT) {
sb->sb_flags &= ~SB_WAIT;
rtems_event_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
}
}

3
c/src/libnetworking/rtems/rtems_bsdnet_internal.h
View File

@@ -188,5 +188,8 @@ int rtems_bsdnet_makeFdForSocket (void *);
#define NETISR_IP_EVENT (1 << NETISR_IP)
#define NETISR_ARP_EVENT (1 << NETISR_ARP)
#define NETISR_EVENTS (NETISR_IP_EVENT|NETISR_ARP_EVENT)
#if (SBWAIT_EVENT & SOSLEEP_EVENT & NETISR_EVENTS)
# error "Network event conflict"
#endif
#endif /* _RTEMS_BSDNET_INTERNAL_H_ */

13
c/src/libnetworking/rtems/rtems_glue.c
View File

@@ -295,6 +295,11 @@ sbwait(sb)
rtems_task_ident (RTEMS_SELF, 0, &tid);
sb->sb_sel.si_pid = tid;
/*
* Show that socket is waiting
*/
sb->sb_flags |= SB_WAIT;
/*
* Release the network semaphore.
*/
@@ -329,11 +334,9 @@ sowakeup(so, sb)
register struct socket *so;
register struct sockbuf *sb;
{
rtems_id tid;
if ((tid = sb->sb_sel.si_pid) != 0) {
sb->sb_sel.si_pid = 0;
rtems_event_send (tid, SBWAIT_EVENT);
if (sb->sb_flags & SB_WAIT) {
sb->sb_flags &= ~SB_WAIT;
rtems_event_send (sb->sb_sel.si_pid, SBWAIT_EVENT);
}
}