From: Michael Poole <mdpoole@troilus.org>
Date: Thu, 25 Aug 2005 01:26:46 +0000 (+0000)
Subject: Bump patchlevel; add more epoll support; assertion check in
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=b5d3ee460f906e8bfbd6d3016aabf8a097938ea4

Bump patchlevel; add more epoll support; assertion check in
joinbuf_join(); cleanup when opening a log file.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1463 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index fd931fd..2284e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-24  Michael Poole <mdpoole@troilus.org>
+
+	* include/patchlevel.h (PATCHLEVEL): Increment.
+
+	* ircd/channel.c (joinbuf_join): Double check that oplevel is 0 or
+	1 when propagating JOIN <level>:#channel, to avoid PV on receiver.
+
+	* ircd/engine_epoll.c: Add system call numbers for more CPU types.
+
+	* ircd/ircd_log.c (log_open): Remove NFS-oriented alarm() calls;
+	anyone who writes logs over NFS is mental.  (Thanks to D. Bruce.)
+
 2005-08-21  Michael Poole <mdpoole@troilus.org>
 
 	* include/s_conf.h (free_mapping): Declare new function.
diff --git a/include/patchlevel.h b/include/patchlevel.h
index fa395b4..223201c 100644
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -18,7 +18,7 @@
  * $Id$
  *
  */
-#define PATCHLEVEL "09"
+#define PATCHLEVEL "10"
 
 #define RELEASE ".12.beta."
 
diff --git a/ircd/channel.c b/ircd/channel.c
index 04d9299..1912d16 100644
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3410,10 +3410,11 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
     /* send notification to all servers */
     if (jbuf->jb_type != JOINBUF_TYPE_CREATE && !is_local)
     {
-      if (flags & CHFL_CHANOP)
+      if (flags & CHFL_CHANOP) {
+        assert(oplevel == 0 || oplevel == 1);
         sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
                               "%u:%H %Tu", oplevel, chan, chan->creationtime);
-      else
+      } else
         sendcmdto_serv_butone(jbuf->jb_source, CMD_JOIN, jbuf->jb_connect,
                               "%H %Tu", chan, chan->creationtime);
     }
diff --git a/ircd/engine_epoll.c b/ircd/engine_epoll.c
index 3fdfecf..11281a2 100644
--- a/ircd/engine_epoll.c
+++ b/ircd/engine_epoll.c
@@ -48,11 +48,7 @@
 /* Oh, did we mention that some glibc releases do not even define the
  * syscall numbers? */
 #if !defined(__NR_epoll_create)
-#if defined(__i386__)
-#define __NR_epoll_create 254
-#define __NR_epoll_ctl 255
-#define __NR_epoll_wait 256
-#elif defined(__ia64__)
+#if defined(__ia64__)
 #define __NR_epoll_create 1243
 #define __NR_epoll_ctl 1244
 #define __NR_epoll_wait 1245
@@ -60,6 +56,34 @@
 #define __NR_epoll_create 214
 #define __NR_epoll_ctl 233
 #define __NR_epoll_wait 232
+#elif defined(__sparc64__) || defined(__sparc__)
+#define __NR_epoll_create 193
+#define __NR_epoll_ctl 194
+#define __NR_epoll_wait 195
+#elif defined(__s390__) || defined(__m68k__)
+#define __NR_epoll_create 249
+#define __NR_epoll_ctl 250
+#define __NR_epoll_wait 251
+#elif defined(__ppc64__) || defined(__ppc__)
+#define __NR_epoll_create 236
+#define __NR_epoll_ctl 237
+#define __NR_epoll_wait 238
+#elif defined(__parisc__) || defined(__arm26__) || defined(__arm__)
+#define __NR_epoll_create 224
+#define __NR_epoll_ctl 225
+#define __NR_epoll_wait 226
+#elif defined(__alpha__)
+#define __NR_epoll_create 407
+#define __NR_epoll_ctl 408
+#define __NR_epoll_wait 409
+#elif defined(__sh64__)
+#define __NR_epoll_create 282
+#define __NR_epoll_ctl 283
+#define __NR_epoll_wait 284
+#elif defined(__i386__) || defined(__sh__) || defined(__m32r__) || defined(__h8300__) || defined(__frv__)
+#define __NR_epoll_create 254
+#define __NR_epoll_ctl 255
+#define __NR_epoll_wait 256
 #else /* cpu types */
 #error No system call numbers defined for epoll family.
 #endif /* cpu types */
diff --git a/ircd/ircd_log.c b/ircd/ircd_log.c
index 6251842..02aeb13 100644
--- a/ircd/ircd_log.c
+++ b/ircd/ircd_log.c
@@ -195,10 +195,8 @@ log_open(struct LogFile *lf)
 {
   /* only open the file if we haven't already */
   if (lf && lf->fd < 0) {
-    alarm(3); /* if NFS hangs, we hang only for 3 seconds */
     lf->fd = open(lf->file, O_WRONLY | O_CREAT | O_APPEND,
 		  S_IRUSR | S_IWUSR);
-    alarm(0);
   }
 }