Changeset adf2ee8486352700056029fde45a13fc81b71218

Show
Ignore:
Timestamp:
04/17/08 19:43:46 (6 years ago)
Author:
Wez Furlong <wez.furlong@messagesystems.com>
git-committer:
Wez Furlong <wez.furlong@messagesystems.com> 1208461426 +0000
git-parent:

[9e4597f114a0f6712f05909f7d5c9c5a8b47cb41]

git-author:
Wez Furlong <wez.furlong@messagesystems.com> 1208461426 +0000
Message:

Sync with the ecelerity jlog sources

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • LICENSE

    r5229b0a radf2ee8  
    1 Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     1Copyright (c) 2005-2008, Message Systems, Inc. 
    22All rights reserved. 
    33 
     
    1212      disclaimer in the documentation and/or other materials provided 
    1313      with the distribution. 
    14     * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     14    * Neither the name Message Systems, Inc. nor the names 
    1515      of its contributors may be used to endorse or promote products 
    1616      derived from this software without specific prior written 
  • jlog.c

    re4b055a radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
     
    150150 
    151151  orig_len = ctx->mmap_len; 
    152   mmap_end = ctx->mmap_base + ctx->mmap_len; 
     152  mmap_end = (char*)ctx->mmap_base + ctx->mmap_len; 
    153153  /* these values will cause us to fall right into the error clause and 
    154154   * start searching for a valid header from offset 0 */ 
    155   this = ctx->mmap_base - sizeof(hdr); 
     155  this = (char*)ctx->mmap_base - sizeof(hdr); 
    156156  hdr.reserved = 0; 
    157157  hdr.mlen = 0; 
     
    249249    SYS_FAIL(JLOG_ERR_FILE_READ); 
    250250 
    251   mmap_end = ctx->mmap_base + ctx->mmap_len; 
     251  mmap_end = (char*)ctx->mmap_base + ctx->mmap_len; 
    252252  this = ctx->mmap_base; 
    253253  i = 0; 
     
    860860    if (!jlog_file_pread(ctx->data, &logmhdr, sizeof(logmhdr), data_off)) 
    861861      SYS_FAIL(JLOG_ERR_FILE_READ); 
     862    if (logmhdr.reserved != 0) 
     863      SYS_FAIL(JLOG_ERR_FILE_CORRUPT); 
    862864    if ((next_off += sizeof(logmhdr) + logmhdr.mlen) > data_len) 
    863865      break; 
  • jlog.h

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jlog_config.h.in

    re4b055a radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jlog_hash.c

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jlog_hash.h

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jlog_io.c

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jlog_io.h

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jlog_private.h

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jlogctl.c

    re4b055a radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jtest.c

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • jthreadtest.c

    re4b055a radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • perl/Makefile.PL.in

    r81ac86a radf2ee8  
    1414    ($] >= 5.005 ?  
    1515      (ABSTRACT_FROM  => 'lib/JLog.pm', 
    16        AUTHOR         => 'George Schlossnagle <george@int.omniti.net>') : ()), 
     16       AUTHOR         => 'George Schlossnagle <george@omniti.com>') : ()), 
    1717    LDDLFLAGS         => "$Config{lddlflags} @RLDFLAG@@libdir@", 
    1818    LIBS              => ["-L@libdir@ -L.. -ljlog"], 
  • perl/README

    r81ac86a radf2ee8  
    3030COPYRIGHT AND LICENCE 
    3131 
    32 Copyright (C) 2006 by George Schlossnagle 
     32Copyright (C) 2006-2008 Message Systems, Inc. 
    3333 
    3434This library is free software; you can redistribute it and/or modify 
  • perl/lib/JLog.pm

    r81ac86a radf2ee8  
    124124=head1 COPYRIGHT AND LICENSE 
    125125 
    126 Copyright (C) 2006 by OmniTI, Inc. 
     126Copyright (C) 2006-2008 by Message Systems, Inc. 
    127127 
    128128=cut 
  • perl/lib/JLog/Reader.pm

    r81ac86a radf2ee8  
    186186=head1 COPYRIGHT 
    187187 
    188 Copyright (C) 2006 by OmniTI, Inc. 
     188Copyright (C) 2006-2008 by Message Systems, Inc. 
    189189 
    190190=cut 
  • perl/lib/JLog/Writer.pm

    r81ac86a radf2ee8  
    163163=head1 COPYRIGHT AND LICENSE 
    164164 
    165 Copyright (C) 2006 by OmniTI, Inc. 
     165Copyright (C) 2006-2008 by Message Systems, Inc. 
    166166 
    167167=cut 
  • php/config.m4

    r81ac86a radf2ee8  
    88if test "$PHP_JLOG" != "no"; then 
    99  if test "$PHP_JLOG" == "yes"; then 
    10     PHP_JLOG="/opt/ecelerity" 
     10        if test -d /opt/msys ; then 
     11      PHP_JLOG="/opt/msys/jlog" 
     12        else 
     13      PHP_JLOG="/opt/ecelerity" 
     14    fi 
    1115  fi 
    1216  export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_JLOG" 
     
    1519  PHP_ADD_INCLUDE(../..) 
    1620  PHP_ADD_INCLUDE(.) 
     21  PHP_ADD_INCLUDE($PHP_JLOG/include) 
     22  case $PHP_JLOG in 
     23    *ecelerity*) 
     24      dnl has architecture specific include dir 
     25      archdir=`uname -p` 
     26                PHP_ADD_INCLUDE($PHP_JLOG/include/$archdir) 
     27      ;; 
     28  esac 
    1729  export OLD_CPPFLAGS="$CPPFLAGS" 
    1830  export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_JLOG" 
  • php/jlog.c

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written 
  • php/php_jlog.h

    r9b8a62c radf2ee8  
    11/* 
    2  * Copyright (c) 2005-2007, OmniTI Computer Consulting, Inc. 
     2 * Copyright (c) 2005-2008, Message Systems, Inc. 
    33 * All rights reserved. 
    44 * 
     
    1313 *      disclaimer in the documentation and/or other materials provided 
    1414 *      with the distribution. 
    15  *    * Neither the name OmniTI Computer Consulting, Inc. nor the names 
     15 *    * Neither the name Message Systems, Inc. nor the names 
    1616 *      of its contributors may be used to endorse or promote products 
    1717 *      derived from this software without specific prior written