Ticket #374: patch

Makefile.am

@@ -159 +159 @@
 rtems_C_FILES = rtems/sghostname.c rtems/issetugid.c rtems/rtems_glue.c rtems/rtems_syscall.c \
     rtems/rtems_bootp.c rtems/rtems_showmbuf.c rtems/rtems_showroute.c rtems/rtems_showifstat.c \
     rtems/rtems_showipstat.c rtems/rtems_showicmpstat.c rtems/rtems_showtcpstat.c \
-    rtems/rtems_showudpstat.c rtems/rtems_select.c rtems/mkrootfs.c
+    rtems/rtems_showudpstat.c rtems/rtems_select.c rtems/mkrootfs.c \
+    rtems_bsdnet_malloc_starvation.c
 OBJS += $(rtems_C_FILES:rtems/%.c=$(ARCH)/%.$(OBJEXT))
 
 $(ARCH)/%.$(OBJEXT): rtems/%.c

rtems/rtems_bsdnet.h

@@ -182 +182 @@
 
 int rtems_bsdnet_synchronize_ntp (int interval, rtems_task_priority priority);
 
+/*
+ * Callback to report BSD malloc starvation.
+ * The default implementation just prints a message but an application
+ * can provide its own version.
+ */
+void rtems_bsdnet_malloc_starvation(void);
+
 #endif /* _RTEMS_BSDNET_ */

rtems/rtems_glue.c

@@ -117 +117 @@
                         return p;
                 rtems_bsdnet_semaphore_release ();
                 if (++try >= 30) {
-                        printf ("rtems_bsdnet_malloc still waiting.\n");
+                        rtems_bsdnet_malloc_starvation();
                         try = 0;
                 }
-                while (rtems_bsdnet_seconds_since_boot() == 0)
-                        rtems_task_wake_after(1);
+        rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
                 rtems_bsdnet_semaphore_obtain ();
         }
 }
@@ -272 +271 @@
         /*
          * Ensure that `seconds' is greater than 0
          */
-        rtems_task_wake_after (rtems_bsdnet_ticks_per_second);
+    while (rtems_bsdnet_seconds_since_boot() == 0)
+        rtems_task_wake_after(1);
 
         /*
          * Set up BSD-style sockets