Sync with the ecelerity jlog sources

pamaddox · Apr 17, 2008 · adf2ee8 · adf2ee8
1 parent 9e4597f
commit adf2ee8
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 37 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+Copyright (c) 2005-2008, Message Systems, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@ met:
       copyright notice, this list of conditions and the following
       disclaimer in the documentation and/or other materials provided
       with the distribution.
-    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+    * Neither the name Message Systems, Inc. nor the names
       of its contributors may be used to endorse or promote products
       derived from this software without specific prior written
       permission.

diff --git a/jlog.c b/jlog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.
@@ -149,10 +149,10 @@ int jlog_repair_datafile(jlog_ctx *ctx, u_int32_t log)
     SYS_FAIL(JLOG_ERR_FILE_READ);
 
   orig_len = ctx->mmap_len;
-  mmap_end = ctx->mmap_base + ctx->mmap_len;
+  mmap_end = (char*)ctx->mmap_base + ctx->mmap_len;
   /* these values will cause us to fall right into the error clause and
    * start searching for a valid header from offset 0 */
-  this = ctx->mmap_base - sizeof(hdr);
+  this = (char*)ctx->mmap_base - sizeof(hdr);
   hdr.reserved = 0;
   hdr.mlen = 0;
 
@@ -248,7 +248,7 @@ int jlog_inspect_datafile(jlog_ctx *ctx, u_int32_t log)
   if (__jlog_mmap_reader(ctx, log) != 0)
     SYS_FAIL(JLOG_ERR_FILE_READ);
 
-  mmap_end = ctx->mmap_base + ctx->mmap_len;
+  mmap_end = (char*)ctx->mmap_base + ctx->mmap_len;
   this = ctx->mmap_base;
   i = 0;
   while (this + sizeof(hdr) <= mmap_end) {
@@ -859,6 +859,8 @@ ___jlog_resync_index(jlog_ctx *ctx, u_int32_t log, jlog_id *last,
 
     if (!jlog_file_pread(ctx->data, &logmhdr, sizeof(logmhdr), data_off))
       SYS_FAIL(JLOG_ERR_FILE_READ);
+    if (logmhdr.reserved != 0)
+      SYS_FAIL(JLOG_ERR_FILE_CORRUPT);
     if ((next_off += sizeof(logmhdr) + logmhdr.mlen) > data_len)
       break;
 

diff --git a/jlog.h b/jlog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jlog_config.h.in b/jlog_config.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jlog_hash.c b/jlog_hash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jlog_hash.h b/jlog_hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jlog_io.c b/jlog_io.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jlog_io.h b/jlog_io.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jlog_private.h b/jlog_private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jlogctl.c b/jlogctl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jtest.c b/jtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/jthreadtest.c b/jthreadtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/perl/Makefile.PL.in b/perl/Makefile.PL.in
@@ -13,7 +13,7 @@ WriteMakefile(
     PREREQ_PM         => {},
     ($] >= 5.005 ? 
       (ABSTRACT_FROM  => 'lib/JLog.pm',
-       AUTHOR         => 'George Schlossnagle <george@int.omniti.net>') : ()),
+       AUTHOR         => 'George Schlossnagle <george@omniti.com>') : ()),
     LDDLFLAGS         => "$Config{lddlflags} @RLDFLAG@@libdir@",
     LIBS              => ["-L@libdir@ -L.. -ljlog"],
     INC               => '-I.. -I. -I../..',

diff --git a/perl/README b/perl/README
@@ -29,7 +29,7 @@ This module requires these other modules and libraries:
 
 COPYRIGHT AND LICENCE
 
-Copyright (C) 2006 by George Schlossnagle
+Copyright (C) 2006-2008 Message Systems, Inc.
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.8.5 or,

diff --git a/perl/lib/JLog.pm b/perl/lib/JLog.pm
@@ -123,6 +123,6 @@ JLog::Writer
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006 by OmniTI, Inc.
+Copyright (C) 2006-2008 by Message Systems, Inc.
 
 =cut
diff --git a/perl/lib/JLog/Reader.pm b/perl/lib/JLog/Reader.pm
@@ -185,6 +185,6 @@ JLog::Writer
 
 =head1 COPYRIGHT
 
-Copyright (C) 2006 by OmniTI, Inc.
+Copyright (C) 2006-2008 by Message Systems, Inc.
 
 =cut
diff --git a/perl/lib/JLog/Writer.pm b/perl/lib/JLog/Writer.pm
@@ -162,7 +162,7 @@ JLog::Reader
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006 by OmniTI, Inc.
+Copyright (C) 2006-2008 by Message Systems, Inc.
 
 =cut
 
diff --git a/php/config.m4 b/php/config.m4
@@ -7,13 +7,25 @@ PHP_ARG_WITH(jlog, jlog,[  --with-jlog[=DIR]    With jlog support])
 
 if test "$PHP_JLOG" != "no"; then
   if test "$PHP_JLOG" == "yes"; then
-    PHP_JLOG="/opt/ecelerity"
+	if test -d /opt/msys ; then
+      PHP_JLOG="/opt/msys/jlog"
+	else
+      PHP_JLOG="/opt/ecelerity"
+    fi
   fi
   export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_JLOG"
 
   PHP_ADD_INCLUDE(..)
   PHP_ADD_INCLUDE(../..)
   PHP_ADD_INCLUDE(.)
+  PHP_ADD_INCLUDE($PHP_JLOG/include)
+  case $PHP_JLOG in
+    *ecelerity*)
+      dnl has architecture specific include dir
+      archdir=`uname -p`
+  		PHP_ADD_INCLUDE($PHP_JLOG/include/$archdir)
+      ;;
+  esac
   export OLD_CPPFLAGS="$CPPFLAGS"
   export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_JLOG"
   AC_CHECK_HEADER([jlog.h], [], AC_MSG_ERROR('jlog.h' header not found))

diff --git a/php/jlog.c b/php/jlog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.

diff --git a/php/php_jlog.h b/php/php_jlog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc.
+ * Copyright (c) 2005-2008, Message Systems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
  *      copyright notice, this list of conditions and the following
  *      disclaimer in the documentation and/or other materials provided
  *      with the distribution.
- *    * Neither the name OmniTI Computer Consulting, Inc. nor the names
+ *    * Neither the name Message Systems, Inc. nor the names
  *      of its contributors may be used to endorse or promote products
  *      derived from this software without specific prior written
  *      permission.