r53054 - in /trunk/libcache-fastmmap-perl: Cache-FastMmap-CImpl/CImpl.pm Cache-FastMmap-CImpl/mmap_cache.c Changes FastMmap.pm MANIFEST META.yml README debian/changelog debian/control debian/copyright debian/source/ debian/source/format t/16.t

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Fri Feb 19 15:35:13 UTC 2010 

Author: ansgar-guest
Date: Fri Feb 19 15:35:04 2010
New Revision: 53054

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53054
Log:
* New upstream release.
* Use source format 3.0 (quilt).
* debian/copyright: Update years of copyright, minor changes for DEP-5.
* debian/control: Make build-dep on perl unversioned.
* Bump Standards-Version to 3.8.4.
* Add myself to Uploaders.

Added:
    trunk/libcache-fastmmap-perl/debian/source/
    trunk/libcache-fastmmap-perl/debian/source/format
    trunk/libcache-fastmmap-perl/t/16.t
      - copied unchanged from r53052, branches/upstream/libcache-fastmmap-perl/current/t/16.t
Modified:
    trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/CImpl.pm
    trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/mmap_cache.c
    trunk/libcache-fastmmap-perl/Changes
    trunk/libcache-fastmmap-perl/FastMmap.pm
    trunk/libcache-fastmmap-perl/MANIFEST
    trunk/libcache-fastmmap-perl/META.yml
    trunk/libcache-fastmmap-perl/README
    trunk/libcache-fastmmap-perl/debian/changelog
    trunk/libcache-fastmmap-perl/debian/control
    trunk/libcache-fastmmap-perl/debian/copyright

Modified: trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/CImpl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/CImpl.pm?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/CImpl.pm (original)
+++ trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/CImpl.pm Fri Feb 19 15:35:04 2010
@@ -15,7 +15,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.34';
+our $VERSION = '1.35';
 
 require XSLoader;
 XSLoader::load('Cache::FastMmap::CImpl', $VERSION);
@@ -38,7 +38,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2003 by FastMail IP Partners
+Copyright (C) 2003-2010 by The FastMail Partnership
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 

Modified: trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/mmap_cache.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/mmap_cache.c?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/mmap_cache.c (original)
+++ trunk/libcache-fastmmap-perl/Cache-FastMmap-CImpl/mmap_cache.c Fri Feb 19 15:35:04 2010
@@ -986,6 +986,7 @@
   MU32 slots_left, * slots_end;
   /* Modulo hash_slot to find starting slot */
   MU32 * slot_ptr = cache->p_base_slots + (hash_slot % cache->p_num_slots);
+  MU32 * first_deleted = (MU32 *)0;
 
   /* Total slots and pointer to end of slot data to do wrapping */
   slots_left = cache->p_num_slots;
@@ -1003,12 +1004,16 @@
 
     /* data_offset == 0 means empty slot, and no more beyond */
     /* data_offset == 1 means deleted slot, we can reuse if writing */
-    if (data_offset == 0 || (data_offset == 1 && mode == 1)) {
-
+    if (data_offset == 0) {
       /* Return pointer to last checked slot */
       return slot_ptr;
     }
-
+    if (data_offset == 1 && mode == 1 && 0 == slot_ptr) {
+      /* Save pointer to first usable slot; if we don't find the key later,
+         we'll fall back to returning this.
+      */
+      first_deleted = slot_ptr;
+    }
     /* deleted slot, keep looking */
     if (data_offset == 1) {
 
@@ -1032,7 +1037,10 @@
     ASSERT(slot_ptr >= cache->p_base_slots && slot_ptr < slots_end);
   }
 
-  return 0;
+  if (1 == mode && 0 != first_deleted)
+    return first_deleted;
+  else
+    return 0;
 }
 
 /*

Modified: trunk/libcache-fastmmap-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/Changes?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/Changes (original)
+++ trunk/libcache-fastmmap-perl/Changes Fri Feb 19 15:35:04 2010
@@ -1,4 +1,9 @@
 Revision history for Perl extension Cache::FastMmap.
+
+1.35 Fri Feb 19 12:45 2010
+  - Fix for returning potential bug that returns old stored
+     data. Could occur if you mix deletes
+     (thanks Darrell Bishop)
 
 1.34 Fri Jun 19 12:00 2009
   - perldoc fix (thanks Jonathan Yu)
@@ -17,6 +22,7 @@
     cache is left at interpreter exit time (required
     Scalar::Util qw(weaken) for object tracking)
 
+>>>>>>> .r21903
 1.30 Fri May 8  11:10 2009
   - Fix for Mandriva compiler (thanks Jean-Christian Hassler)
 

Modified: trunk/libcache-fastmmap-perl/FastMmap.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/FastMmap.pm?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/FastMmap.pm (original)
+++ trunk/libcache-fastmmap-perl/FastMmap.pm Fri Feb 19 15:35:04 2010
@@ -287,7 +287,7 @@
 use warnings;
 use bytes;
 
-our $VERSION = '1.34';
+our $VERSION = '1.35';
 
 # Track currently live caches so we can cleanup in END {}
 #  if we have empty_on_exit set
@@ -1271,7 +1271,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2003-2008 by FastMail IP Partners
+Copyright (C) 2003-2010 by The FastMail Partnership
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 

Modified: trunk/libcache-fastmmap-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/MANIFEST?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/MANIFEST (original)
+++ trunk/libcache-fastmmap-perl/MANIFEST Fri Feb 19 15:35:04 2010
@@ -23,6 +23,7 @@
 t/13.t
 t/14.t
 t/15.t
+t/16.t
 t/2.t
 t/3.t
 t/4.t

Modified: trunk/libcache-fastmmap-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/META.yml?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/META.yml (original)
+++ trunk/libcache-fastmmap-perl/META.yml Fri Feb 19 15:35:04 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Cache-FastMmap
-version:             1.34
+version:             1.35
 abstract:            Uses an mmap'ed file to act as a shared memory interprocess cache
 license:             ~
 author:              

Modified: trunk/libcache-fastmmap-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/README?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/README (original)
+++ trunk/libcache-fastmmap-perl/README Fri Feb 19 15:35:04 2010
@@ -25,7 +25,7 @@
 
 COPYRIGHT AND LICENCE
 
-Copyright (C) 2003-2009 by FastMail IP Partners
+Copyright (C) 2003-2010 by The FastMail Partnership
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 

Modified: trunk/libcache-fastmmap-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/debian/changelog?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/debian/changelog (original)
+++ trunk/libcache-fastmmap-perl/debian/changelog Fri Feb 19 15:35:04 2010
@@ -1,8 +1,17 @@
-libcache-fastmmap-perl (1.34-2) UNRELEASED; urgency=low
+libcache-fastmmap-perl (1.35-1) unstable; urgency=low
 
+  [ Ryan Niebur ]
   * Update jawnsy's email address
 
- -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 01 Sep 2009 21:18:06 -0700
+  [ Ansgar Burchardt ]
+  * New upstream release.
+  * Use source format 3.0 (quilt).
+  * debian/copyright: Update years of copyright, minor changes for DEP-5.
+  * debian/control: Make build-dep on perl unversioned.
+  * Bump Standards-Version to 3.8.4.
+  * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Sat, 20 Feb 2010 00:34:51 +0900
 
 libcache-fastmmap-perl (1.34-1) unstable; urgency=low
 

Modified: trunk/libcache-fastmmap-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/debian/control?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/debian/control (original)
+++ trunk/libcache-fastmmap-perl/debian/control Fri Feb 19 15:35:04 2010
@@ -1,14 +1,15 @@
 Source: libcache-fastmmap-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), perl (>= 5.8.0-7)
+Build-Depends: debhelper (>= 7), perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
- Jonathan Yu <jawnsy at cpan.org>, gregor herrmann <gregoa at debian.org>
+ Jonathan Yu <jawnsy at cpan.org>, gregor herrmann <gregoa at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
 Homepage: http://search.cpan.org/dist/Cache-FastMmap/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcache-fastmmap-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libcache-fastmmap-perl/
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
 
 Package: libcache-fastmmap-perl
 Architecture: any

Modified: trunk/libcache-fastmmap-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/debian/copyright?rev=53054&op=diff
==============================================================================
--- trunk/libcache-fastmmap-perl/debian/copyright (original)
+++ trunk/libcache-fastmmap-perl/debian/copyright Fri Feb 19 15:35:04 2010
@@ -1,32 +1,27 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Rob Mueller <cpan at robm.fastmail.fm>
-Upstream-Source: http://search.cpan.org/dist/Cache-FastMmap/
-Upstream-Name: Cache-FastMmap
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Rob Mueller <cpan at robm.fastmail.fm>
+Source: http://search.cpan.org/dist/Cache-FastMmap/
+Name: Cache-FastMmap
 
-Files: *
-Copyright: 2003-2009, FastMail IP Partners
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2003-2010, The FastMail Partnership
+License: Artistic or GPL-1+
 
 Files: Cache-FastMmap-CImpl/win32.c
-Copyright: 2007 by Ash Berlin
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2007, Ash Berlin
+License: Artistic or GPL-1+
 
 Files: ppport.h
 Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan at gmx.net>
  2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
  1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
  2009, gregor hermann <gregoa at debian.org>
  2009, Ansgar Burchardt <ansgar at 43-1.org>
  2005-2009, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 License: Artistic
     This program is free software; you can redistribute it and/or modify

Added: trunk/libcache-fastmmap-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcache-fastmmap-perl/debian/source/format?rev=53054&op=file
==============================================================================
--- trunk/libcache-fastmmap-perl/debian/source/format (added)
+++ trunk/libcache-fastmmap-perl/debian/source/format Fri Feb 19 15:35:04 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-perl-cvs-commits mailing list