Use our own variant of 'assert' and 'assert_perror'.

Our variants print stack traces on failures.  This will make locating
errors much easier.

5 files changed, 18 insertions, 18 deletions

diff --git a/pfinet/glue-include/linux/interrupt.h b/pfinet/glue-include/linux/interrupt.h
index 22312ba4..49eb23db 100644
--- a/pfinet/glue-include/linux/interrupt.h
+++ b/pfinet/glue-include/linux/interrupt.h
@@ -30,7 +30,7 @@ extern int net_bh_raised;
 static inline void
 mark_bh (int bh)
 {
-  assert (bh == NET_BH);
+  assert_backtrace (bh == NET_BH);
   net_bh_raised = 1;
   pthread_cond_broadcast (&net_bh_wakeup);
 }
@@ -39,8 +39,8 @@ void net_bh (void);
 static inline void
 init_bh (int bh, void (*fn) (void))
 {
-  assert (bh == NET_BH);
-  assert (fn == &net_bh);
+  assert_backtrace (bh == NET_BH);
+  assert_backtrace (fn == &net_bh);
 }
 
 #endif
diff --git a/pfinet/glue-include/linux/kernel.h b/pfinet/glue-include/linux/kernel.h
index de5852f6..62ba2ff1 100644
--- a/pfinet/glue-include/linux/kernel.h
+++ b/pfinet/glue-include/linux/kernel.h
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 
 
 /* These don't actually matter since our locking protocols are different.  */
@@ -24,7 +24,7 @@
 #define	KERN_INFO
 #define	KERN_DEBUG
 
-#define panic(str...)	(printk (str), assert (!"panic"))
+#define panic(str...)	(printk (str), assert_backtrace (!"panic"))
 
 /*
  *      Display an IP address in readable format.
@@ -63,14 +63,14 @@ putname (char *p)
 static inline int
 kill_proc (int pid, int signo, int priv)
 {
-  assert (signo == SIGURG);
+  assert_backtrace (signo == SIGURG);
   return 0;
 }
 
 static inline int
 kill_pg (int pgrp, int signo, int priv)
 {
-  assert (signo == SIGURG);
+  assert_backtrace (signo == SIGURG);
   return 0;
 }
 
diff --git a/pfinet/glue-include/linux/sched.h b/pfinet/glue-include/linux/sched.h
index e39263e5..2446e88c 100644
--- a/pfinet/glue-include/linux/sched.h
+++ b/pfinet/glue-include/linux/sched.h
@@ -6,7 +6,7 @@
 #include <mach.h>
 #include <hurd/hurd_types.h>
 #include <limits.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <pthread.h>
 #include <errno.h>
 
@@ -105,7 +105,7 @@ interruptible_sleep_on_timeout (struct wait_queue **p, struct timespec *tsp)
   if (c == 0)
     {
       c = malloc (sizeof **condp);
-      assert (c);
+      assert_backtrace (c);
       pthread_cond_init (c, NULL);
       *condp = c;
     }
@@ -134,21 +134,21 @@ wake_up_interruptible (struct wait_queue **p)
 static inline void
 add_wait_queue(struct wait_queue ** p, struct wait_queue * wait)
 {
-  assert (current->next_wait == 0);
+  assert_backtrace (current->next_wait == 0);
   current->next_wait = p;
 }
 
 static inline void
 remove_wait_queue(struct wait_queue ** p, struct wait_queue * wait)
 {
-  assert (current->next_wait == p);
+  assert_backtrace (current->next_wait == p);
   current->next_wait = 0;
 }
 
 static inline void
 schedule (void)
 {
-  assert (current->next_wait);
+  assert_backtrace (current->next_wait);
   interruptible_sleep_on_timeout (current->next_wait, NULL);
 }
 
@@ -201,8 +201,8 @@ schedule_timeout (long timeout)
 static inline int
 send_sig (u_long signo, struct task_struct *task, int priv)
 {
-  assert (signo == SIGPIPE);
-  assert (task == current);
+  assert_backtrace (signo == SIGPIPE);
+  assert_backtrace (task == current);
   return 0;
 }
 
diff --git a/pfinet/glue-include/linux/socket.h b/pfinet/glue-include/linux/socket.h
index 057afbdb..a7475eaf 100644
--- a/pfinet/glue-include/linux/socket.h
+++ b/pfinet/glue-include/linux/socket.h
@@ -111,14 +111,14 @@ extern inline int		/* Does not modify IOV.  */
 memcpy_fromiovecend (unsigned char *kdata, struct iovec *iov,
 		     int offset, int len)
 {
-  assert (offset + len <= iov->iov_len);
+  assert_backtrace (offset + len <= iov->iov_len);
   memcpy (kdata, iov->iov_base + offset, len);
   return 0;
 }
 extern inline int		/* Modifies IOV to consume LEN bytes.  */
 memcpy_fromiovec (unsigned char *kdata, struct iovec *iov, int len)
 {
-  assert (len <= iov->iov_len);
+  assert_backtrace (len <= iov->iov_len);
   memcpy (kdata, iov->iov_base, len);
   iov->iov_base += len;
   iov->iov_len -= len;
@@ -127,7 +127,7 @@ memcpy_fromiovec (unsigned char *kdata, struct iovec *iov, int len)
 extern inline void		/* Modifies IOV to consume LEN bytes.  */
 memcpy_tokerneliovec (struct iovec *iov, unsigned char *kdata, int len)
 {
-  assert (len <= iov->iov_len);
+  assert_backtrace (len <= iov->iov_len);
   memcpy (iov->iov_base, kdata, len);
   iov->iov_base += len;
   iov->iov_len -= len;
diff --git a/pfinet/glue-include/linux/types.h b/pfinet/glue-include/linux/types.h
index 604b8b14..f348ac25 100644
--- a/pfinet/glue-include/linux/types.h
+++ b/pfinet/glue-include/linux/types.h
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <stdint.h>
-#include <assert.h>
+#include <assert-backtrace.h>
 #include <string.h>
 
 #define	__u8	uint8_t