r64338 - in /trunk/libcoro-perl: ./ Coro/ Coro/libcoro/ EV/ Event/ debian/

eloy at users.alioth.debian.org eloy at users.alioth.debian.org
Thu Oct 28 11:00:31 UTC 2010


Author: eloy
Date: Thu Oct 28 10:59:58 2010
New Revision: 64338

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64338
Log:
new upstream version

Added:
    trunk/libcoro-perl/META.json
      - copied unchanged from r64337, branches/upstream/libcoro-perl/current/META.json
Modified:
    trunk/libcoro-perl/Changes
    trunk/libcoro-perl/Coro.pm
    trunk/libcoro-perl/Coro/AIO.pm
    trunk/libcoro-perl/Coro/AnyEvent.pm
    trunk/libcoro-perl/Coro/BDB.pm
    trunk/libcoro-perl/Coro/Channel.pm
    trunk/libcoro-perl/Coro/Debug.pm
    trunk/libcoro-perl/Coro/Handle.pm
    trunk/libcoro-perl/Coro/Intro.pod
    trunk/libcoro-perl/Coro/LWP.pm
    trunk/libcoro-perl/Coro/MakeMaker.pm
    trunk/libcoro-perl/Coro/RWLock.pm
    trunk/libcoro-perl/Coro/Select.pm
    trunk/libcoro-perl/Coro/Semaphore.pm
    trunk/libcoro-perl/Coro/SemaphoreSet.pm
    trunk/libcoro-perl/Coro/Signal.pm
    trunk/libcoro-perl/Coro/Socket.pm
    trunk/libcoro-perl/Coro/Specific.pm
    trunk/libcoro-perl/Coro/State.pm
    trunk/libcoro-perl/Coro/State.xs
    trunk/libcoro-perl/Coro/Storable.pm
    trunk/libcoro-perl/Coro/Timer.pm
    trunk/libcoro-perl/Coro/Util.pm
    trunk/libcoro-perl/Coro/libcoro/coro.h
    trunk/libcoro-perl/EV/EV.pm
    trunk/libcoro-perl/EV/EV.xs
    trunk/libcoro-perl/Event/Event.pm
    trunk/libcoro-perl/Event/Event.xs
    trunk/libcoro-perl/MANIFEST
    trunk/libcoro-perl/META.yml
    trunk/libcoro-perl/debian/changelog
    trunk/libcoro-perl/debian/control
    trunk/libcoro-perl/debian/copyright

Modified: trunk/libcoro-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Changes?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Changes (original)
+++ trunk/libcoro-perl/Changes Thu Oct 28 10:59:58 2010
@@ -5,6 +5,14 @@
 TODO: myhttpd header parsing
 TODO: channel->maxsize(newsize)?
 TODO: http://www.microsoft.com/msj/archive/s2ce.aspx
+
+5.24  Sat Oct 23 11:27:12 CEST 2010
+	- port to the EV 4.0 API.
+	- work around bugs in mingw32, making strawberry perl work
+          out of the box.
+	- correctly modify Coro::AIO function prototypes
+          so that they reflect the "no optional parameters" rule.
+	- "ported" libcoro to C++.
 
 5.23  Mon May 17 18:50:42 CEST 2010
 	- be more resistant to ordering changes when initialising

Modified: trunk/libcoro-perl/Coro.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro.pm (original)
+++ trunk/libcoro-perl/Coro.pm Thu Oct 28 10:59:58 2010
@@ -83,7 +83,7 @@
 our $main;    # main coro
 our $current; # current coro
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 our @EXPORT = qw(async async_pool cede schedule terminate current unblock_sub rouse_cb rouse_wait);
 our %EXPORT_TAGS = (

Modified: trunk/libcoro-perl/Coro/AIO.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/AIO.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/AIO.pm (original)
+++ trunk/libcoro-perl/Coro/AIO.pm Thu Oct 28 10:59:58 2010
@@ -23,9 +23,10 @@
 This module implements a thin wrapper around L<IO::AIO>. All of
 the functions that expect a callback are being wrapped by this module.
 
-The API is exactly the same as that of the corresponding IO::AIO routines,
-except that you have to specify I<all> arguments I<except> the callback
-argument. Instead the routines return the values normally passed to the
+The API is exactly the same as that of the corresponding IO::AIO
+routines, except that you have to specify I<all> arguments, even the
+ones optional in IO::AIO, I<except> the callback argument. Instead of
+calling a callback, the routines return the values normally passed to the
 callback. Everything else, including C<$!> and perls stat cache, are set
 as expected after these functions return.
 
@@ -68,7 +69,7 @@
 
 use base Exporter::;
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 our @EXPORT    = (@IO::AIO::EXPORT, qw(aio_wait));
 our @EXPORT_OK = @IO::AIO::EXPORT_OK;
@@ -90,7 +91,8 @@
       my $iosub = "IO::AIO::$sub";
       my $proto = prototype $iosub;
 
-      $proto =~ s/;?\$$// or die "$iosub: unable to remove callback slot from prototype";
+      $proto =~ s/;//g; # we do not support optional arguments
+      $proto =~ s/^(\$*)\$$/$1/ or die "$iosub($proto): unable to remove callback slot from prototype";
 
       _register "Coro::AIO::$sub", $proto, \&{$iosub};
    }

Modified: trunk/libcoro-perl/Coro/AnyEvent.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/AnyEvent.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/AnyEvent.pm (original)
+++ trunk/libcoro-perl/Coro/AnyEvent.pm Thu Oct 28 10:59:58 2010
@@ -155,7 +155,7 @@
 use Coro;
 use AnyEvent ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 #############################################################################
 # idle handler

Modified: trunk/libcoro-perl/Coro/BDB.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/BDB.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/BDB.pm (original)
+++ trunk/libcoro-perl/Coro/BDB.pm Thu Oct 28 10:59:58 2010
@@ -47,7 +47,7 @@
 
 use base Exporter::;
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 our $WATCHER;
 
 BDB::set_sync_prepare {

Modified: trunk/libcoro-perl/Coro/Channel.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Channel.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Channel.pm (original)
+++ trunk/libcoro-perl/Coro/Channel.pm Thu Oct 28 10:59:58 2010
@@ -32,7 +32,7 @@
 use Coro ();
 use Coro::Semaphore ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 sub DATA (){ 0 }
 sub SGET (){ 1 }

Modified: trunk/libcoro-perl/Coro/Debug.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Debug.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Debug.pm (original)
+++ trunk/libcoro-perl/Coro/Debug.pm Thu Oct 28 10:59:58 2010
@@ -121,7 +121,7 @@
 use Coro::AnyEvent ();
 use Coro::Timer ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 our %log;
 our $SESLOGLEVEL = exists $ENV{PERL_CORO_DEFAULT_LOGLEVEL} ? $ENV{PERL_CORO_DEFAULT_LOGLEVEL} : -1;

Modified: trunk/libcoro-perl/Coro/Handle.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Handle.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Handle.pm (original)
+++ trunk/libcoro-perl/Coro/Handle.pm Thu Oct 28 10:59:58 2010
@@ -45,7 +45,7 @@
 
 use base 'Exporter';
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 our @EXPORT = qw(unblock);
 
 =item $fh = new_from_fh Coro::Handle $fhandle [, arg => value...]

Modified: trunk/libcoro-perl/Coro/Intro.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Intro.pod?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Intro.pod (original)
+++ trunk/libcoro-perl/Coro/Intro.pod Thu Oct 28 10:59:58 2010
@@ -107,7 +107,7 @@
 
 This nicely illustrates the non-local jump ability: the main program
 prints the first line, and then yields the CPU to whatever other
-threads there are. And there there is one other, which runs and prints
+threads there are. And there is one other, which runs and prints
 "async 1", and itself yields the CPU. Since the only other thread
 available is the main program, it continues running and so on.
 
@@ -257,7 +257,7 @@
 object. Nothing happens as long as there are references to it, but when
 all references are gone, for example, when C<costly_function> returns or
 throws an exception, it will automatically call C<up> on the semaphore,
-no way to forget it. even when the thread gets C<cancel>ed by another
+no way to forget it. Even when the thread gets C<cancel>ed by another
 thread will the guard object ensure that the lock is freed.
 
 Apart from L<Coro::Semaphore> and L<Coro::Signal>, there is
@@ -309,11 +309,11 @@
 first checks whether there I<is> some data available, and if not, it block
 the current thread until some data arrives. C<put> can also block, as
 each Channel has a "maximum buffering capacity", i.e. you cannot store
-more than a specific number of items, which cna be confgiured when the
+more than a specific number of items, which can be configured when the
 Channel gets created.
 
-In the above example, C<put> never blocks, as the default capacity is
-of a Channel is very high.  So the foor loop first puts data into the
+In the above example, C<put> never blocks, as the default capacity
+of a Channel is very high.  So the for loop first puts data into the
 channel, then tries to C<get> the result. Since the async thread hasn't
 put anything in there yet (on the firts iteration it hasn't even run
 yet), the result Channel is still empty, so the main thread blocks.
@@ -334,7 +334,7 @@
 
 Be careful, however: when multiple threads put numbers into C<$calculate>
 and read from C<$result>, they won't know which result is theirs. The
-solution for this is to ither use a semaphore, or send not just the
+solution for this is to either use a semaphore, or send not just the
 number, but also your own private result channel.
 
 L<Coro::Channel> can buffer some amount of items. It is also very
@@ -468,7 +468,7 @@
 
 Coro really wants to run in a program using some event loop. In fact, most
 real-world programs using Coro's threads are written in a combination of
-event-based and thread-based techniques, as it is easy to gett he best of
+event-based and thread-based techniques, as it is easy to get the best of
 both worlds with Coro.
 
 Coro integrates well into any event loop supported by L<AnyEvent>, simply

Modified: trunk/libcoro-perl/Coro/LWP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/LWP.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/LWP.pm (original)
+++ trunk/libcoro-perl/Coro/LWP.pm Thu Oct 28 10:59:58 2010
@@ -94,7 +94,7 @@
 use Net::FTP ();
 use Net::NNTP ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 *Socket::inet_aton = \&Coro::Util::inet_aton;
 

Modified: trunk/libcoro-perl/Coro/MakeMaker.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/MakeMaker.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/MakeMaker.pm (original)
+++ trunk/libcoro-perl/Coro/MakeMaker.pm Thu Oct 28 10:59:58 2010
@@ -7,7 +7,7 @@
 
 our $installsitearch;
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 our @EXPORT_OK = qw(&coro_args $installsitearch);
 
 my %opt;

Modified: trunk/libcoro-perl/Coro/RWLock.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/RWLock.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/RWLock.pm (original)
+++ trunk/libcoro-perl/Coro/RWLock.pm Thu Oct 28 10:59:58 2010
@@ -30,7 +30,7 @@
 
 use Coro ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 =item $l = new Coro::RWLock;
 

Modified: trunk/libcoro-perl/Coro/Select.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Select.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Select.pm (original)
+++ trunk/libcoro-perl/Coro/Select.pm Thu Oct 28 10:59:58 2010
@@ -67,7 +67,7 @@
 
 use base Exporter::;
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 our @EXPORT_OK = "select";
 
 sub import {

Modified: trunk/libcoro-perl/Coro/Semaphore.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Semaphore.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Semaphore.pm (original)
+++ trunk/libcoro-perl/Coro/Semaphore.pm Thu Oct 28 10:59:58 2010
@@ -37,7 +37,7 @@
 
 use Coro ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 =item new [inital count]
 

Modified: trunk/libcoro-perl/Coro/SemaphoreSet.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/SemaphoreSet.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/SemaphoreSet.pm (original)
+++ trunk/libcoro-perl/Coro/SemaphoreSet.pm Thu Oct 28 10:59:58 2010
@@ -32,7 +32,7 @@
 
 use common::sense;
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 use Coro::Semaphore ();
 

Modified: trunk/libcoro-perl/Coro/Signal.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Signal.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Signal.pm (original)
+++ trunk/libcoro-perl/Coro/Signal.pm Thu Oct 28 10:59:58 2010
@@ -35,7 +35,7 @@
 
 use Coro::Semaphore ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 =item $sig = new Coro::Signal;
 

Modified: trunk/libcoro-perl/Coro/Socket.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Socket.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Socket.pm (original)
+++ trunk/libcoro-perl/Coro/Socket.pm Thu Oct 28 10:59:58 2010
@@ -73,7 +73,7 @@
 
 use base qw(Coro::Handle IO::Socket::INET);
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 our (%_proto, %_port);
 

Modified: trunk/libcoro-perl/Coro/Specific.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Specific.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Specific.pm (original)
+++ trunk/libcoro-perl/Coro/Specific.pm Thu Oct 28 10:59:58 2010
@@ -26,7 +26,7 @@
 
 use common::sense;
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 =item new
 

Modified: trunk/libcoro-perl/Coro/State.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/State.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/State.pm (original)
+++ trunk/libcoro-perl/Coro/State.pm Thu Oct 28 10:59:58 2010
@@ -92,7 +92,7 @@
 use XSLoader;
 
 BEGIN {
-   our $VERSION = 5.23;
+   our $VERSION = 5.24;
 
    # must be done here because the xs part expects it to exist
    # it might exist already because Coro::Specific created it.

Modified: trunk/libcoro-perl/Coro/State.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/State.xs?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/State.xs (original)
+++ trunk/libcoro-perl/Coro/State.xs Thu Oct 28 10:59:58 2010
@@ -1,3 +1,6 @@
+/* this works around a bug in mingw32 providing a non-working setjmp */
+#define USE_NO_MINGW_SETJMP_TWO_ARGS
+
 #define NDEBUG 1
 
 #include "libcoro/coro.c"
@@ -2424,8 +2427,8 @@
       if (items > slf_arga)
         {
           slf_arga = items;
-          free (slf_argv);
-          slf_argv = malloc (slf_arga * sizeof (SV *));
+          Safefree (slf_argv);
+          New (0, slf_argv, slf_arga, SV *);
         }
 
       slf_argc = items;
@@ -2796,7 +2799,7 @@
       av_push (av, SvREFCNT_inc_NN (cb_cv));
 
       if (SvIVX (AvARRAY (av)[0]))
-        coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
+        coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
 
       frame->prepare = prepare_nop;
       frame->check   = slf_check_nop;
@@ -2968,7 +2971,7 @@
     call_sv ((SV *)req, G_VOID | G_DISCARD);
   }
 
-  /* now that the requets is going, we loop toll we have a result */
+  /* now that the request is going, we loop till we have a result */
   frame->data    = (void *)state;
   frame->prepare = prepare_schedule;
   frame->check   = slf_check_aio_req;
@@ -3277,15 +3280,15 @@
         RETVAL
 
 void
-throw (Coro::State self, SV *throw = &PL_sv_undef)
+throw (Coro::State self, SV *exception = &PL_sv_undef)
 	PROTOTYPE: $;$
         CODE:
 {
 	struct coro *current = SvSTATE_current;
-	SV **throwp = self == current ? &CORO_THROW : &self->except;
-        SvREFCNT_dec (*throwp);
-        SvGETMAGIC (throw);
-        *throwp = SvOK (throw) ? newSVsv (throw) : 0;
+	SV **exceptionp = self == current ? &CORO_THROW : &self->except;
+        SvREFCNT_dec (*exceptionp);
+        SvGETMAGIC (exception);
+        *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
 }
 
 void

Modified: trunk/libcoro-perl/Coro/Storable.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Storable.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Storable.pm (original)
+++ trunk/libcoro-perl/Coro/Storable.pm Thu Oct 28 10:59:58 2010
@@ -84,7 +84,7 @@
 use Storable;
 use base "Exporter";
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 our @EXPORT = qw(thaw freeze nfreeze blocking_thaw blocking_freeze blocking_nfreeze);
 
 our $GRANULARITY = 0.01;

Modified: trunk/libcoro-perl/Coro/Timer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Timer.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Timer.pm (original)
+++ trunk/libcoro-perl/Coro/Timer.pm Thu Oct 28 10:59:58 2010
@@ -30,7 +30,7 @@
 use Coro ();
 use Coro::AnyEvent ();
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 our @EXPORT_OK = qw(timeout sleep);
 
 =item $flag = timeout $seconds;

Modified: trunk/libcoro-perl/Coro/Util.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/Util.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/Util.pm (original)
+++ trunk/libcoro-perl/Coro/Util.pm Thu Oct 28 10:59:58 2010
@@ -41,7 +41,7 @@
 our @EXPORT = qw(gethostbyname gethostbyaddr);
 our @EXPORT_OK = qw(inet_aton fork_eval);
 
-our $VERSION = 5.23;
+our $VERSION = 5.24;
 
 our $MAXPARALLEL = 16; # max. number of parallel jobs
 

Modified: trunk/libcoro-perl/Coro/libcoro/coro.h
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Coro/libcoro/coro.h?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Coro/libcoro/coro.h (original)
+++ trunk/libcoro-perl/Coro/libcoro/coro.h Thu Oct 28 10:59:58 2010
@@ -74,6 +74,10 @@
 #ifndef CORO_H
 #define CORO_H
 
+#if __cplusplus
+extern "C" {
+#endif
+
 #define CORO_VERSION 2
 
 /*
@@ -291,5 +295,9 @@
 
 #endif
 
-#endif
-
+#if __cplusplus
+}
+#endif
+
+#endif
+

Modified: trunk/libcoro-perl/EV/EV.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/EV/EV.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/EV/EV.pm (original)
+++ trunk/libcoro-perl/EV/EV.pm Thu Oct 28 10:59:58 2010
@@ -20,7 +20,7 @@
 higher priority. After that, it will cede once to a threads of lower
 priority, then continue in the event loop.
 
-That means that threads with the same or higher pripority as the threads
+That means that threads with the same or higher priority as the threads
 running the main loop will inhibit event processing, while threads of
 lower priority will get the CPU, but cannot completeley inhibit event
 processing. Note that for that to work you actually have to run the EV
@@ -56,7 +56,7 @@
 use XSLoader;
 
 BEGIN {
-   our $VERSION = 5.23;
+   our $VERSION = 5.24;
 
    local $^W = 0; # avoid redefine warning for Coro::ready;
    XSLoader::load __PACKAGE__, $VERSION;

Modified: trunk/libcoro-perl/EV/EV.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/EV/EV.xs?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/EV/EV.xs (original)
+++ trunk/libcoro-perl/EV/EV.xs Thu Oct 28 10:59:58 2010
@@ -323,9 +323,11 @@
         /* same reasoning as above, make sure it is stopped */
         if (ev_is_active (&idler))
           ev_idle_stop (EV_DEFAULT_UC, &idler);
-
+#if EV_VERSION_MAJOR >= 4
+        ev_run (EV_DEFAULT_UC, EVRUN_ONCE);
+#else
         ev_loop (EV_DEFAULT_UC, EVLOOP_ONESHOT);
-
+#endif
         --inhibit;
 }
 

Modified: trunk/libcoro-perl/Event/Event.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Event/Event.pm?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Event/Event.pm (original)
+++ trunk/libcoro-perl/Event/Event.pm Thu Oct 28 10:59:58 2010
@@ -92,7 +92,7 @@
 our @EXPORT = qw(loop unloop sweep);
 
 BEGIN {
-   our $VERSION = 5.23;
+   our $VERSION = 5.24;
 
    local $^W = 0; # avoid redefine warning for Coro::ready;
    XSLoader::load __PACKAGE__, $VERSION;

Modified: trunk/libcoro-perl/Event/Event.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/Event/Event.xs?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/Event/Event.xs (original)
+++ trunk/libcoro-perl/Event/Event.xs Thu Oct 28 10:59:58 2010
@@ -90,7 +90,7 @@
 _install_std_cb (SV *self, int type)
         CODE:
 {
-        pe_watcher *w = GEventAPI->sv_2watcher (self);
+        pe_watcher *w = (pe_watcher *)GEventAPI->sv_2watcher (self);
 
         if (w->callback)
           croak ("Coro::Event watchers must not have a callback (see Coro::Event), caught");
@@ -106,7 +106,7 @@
           AvARRAY (priv)[CD_GOT ] = newSViv (0);
           SvREADONLY_on (priv);
 
-          w->callback = coro_std_cb;
+          w->callback = (void *)coro_std_cb;
           w->ext_data = priv;
 
           {
@@ -121,7 +121,7 @@
 _next (SV *self)
         CODE:
 {
-        pe_watcher *w = GEventAPI->sv_2watcher (self);
+        pe_watcher *w = (pe_watcher *)GEventAPI->sv_2watcher (self);
         AV *priv = (AV *)w->ext_data;
 
         if (AvARRAY (priv)[CD_OK] == &PL_sv_yes)
@@ -146,7 +146,7 @@
           XSRETURN_EMPTY;
 
         {
-          pe_watcher *w = GEventAPI->sv_2watcher (self);
+          pe_watcher *w = (pe_watcher *)GEventAPI->sv_2watcher (self);
           AV *priv = (AV *)w->ext_data;
 
           RETVAL = newRV_inc ((SV *)priv);

Modified: trunk/libcoro-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/MANIFEST?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/MANIFEST (original)
+++ trunk/libcoro-perl/MANIFEST Thu Oct 28 10:59:58 2010
@@ -90,3 +90,4 @@
 doc/cede-vs-schedule
 
 META.yml                                 Module meta-data (added by MakeMaker)
+META.json                                Module meta-data (added by MakeMaker)

Modified: trunk/libcoro-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/META.yml?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/META.yml (original)
+++ trunk/libcoro-perl/META.yml Thu Oct 28 10:59:58 2010
@@ -1,33 +1,41 @@
---- #YAML:1.0
-name:               Coro
-version:            5.23
-abstract:           ~
-author:  []
-license:            unknown
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
-build_requires:
-    ExtUtils::MakeMaker:  0
-requires:
-    AnyEvent:       5
-    common::sense:  0
-    Guard:          0.5
-    Scalar::Util:   0
-    Storable:       2.15
-    Time::HiRes:    0
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.55_02
-meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
-recommends:
-    AnyEvent::AIO:  1
-    AnyEvent::BDB:  1
-    BDB:            0
-    EV:             3
-    Event:          1.08
-    IO::AIO:        3.1
+{
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "meta-spec" : {
+      "version" : 1.4,
+      "url" : "http://module-build.sourceforge.net/META-spec-v1.4.html"
+   },
+   "generated_by" : "ExtUtils::MakeMaker version 6.56",
+   "distribution_type" : "module",
+   "version" : "5.24",
+   "name" : "Coro",
+   "author" : [],
+   "license" : "unknown",
+   "build_requires" : {
+      "ExtUtils::MakeMaker" : 0
+   },
+   "requires" : {
+      "Scalar::Util" : 0,
+      "AnyEvent" : 5,
+      "Guard" : 0.5,
+      "Storable" : 2.15,
+      "Time::HiRes" : 0,
+      "common::sense" : 0
+   },
+   "recommends" : {
+      "BDB" : 0,
+      "AnyEvent::AIO" : 1,
+      "Event" : 1.08,
+      "EV" : 3,
+      "IO::AIO" : 3.1,
+      "AnyEvent::BDB" : 1
+   },
+   "abstract" : null,
+   "configure_requires" : {
+      "ExtUtils::MakeMaker" : 0
+   }
+}

Modified: trunk/libcoro-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/debian/changelog?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/debian/changelog (original)
+++ trunk/libcoro-perl/debian/changelog Thu Oct 28 10:59:58 2010
@@ -1,3 +1,11 @@
+libcoro-perl (5.240-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control: added me to Uploaders
+  * debian/copyright: added me
+
+ -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org>  Thu, 28 Oct 2010 12:58:00 +0200
+
 libcoro-perl (5.230-4) unstable; urgency=low
 
   * debian/rules: remove architecture-specific backend selection; potentially

Modified: trunk/libcoro-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/debian/control?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/debian/control (original)
+++ trunk/libcoro-perl/debian/control Thu Oct 28 10:59:58 2010
@@ -5,7 +5,8 @@
  libguard-perl, libanyevent-perl (>= 5.271-2), libcommon-sense-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jawnsy at cpan.org>,
- gregor herrmann <gregoa at debian.org>
+ gregor herrmann <gregoa at debian.org>,
+ Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
 Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/Coro/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcoro-perl/

Modified: trunk/libcoro-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcoro-perl/debian/copyright?rev=64338&op=diff
==============================================================================
--- trunk/libcoro-perl/debian/copyright (original)
+++ trunk/libcoro-perl/debian/copyright Thu Oct 28 10:59:58 2010
@@ -80,6 +80,7 @@
 Files: debian/*
 Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
  2010, gregor herrmann <gregoa at debian.org>
+ 2010, Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
 License: Artistic or GPL-1+
 
 License: Artistic




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