@@ -1,11 +1,57 @@
-1.001 - Tue Oct 21 14:03:25 BST 2003
+Revision history for Perl module Proc::Pidfile
+
+1.06 2014-07-07 NEILB
+ - getppid() not supported on Win32 and RISC OS, so now we check if
+ we're running those OSes, and don't don't it if we are.
+ - Two of the tests loop looking for free or used PIDs. But in some
+ situations they can loop infinitely, so now guard against this.
+ I think this will prevent the hang on Windows in RT#96998,
+ but dealing with this properly needs more investigation and work.
+
+1.05 2014-07-06 NEILB
+ - The testsuite was trying to create files with 'Proc::Pidfile' in the
+ name, which Windows didn't like. CPAN Testers++
+
+1.04 2014-07-05 NEILB
+ - Testsuite was still using Proc::ProcessTable, which meant that the
+ change in 1.02 would result in failed tests if you didn't already
+ have Proc::ProcessTable installed. Refactored testsuite.
+
+1.03 2014-07-05 NEILB
+ - Check whether operations on the pid file (read, write, lock, close)
+ are successful, and croak if not.
+ Thanks to John Tantalo for RT#67589.
+
+1.02 2014-07-04 NEILB
+ - Use kill(0,$pid) to check whether process is still running,
+ rather than using Proc::ProcessTable. Apart from on RISC OS.
+ DEPESZ++ for RT#56630.
+
+1.01 2014-07-02 NEILB
+ - Moved Pidfile.pm to lib/Proc/Pidfile.pm
+ - Reformatted this file as per CPAN::Changes::Spec
+ - Changed used of die() to croak(), apart from inside DESTROY,
+ since in 5.14+, die inside DESTROY doesn't work how you might expect.
+ RT#66873
+ - Switched to Dist::Zilla
+ - Added github repo to pod
+
+1.005 2006-09-27 AWRIGLEY
+ - added pidfile to "already running" message
+
+1.004 2004-06-21 AWRIGLEY
+ - use Proc::ProcessTable instead of kill 0
+
+1.003 2004-04-01 AWRIGLEY
+ - 1 char change to POD talk about minimal release!
+
+1.002 2004-04-01 AWRIGLEY
+ - minor POD changes, and fixed test that was checking for exit status
+
+1.001 2003-10-21 AWRIGLEY
- added README and Changes
- changed default pidfile to /var/run or $tmpdir
-1.002 - Thu Jan 15 17:00:44 GMT 2004
- - minor POD changes, and fixed test that was checking for exit status
-1.003 - Thu Apr 1 11:35:38 BST 2004
- - 1 char change to POD talk about minimal release!
-1.004 - Mon Jun 21 13:26:31 BST 2004
- - use Proc::ProcessTable instead of kill 0
-1.004 - Wed Sep 27 10:29:30 BST 2006
- - added pidfile to "already running" message
+
+1.000 2003-10-21 AWRIGLEY
+ - First release to CPAN
+
@@ -0,0 +1,379 @@
+This software is copyright (c) 2003 by Ave Wrigley.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+Terms of the Perl programming language system itself
+
+a) the GNU General Public License as published by the Free
+ Software Foundation; either version 1, or (at your option) any
+ later version, or
+b) the "Artistic License"
+
+--- The GNU General Public License, Version 1, February 1989 ---
+
+This software is Copyright (c) 2003 by Ave Wrigley.
+
+This is free software, licensed under:
+
+ The GNU General Public License, Version 1, February 1989
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 1, February 1989
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+ 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The license agreements of most software companies try to keep users
+at the mercy of those companies. By contrast, our General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. The
+General Public License applies to the Free Software Foundation's
+software and to any other program whose authors commit to using it.
+You can use it for your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Specifically, the General Public License is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of a such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must tell them their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License. The
+"Program", below, refers to any such program or work, and a "work based
+on the Program" means either the Program or any work containing the
+Program or a portion of it, either verbatim or with modifications. Each
+licensee is addressed as "you".
+
+ 1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this General Public License
+along with the Program. You may charge a fee for the physical act of
+transferring a copy.
+
+ 2. You may modify your copy or copies of the Program or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+ a) cause the modified files to carry prominent notices stating that
+ you changed the files and the date of any change; and
+
+ b) cause the whole of any work that you distribute or publish, that
+ in whole or in part contains the Program or any part thereof, either
+ with or without modifications, to be licensed at no charge to all
+ third parties under the terms of this General Public License (except
+ that you may choose to grant warranty protection to some or all
+ third parties, at your option).
+
+ c) If the modified program normally reads commands interactively when
+ run, you must cause it, when started running for such interactive use
+ in the simplest and most usual way, to print or display an
+ announcement including an appropriate copyright notice and a notice
+ that there is no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the program under these
+ conditions, and telling the user how to view a copy of this General
+ Public License.
+
+ d) You may charge a fee for the physical act of transferring a
+ copy, and you may at your option offer warranty protection in
+ exchange for a fee.
+
+Mere aggregation of another independent work with the Program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
+
+ 3. You may copy and distribute the Program (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+ a) accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ b) accompany it with a written offer, valid for at least three
+ years, to give any third party free (except for a nominal charge
+ for the cost of distribution) a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ c) accompany it with the information you received as to where the
+ corresponding source code may be obtained. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it. For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+ 4. You may not copy, modify, sublicense, distribute or transfer the
+Program except as expressly provided under this General Public License.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Program is void, and will automatically terminate your rights to use
+the Program under this License. However, parties who have received
+copies, or rights to use copies, from you under this General Public
+License will not have their licenses terminated so long as such parties
+remain in full compliance.
+
+ 5. By copying, distributing or modifying the Program (or any work based
+on the Program) you indicate your acceptance of this license to do so,
+and all its terms and conditions.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these
+terms and conditions. You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
+
+ 7. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of the license which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+the license, you may choose any version ever published by the Free Software
+Foundation.
+
+ 8. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+ To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19xx name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ program `Gnomovision' (a program to direct compilers to make passes
+ at assemblers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
+--- The Artistic License 1.0 ---
+
+This software is Copyright (c) 2003 by Ave Wrigley.
+
+This is free software, licensed under:
+
+ The Artistic License 1.0
+
+The Artistic License
+
+Preamble
+
+The intent of this document is to state the conditions under which a Package
+may be copied, such that the Copyright Holder maintains some semblance of
+artistic control over the development of the package, while giving the users of
+the package the right to use and distribute the Package in a more-or-less
+customary fashion, plus the right to make reasonable modifications.
+
+Definitions:
+
+ - "Package" refers to the collection of files distributed by the Copyright
+ Holder, and derivatives of that collection of files created through
+ textual modification.
+ - "Standard Version" refers to such a Package if it has not been modified,
+ or has been modified in accordance with the wishes of the Copyright
+ Holder.
+ - "Copyright Holder" is whoever is named in the copyright or copyrights for
+ the package.
+ - "You" is you, if you're thinking about copying or distributing this Package.
+ - "Reasonable copying fee" is whatever you can justify on the basis of media
+ cost, duplication charges, time of people involved, and so on. (You will
+ not be required to justify it to the Copyright Holder, but only to the
+ computing community at large as a market that must bear the fee.)
+ - "Freely Available" means that no fee is charged for the item itself, though
+ there may be fees involved in handling the item. It also means that
+ recipients of the item may redistribute it under the same conditions they
+ received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications derived
+from the Public Domain or from the Copyright Holder. A Package modified in such
+a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided that
+you insert a prominent notice in each changed file stating how and when you
+changed that file, and provided that you do at least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise make them
+ Freely Available, such as by posting said modifications to Usenet or an
+ equivalent medium, or placing the modifications on a major archive site
+ such as ftp.uu.net, or by allowing the Copyright Holder to include your
+ modifications in the Standard Version of the Package.
+
+ b) use the modified Package only within your corporation or organization.
+
+ c) rename any non-standard executables so the names do not conflict with
+ standard executables, which must also be provided, and provide a separate
+ manual page for each non-standard executable that clearly documents how it
+ differs from the Standard Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or executable
+form, provided that you do at least ONE of the following:
+
+ a) distribute a Standard Version of the executables and library files,
+ together with instructions (in the manual page or equivalent) on where to
+ get the Standard Version.
+
+ b) accompany the distribution with the machine-readable source of the Package
+ with your modifications.
+
+ c) accompany any non-standard executables with their corresponding Standard
+ Version executables, giving the non-standard executables non-standard
+ names, and clearly documenting the differences in manual pages (or
+ equivalent), together with instructions on where to get the Standard
+ Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package. You may charge any fee you choose for support of this Package. You
+may not charge a fee for this Package itself. However, you may distribute this
+Package in aggregate with other (possibly commercial) programs as part of a
+larger (possibly commercial) software distribution provided that you do not
+advertise this Package as a product of your own.
+
+6. The scripts and library files supplied as input to or produced as output
+from the programs of this Package do not automatically fall under the copyright
+of this Package, but belong to whomever generated them, and may be sold
+commercially, and may be aggregated with this Package.
+
+7. C or perl subroutines supplied by you and linked into this Package shall not
+be considered part of this Package.
+
+8. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
+
@@ -1,7 +1,10 @@
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.019.
Changes
+LICENSE
+MANIFEST
+META.yml
Makefile.PL
-MANIFEST This list of files
-META.yml Module meta-data (added by MakeMaker)
-Pidfile.pm
README
+dist.ini
+lib/Proc/Pidfile.pm
t/pidfile.t
@@ -1,14 +1,27 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Proc-Pidfile
-version: 1.005
-version_from: Pidfile.pm
-installdirs: site
+---
+abstract: 'a simple OO Perl module for maintaining a process id file for the curent process'
+author:
+ - 'Ave Wrigley <awrigley@cpan.org>'
+build_requires:
+ Test::More: '0'
+configure_requires:
+ ExtUtils::MakeMaker: '6.30'
+dynamic_config: 1
+generated_by: 'Dist::Zilla version 5.019, CPAN::Meta::Converter version 2.141170'
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: '1.4'
+name: Proc-Pidfile
requires:
- Fcntl: 0
- File::Basename: 0
- File::Spec: 0
- Proc::ProcessTable: 0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+ Carp: '0'
+ Fcntl: '0'
+ File::Basename: '0'
+ File::Spec: '0'
+ perl: '5.006'
+ strict: '0'
+ warnings: '0'
+resources:
+ homepage: https://github.com/neilbowers/Proc-Pidfile
+ repository: https://github.com/neilbowers/Proc-Pidfile.git
+version: '1.06'
@@ -1,13 +1,67 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
- 'NAME' => 'Proc::Pidfile',
- 'VERSION_FROM' => 'Pidfile.pm', # finds $VERSION
- 'PREREQ_PM' => {
- Proc::ProcessTable => 0,
- Fcntl => 0,
- File::Basename => 0,
- File::Spec=> 0,
- }, # e.g., Module::Name => 1.1
+
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.019.
+use strict;
+use warnings;
+
+use 5.006;
+
+use ExtUtils::MakeMaker 6.30;
+
+
+
+my %WriteMakefileArgs = (
+ "ABSTRACT" => "a simple OO Perl module for maintaining a process id file for the curent process",
+ "AUTHOR" => "Ave Wrigley <awrigley\@cpan.org>",
+ "CONFIGURE_REQUIRES" => {
+ "ExtUtils::MakeMaker" => "6.30"
+ },
+ "DISTNAME" => "Proc-Pidfile",
+ "EXE_FILES" => [],
+ "LICENSE" => "perl",
+ "NAME" => "Proc::Pidfile",
+ "PREREQ_PM" => {
+ "Carp" => 0,
+ "Fcntl" => 0,
+ "File::Basename" => 0,
+ "File::Spec" => 0,
+ "strict" => 0,
+ "warnings" => 0
+ },
+ "TEST_REQUIRES" => {
+ "Test::More" => 0
+ },
+ "VERSION" => "1.06",
+ "test" => {
+ "TESTS" => "t/*.t"
+ }
);
+
+
+my %FallbackPrereqs = (
+ "Carp" => 0,
+ "Fcntl" => 0,
+ "File::Basename" => 0,
+ "File::Spec" => 0,
+ "Test::More" => 0,
+ "strict" => 0,
+ "warnings" => 0
+);
+
+
+unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
+ delete $WriteMakefileArgs{TEST_REQUIRES};
+ delete $WriteMakefileArgs{BUILD_REQUIRES};
+ $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
+}
+
+delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+ unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+
+if ( $^O eq 'riscos' ) {
+ $WriteMakefileArgs{PREREQ_PM}{'Proc::ProcessTable'} = '0.49';
+}
+
+WriteMakefile(%WriteMakefileArgs);
+
+
+
@@ -1,217 +0,0 @@
-package Proc::Pidfile;
-
-$VERSION = '1.005';
-use Fcntl qw( :flock );
-use File::Basename qw( basename );
-require Proc::ProcessTable;
-require File::Spec;
-
-sub new
-{
- my $class = shift;
- my %args = @_;
- my $self = bless \%args, $class;
- unless ( $self->{pidfile} )
- {
- my $basename = basename( $0 );
- my $dir = -w "/var/run" ? "/var/run" : File::Spec->tmpdir();
- die "Can't write to $dir\n" unless -w $dir;
- $pidfile = "$dir/$basename.pid";
- $self->_verbose( "pidfile: $pidfile\n" );
- $self->{pidfile} = $pidfile;
- }
- $self->_create_pidfile();
- return $self;
-}
-
-sub DESTROY
-{
- my $self = shift;
- $self->_destroy_pidfile();
-}
-
-sub pidfile
-{
- my $self = shift;
- return $self->{pidfile};
-}
-
-sub _verbose
-{
- my $self = shift;
- return unless $self->{verbose};
- print STDERR @_;
-}
-
-sub _get_pid
-{
- my $self = shift;
- my $pidfile = $self->{pidfile};
- $self->_verbose( "get pid from $pidfile\n" );
- open( PID, $pidfile ) or die "can't read pid file $pidfile\n";
- flock( PID, LOCK_SH );
- my $pid = <PID>;
- chomp( $pid );
- flock( PID, LOCK_UN );
- close( PID );
- $self->_verbose( "pid = $pid\n" );
- return $pid;
-}
-
-sub _is_running
-{
- my $pid = shift;
- my $table = Proc::ProcessTable->new()->table;
- my %processes = map { $_->pid => $_ } @$table;
- return exists $processes{$pid};
-}
-
-sub _create_pidfile
-{
- my $self = shift;
- my $pidfile = $self->{pidfile};
- if ( -e $pidfile )
- {
- $self->_verbose( "pidfile $pidfile exists\n" );
- my $pid = $self->_get_pid();
- $self->_verbose( "pid in pidfile $pidfile = $pid\n" );
- if ( _is_running( $pid ) )
- {
- if ( $self->{silent} )
- {
- exit;
- }
- else
- {
- die "$0 already running: $pid ($pidfile)\n";
- }
- }
- else
- {
- $self->_verbose( "$pid has died - replacing pidfile\n" );
- open( PID, ">$pidfile" ) or die "Can't write to $pidfile\n";
- print PID "$$\n";
- close( PID );
- }
- }
- else
- {
- $self->_verbose( "no pidfile $pidfile\n" );
- open( PID, ">$pidfile" ) or die "Can't write to $pidfile\n";
- flock( PID, LOCK_EX );
- print PID "$$\n";
- flock( PID, LOCK_UN );
- close( PID );
- $self->_verbose( "pidfile $pidfile created\n" );
- }
- $self->{created} = 1;
-}
-
-sub _destroy_pidfile
-{
- my $self = shift;
-
- return unless $self->{created};
- my $pidfile = $self->{pidfile};
- $self->_verbose( "destroy $pidfile\n" );
- unless ( $pidfile and -e $pidfile )
- {
- die "pidfile $pidfile doesn't exist\n";
- }
- my $pid = $self->_get_pid();
- $self->_verbose( "pid in $pidfile = $pid\n" );
- if ( $pid == $$ )
- {
- $self->_verbose( "remove pidfile: $pidfile\n" );
- unlink( $pidfile ) if $pidfile and -e $pidfile;
- }
- else
- {
- $self->_verbose( "$pidfile not my pidfile - maybe my parents?\n" );
- my $ppid = getppid();
- $self->_verbose( "parent pid = $ppid\n" );
- if ( $ppid != $pid )
- {
- die "pid $pid in $pidfile is not mine ($$) - I am $0 - or my parents ($ppid)\n";
- }
- }
-}
-
-#------------------------------------------------------------------------------
-#
-# Start of POD
-#
-#------------------------------------------------------------------------------
-
-=head1 NAME
-
-Proc::Pidfile - a simple OO Perl module for maintaining a process id file for
-the curent process
-
-=head1 SYNOPSIS
-
- my $pp = Proc::Pidfile->new( pidfile => "/path/to/your/pidfile" );
- # if the pidfile already exists, die here
- $pidfile = $pp->pidfile();
- undef $pp;
- # unlink $pidfile here
-
- my $pp = Proc::Pidfile->new();
- # creates pidfile in default location - /var/run or File::Spec->tmpdir ...
- my $pidfile = $pp=>pidfile();
- # tells you where this pidfile is ...
-
- my $pp = Proc::Pidfile->new( silent => 1 );
- # if the pidfile already exists, exit silently here
- ...
- undef $pp;
-
-=head1 DESCRIPTION
-
-Proc::Pidfile is a very simple OO interface which manages a pidfile for the
-current process. You can pass the path to a pidfile to use as an argument to
-the constructor, or you can let Proc::Pidfile choose one (basically, "/var/run/$basename", if you can write to /var/run, otherwise "/$tmpdir/$basename").
-
-Pidfiles created by Proc::Pidfile are automatically removed on destruction of
-the object. At destruction, the module checks the process id in the pidfile
-against its own, and against its parents (in case it is a spawned child of the
-process that originally created the Proc::Pidfile object), and barfs if it
-doesn't match either.
-
-If you pass a "silent" parameter to the constructor, then it will still check
-for the existence of a pidfile, but will exit silently if one is found. This is
-useful for, for example, cron jobs, where you don't want to create a new
-process if one is already running, but you don't necessarily want to be
-informed of this by cron.
-
-=head1 SEE ALSO
-
-Proc::PID::File
-
-=head1 AUTHOR
-
-Ave Wrigley <Ave.Wrigley@itn.co.uk>
-
-=head1 COPYRIGHT
-
-Copyright (c) 2003 Ave Wrigley. All rights reserved. This program is free
-software; you can redistribute it and/or modify it under the same terms as Perl
-itself.
-
-=cut
-
-#------------------------------------------------------------------------------
-#
-# End of POD
-#
-#------------------------------------------------------------------------------
-
-
-#------------------------------------------------------------------------------
-#
-# True ...
-#
-#------------------------------------------------------------------------------
-
-1;
-
@@ -1,44 +1,15 @@
-Proc::Pidfile
-=============
-Description
------------
-Proc::Pidfile is a very simple OO interface which manages a pidfile for the
-current process. You can pass the path to a pidfile to use as an argument to
-the constructor, or you can let Proc::Pidfile choose one (basically, "/var/run/$basename", if you can write to /var/run, otherwise "/$tmpdir/$basename").
+This archive contains the distribution Proc-Pidfile,
+version 1.06:
-Pidfiles created by Proc::Pidfile are automatically removed on destruction of
-the object. At destruction, the module checks the process id in the pidfile
-against its own, and against its parents (in case it is a spawned child of the
-process that originally created the Proc::Pidfile object), and barfs if it
-doesn't match either.
+ a simple OO Perl module for maintaining a process id file for the curent process
-If you pass a "silent" parameter to the constructor, then it will still check
-for the existence of a pidfile, but will exit silently if one is found. This is
-useful for, for example, cron jobs, where you don't want to create a new
-process if one is already running, but you don't necessarily want to be
-informed of this by cron.
+This software is copyright (c) 2003 by Ave Wrigley.
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
-Installation
-------------
-The usual ...
+This README file was generated by Dist::Zilla::Plugin::Readme v5.019.
-> perl Makefile.PL
-> make
-[ > make test ]
-> make install
-
-Copyright
----------
-
-Copyright (c) 2003 Ave Wrigley. All rights reserved. This program is free
-software; you can redistribute it and/or modify it under the same terms as Perl
-itself.
-
-Author
-------
-
-Ave Wrigley <Ave.Wrigley@itn.co.uk>
@@ -0,0 +1,17 @@
+name = Proc-Pidfile
+author = Ave Wrigley <awrigley@cpan.org>
+license = Perl_5
+copyright_holder = Ave Wrigley
+copyright_year = 2003
+
+version = 1.06
+
+[@Basic]
+[PkgVersion]
+[AutoPrereqs]
+skip = Proc::ProcessTable
+[OSPrereqs / riscos]
+Proc::ProcessTable = 0.49
+[GithubMeta]
+[Git::Tag]
+tag_message=
@@ -0,0 +1,237 @@
+package Proc::Pidfile;
+$Proc::Pidfile::VERSION = '1.06';
+use 5.006;
+use strict;
+use warnings;
+
+use Fcntl qw( :flock );
+use File::Basename qw( basename );
+use Carp qw/ carp croak /;
+require File::Spec;
+
+sub new
+{
+ my $class = shift;
+ my %args = @_;
+ my $self = bless \%args, $class;
+ unless ( $self->{pidfile} )
+ {
+ my $basename = basename( $0 );
+ my $dir = -w "/var/run" ? "/var/run" : File::Spec->tmpdir();
+ croak "Can't write to $dir\n" unless -w $dir;
+ my $pidfile = "$dir/$basename.pid";
+ $self->_verbose( "pidfile: $pidfile\n" );
+ $self->{pidfile} = $pidfile;
+ }
+ $self->_create_pidfile();
+ return $self;
+}
+
+sub DESTROY
+{
+ my $self = shift;
+
+ $self->_destroy_pidfile();
+}
+
+sub pidfile
+{
+ my $self = shift;
+ return $self->{pidfile};
+}
+
+sub _verbose
+{
+ my $self = shift;
+ return unless $self->{verbose};
+ print STDERR @_;
+}
+
+sub _get_pid
+{
+ my $self = shift;
+ my $pidfile = $self->{pidfile};
+ $self->_verbose( "get pid from $pidfile\n" );
+ open( PID, $pidfile ) or croak "can't read pid file $pidfile\n";
+ flock( PID, LOCK_SH ) or croak "can't lock pid file $pidfile\n";
+ my $pid = <PID>;
+ croak "can't get pid from pidfile $pidfile\n" if not defined($pid);
+ chomp( $pid );
+ flock( PID, LOCK_UN );
+ close( PID );
+ $self->_verbose( "pid = $pid\n" );
+ return $pid;
+}
+
+sub _is_running
+{
+ my $pid = shift;
+
+ if ($^O eq 'riscos') {
+ require Proc::ProcessTable;
+
+ my $table = Proc::ProcessTable->new()->table;
+ my %processes = map { $_->pid => $_ } @$table;
+ return exists $processes{$pid};
+ }
+ else {
+ return kill(0, $pid) || $!{'EPERM'};
+ }
+}
+
+sub _create_pidfile
+{
+ my $self = shift;
+ my $pidfile = $self->{pidfile};
+ if ( -e $pidfile )
+ {
+ $self->_verbose( "pidfile $pidfile exists\n" );
+ my $pid = $self->_get_pid();
+ $self->_verbose( "pid in pidfile $pidfile = $pid\n" );
+ if ( _is_running( $pid ) )
+ {
+ if ( $self->{silent} )
+ {
+ exit;
+ }
+ else
+ {
+ croak "$0 already running: $pid ($pidfile)\n";
+ }
+ }
+ else
+ {
+ $self->_verbose( "$pid has died - replacing pidfile\n" );
+ open( PID, ">$pidfile" ) or croak "Can't write to $pidfile\n";
+ print PID "$$\n";
+ close( PID );
+ }
+ }
+ else
+ {
+ $self->_verbose( "no pidfile $pidfile\n" );
+ open( PID, ">$pidfile" ) or croak "Can't write to $pidfile: $!\n";
+ flock( PID, LOCK_EX ) or croak "Can't lock pid file $pidfile\n";
+ print PID "$$\n" or croak "Can't write to pid file $pidfile\n";
+ flock( PID, LOCK_UN );
+ close( PID ) or croak "Can't close pid file $pidfile: $!\n";
+ $self->_verbose( "pidfile $pidfile created\n" );
+ }
+ $self->{created} = 1;
+}
+
+sub _destroy_pidfile
+{
+ my $self = shift;
+
+ return unless $self->{created};
+ my $pidfile = $self->{pidfile};
+ $self->_verbose( "destroy $pidfile\n" );
+ if ( $pidfile and -e $pidfile ) {
+ my $pid = $self->_get_pid();
+ $self->_verbose( "pid in $pidfile = $pid\n" );
+ if ( $pid == $$ ) {
+ $self->_verbose( "remove pidfile: $pidfile\n" );
+ unlink( $pidfile ) if $pidfile and -e $pidfile;
+ }
+ elsif ($^O ne 'MSWin32' && $^O ne 'riscos') {
+ $self->_verbose( "$pidfile not my pidfile - maybe my parent's?\n" );
+ my $ppid = getppid();
+ $self->_verbose( "parent pid = $ppid\n" );
+ if ( $ppid != $pid ) {
+ carp "pid $pid in $pidfile is not mine ($$) - I am $0 - or my parents ($ppid)\n";
+ }
+ }
+ else {
+ $self->_verbose( "$pidfile not my pidfile - can't check if it's my parent's on this OS\n" );
+ }
+ }
+ else {
+ carp "pidfile $pidfile doesn't exist\n";
+ }
+}
+
+#------------------------------------------------------------------------------
+#
+# Start of POD
+#
+#------------------------------------------------------------------------------
+
+=head1 NAME
+
+Proc::Pidfile - a simple OO Perl module for maintaining a process id file for
+the curent process
+
+=head1 SYNOPSIS
+
+ my $pp = Proc::Pidfile->new( pidfile => "/path/to/your/pidfile" );
+ # if the pidfile already exists, die here
+ $pidfile = $pp->pidfile();
+ undef $pp;
+ # unlink $pidfile here
+
+ my $pp = Proc::Pidfile->new();
+ # creates pidfile in default location - /var/run or File::Spec->tmpdir ...
+ my $pidfile = $pp=>pidfile();
+ # tells you where this pidfile is ...
+
+ my $pp = Proc::Pidfile->new( silent => 1 );
+ # if the pidfile already exists, exit silently here
+ ...
+ undef $pp;
+
+=head1 DESCRIPTION
+
+Proc::Pidfile is a very simple OO interface which manages a pidfile for the
+current process. You can pass the path to a pidfile to use as an argument to
+the constructor, or you can let Proc::Pidfile choose one (basically, "/var/run/$basename", if you can write to /var/run, otherwise "/$tmpdir/$basename").
+
+Pidfiles created by Proc::Pidfile are automatically removed on destruction of
+the object. At destruction, the module checks the process id in the pidfile
+against its own, and against its parents (in case it is a spawned child of the
+process that originally created the Proc::Pidfile object), and barfs if it
+doesn't match either.
+
+If you pass a "silent" parameter to the constructor, then it will still check
+for the existence of a pidfile, but will exit silently if one is found. This is
+useful for, for example, cron jobs, where you don't want to create a new
+process if one is already running, but you don't necessarily want to be
+informed of this by cron.
+
+=head1 SEE ALSO
+
+Proc::PID::File
+
+=head1 REPOSITORY
+
+L<https://github.com/neilbowers/Proc-Pidfile>
+
+=head1 AUTHOR
+
+Ave Wrigley E<lt>awrigley@cpan.orgE<gt>
+
+Now maintained by Neil Bowers E<lt>neilb@cpan.orgE<gt>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2003 Ave Wrigley. All rights reserved. This program is free
+software; you can redistribute it and/or modify it under the same terms as Perl
+itself.
+
+=cut
+
+#------------------------------------------------------------------------------
+#
+# End of POD
+#
+#------------------------------------------------------------------------------
+
+
+#------------------------------------------------------------------------------
+#
+# True ...
+#
+#------------------------------------------------------------------------------
+
+1;
+
@@ -1,10 +1,11 @@
#!/bin/env perl -w
# vim:filetype=perl
+use 5.006;
use strict;
+use warnings;
-use Test::More tests => 25;
-use Proc::ProcessTable;
+use Test::More tests => 24;
BEGIN { require_ok( 'Proc::Pidfile' ); }
my ( $err, $obj, $pidfile, $ppid, $pid );
# test for simple pidfile creation and destruction
@@ -14,7 +15,7 @@ ok( -e $pidfile, "pidfile created" );
undef $obj;
ok( ! -e $pidfile, "pidfile destroyed" );
# test for expicit pidfile path creation and destruction
-$pidfile = '/tmp/Proc::Pidfile.test.pid';
+$pidfile = '/tmp/Proc-Pidfile.test.pid';
unlink( $pidfile ) if -e $pidfile;
$obj = Proc::Pidfile->new( pidfile => $pidfile );
is( $obj->pidfile(), $pidfile, "temp pidfile matches" );
@@ -40,15 +41,23 @@ ok( $? >> 8 == 0, "child ignored parent's pidfile" );
ok( -e $pidfile, "child ignored pidfile" );
undef $obj;
ok( ! -e $pidfile, "parent destroyed pidfile" );
+
+# This doesn't work in 5.14+, because if code calls die/croak
+# inside a DESTROY, then if you an eval { } round that,
+# you don't get $@ set as you might expect.
# check that removed pidfile exception is thrown
-eval {
- my $pp = Proc::Pidfile->new();
- $pidfile = $pp->pidfile();
- unlink( $pidfile );
- undef $pp;
-};
-$err = $@; undef $@;
-like( $err, qr/pidfile $pidfile doesn't exist/, "die on removed pidfile" );
+# TODO: {
+# local $TODO = "doesn't work in 5.14+, need to think about this...";
+# eval {
+# my $pp = Proc::Pidfile->new();
+# $pidfile = $pp->pidfile();
+# unlink( $pidfile );
+# # undef $pp;
+# };
+# $err = $@; undef $@;
+# like( $err, qr/pidfile $pidfile doesn't exist/, "die on removed pidfile" );
+#}
+
# check that child spots and ignores existing pidfile
$obj = Proc::Pidfile->new();
$ppid = $$;
@@ -71,14 +80,14 @@ ok( defined( $pid ), "fork successful" );
is( $pid, waitpid( $pid, 0 ), "silent child exited" );
is( $? >> 8, 0, "child spotted and ignored existing pidfile" );
# check that bogus or zombie pidfile is ignored
-$pidfile = '/tmp/Proc::Pidfile.test.pid';
+$pidfile = '/tmp/Proc-Pidfile.test.pid';
unlink( $pidfile ) if -e $pidfile;
ok( open( FH, ">$pidfile" ), "open pidfile" );
-# find a free pid ...
-my $table = Proc::ProcessTable->new()->table;
-my %processes = map { $_->pid => $_ } @$table;
-$pid = 1;
-$pid++ while exists $processes{$pid};
+
+$pid = find_unused_pid();
+
+BAIL_OUT("Can't find unused pid -- this shouldn't happen!") if !defined($pid);
+
print FH $pid;
close( FH );
eval { $obj = Proc::Pidfile->new( pidfile => $pidfile ); };
@@ -86,17 +95,59 @@ $err = $@; undef $@;
ok( ! $err, "bogus pidfile ignored" );
undef $obj;
# check that pidfile created by somebody else works ...
-$pidfile = '/tmp/Proc::Pidfile.test.pid';
+$pidfile = '/tmp/Proc-Pidfile.test.pid';
unlink( $pidfile ) if -e $pidfile;
ok( open( FH, ">$pidfile" ), "open pidfile" );
-# find a used pid ...
-$table = Proc::ProcessTable->new()->table;
-%processes = map { $_->pid => $_ } @$table;
-$pid = 1;
-$pid++ until exists $processes{$pid} and $processes{$pid}->uid != $<;
-print FH $pid;
-close( FH );
-eval { $obj = Proc::Pidfile->new( pidfile => $pidfile ); };
-$err = $@; undef $@;
-like( $err, qr/already running: $pid/, "other users pid" );
-undef $obj;
+
+$pid = find_pid_in_use_by_someone_else();
+
+SKIP: {
+ skip("can't find appropriate pid in use on this OS", 1)
+ unless defined($pid);
+
+ print FH $pid;
+ close( FH );
+ eval { $obj = Proc::Pidfile->new( pidfile => $pidfile ); };
+ $err = $@; undef $@;
+ like( $err, qr/already running: $pid/, "other users pid" );
+ undef $obj;
+}
+
+sub find_unused_pid
+{
+ my $pid = 1;
+
+ if ($^O eq 'riscos') {
+ require Proc::ProcessTable;
+ my $table = Proc::ProcessTable->new()->table;
+ my %processes = map { $_->pid => $_ } @$table;
+
+ $pid++ while $pid != 0 && exists($processes{$pid});
+ }
+ else {
+ $pid++ while $pid != 0 && (kill(0, $pid) || $!{'EPERM'});
+ }
+
+ return undef if $pid == 0;
+ return $pid;
+}
+
+sub find_pid_in_use_by_someone_else
+{
+ my $pid = 1;
+
+ if ($^O eq 'riscos') {
+ require Proc::ProcessTable;
+ my $table = Proc::ProcessTable->new()->table;
+ my %processes = map { $_->pid => $_ } @$table;
+
+ $pid++ until $pid == 0 || ( exists($processes{$pid})
+ and $processes{$pid}->uid != $<);
+ }
+ else {
+ $pid++ until $pid == 0 || (!kill(0, $pid) && $!{'EPERM'});
+ }
+ return undef if $pid == 0;
+ return $pid;
+}
+