--- deliantra/server/lib/cf.pm 2008/05/05 22:38:47 1.432 +++ deliantra/server/lib/cf.pm 2008/05/10 22:38:52 1.433 @@ -27,19 +27,20 @@ use Symbol; use List::Util; use Socket; -use EV 3.2; +use EV; use Opcode; use Safe; use Safe::Hole; use Storable (); -use Coro 4.50 (); +use Coro (); use Coro::State; use Coro::Handle; use Coro::EV; use Coro::Timer; use Coro::Signal; use Coro::Semaphore; +use Coro::AnyEvent; use Coro::AIO; use Coro::BDB; use Coro::Storable; @@ -51,11 +52,13 @@ use Digest::MD5; use Fcntl; use YAML (); -use IO::AIO 2.51 (); +use IO::AIO (); use Time::HiRes; use Compress::LZF; use Digest::MD5 (); +AnyEvent::detect; + # configure various modules to our taste # $Storable::canonical = 1; # reduce rsync transfers @@ -92,12 +95,10 @@ our %RESOURCE; our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) -our $AIO_POLL_WATCHER; our $NEXT_RUNTIME_WRITE; # when should the runtime file be written our $NEXT_TICK; our $USE_FSYNC = 1; # use fsync to write maps - default off -our $BDB_POLL_WATCHER; our $BDB_DEADLOCK_WATCHER; our $BDB_CHECKPOINT_WATCHER; our $BDB_TRICKLE_WATCHER; @@ -3789,7 +3790,7 @@ BDB::min_parallel 8; BDB::max_poll_reqs $TICK * 0.1; - $Coro::BDB::WATCHER->priority (1); + $AnyEvent::BDB::WATCHER->priority (1); unless ($DB_ENV) { $DB_ENV = BDB::db_env_create; @@ -3830,7 +3831,7 @@ IO::AIO::min_parallel 8; IO::AIO::max_poll_time $TICK * 0.1; - $Coro::AIO::WATCHER->priority (1); + $AnyEvent::AIO::WATCHER->priority (1); } my $_log_backtrace;