ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 2010 UTC

… …
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 118our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
117 120
… …
396} 399}
397 400
398=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
399 402
400Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 404get spread over time.
402 405
403=cut 406=cut
404 407
405sub periodic($$) { 408sub periodic($$) {
406 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
503 506
504sub sync_job(&) { 507sub sync_job(&) {
505 my ($job) = @_; 508 my ($job) = @_;
506 509
507 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
508 my $time = EV::time; 511 my $time = AE::time;
509 512
510 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
512 515
513 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
530 } else { 533 } else {
531 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
532 } 535 }
533 } 536 }
534 537
535 my $time = EV::time - $time; 538 my $time = AE::time - $time;
536 539
537 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
538 541
539 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
540 } else { 543 } else {
… …
584 reset_signals; 587 reset_signals;
585 &$cb 588 &$cb
586 }, @args; 589 }, @args;
587 590
588 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
589} 603}
590 604
591=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
592 606
593=cut 607=cut
… …
2198 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2199 2213
2200 () 2214 ()
2201} 2215}
2202 2216
2217# common code, used by both ->save and ->swapout
2203sub save { 2218sub _save {
2204 my ($self) = @_; 2219 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2220
2208 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2209 2222
2210 return unless $self->dirty; 2223 return unless $self->dirty;
2211 2224
… …
2231 } else { 2244 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2246 }
2234} 2247}
2235 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2236sub swap_out { 2257sub swap_out {
2237 my ($self) = @_; 2258 my ($self) = @_;
2238 2259
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2261
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2247 2265
2248 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2249
2250 $self->deactivate; 2267 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2252 $self->clear; 2275 $self->clear;
2253} 2276}
2254 2277
2255sub reset_at { 2278sub reset_at {
2256 my ($self) = @_; 2279 my ($self) = @_;
… …
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533 3556
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3558
3541 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
… …
3548 }; 3566 };
3549 3567
3550 evthread_start IO::AIO::poll_fileno; 3568 evthread_start IO::AIO::poll_fileno;
3551 3569
3552 cf::sync_job { 3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3553 cf::load_settings; 3576 cf::load_settings;
3554 cf::load_materials; 3577 cf::load_materials;
3555 3578
3556 reload_resources; 3579 reload_resources;
3557 reload_config; 3580 reload_config;
… …
3573 use POSIX (); 3596 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3598
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3599 (pop @POST_INIT)->(0) while @POST_INIT;
3577 }; 3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3578 3604
3579 main_loop; 3605 main_loop;
3580} 3606}
3581 3607
3582############################################################################# 3608#############################################################################
… …
3584 3610
3585# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3586BEGIN { 3612BEGIN {
3587 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3588 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3589 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3590 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3591 }; 3617 };
3592 } 3618 }
3593} 3619}
3594 3620
3595sub write_runtime_sync { 3621sub write_runtime_sync {
3596 my $t0 = EV::time; 3622 my $t0 = AE::time;
3597 3623
3598 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3599 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3600 3626
3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3623 or return; 3649 or return;
3624 3650
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3652 and return;
3627 3653
3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3655
3630 1 3656 1
3631} 3657}
3632 3658
3633our $uuid_lock; 3659our $uuid_lock;
… …
3771 return; 3797 return;
3772 } 3798 }
3773 3799
3774 return if $RELOAD++; 3800 return if $RELOAD++;
3775 3801
3776 my $t1 = EV::time; 3802 my $t1 = AE::time;
3777 3803
3778 while ($RELOAD) { 3804 while ($RELOAD) {
3779 warn "reloading..."; 3805 warn "reloading...";
3780 3806
3781 warn "entering sync_job"; 3807 warn "entering sync_job";
… …
3884 3910
3885 warn "reloaded"; 3911 warn "reloaded";
3886 --$RELOAD; 3912 --$RELOAD;
3887 } 3913 }
3888 3914
3889 $t1 = EV::time - $t1; 3915 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 3916 warn "reload completed in ${t1}s\n";
3891}; 3917};
3892 3918
3893our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3894 3920
… …
3897 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3898 3924
3899 $RELOAD_WATCHER ||= cf::async { 3925 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions; 3926 Coro::AIO::aio_wait cache_extensions;
3901 3927
3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl; 3929 do_reload_perl;
3904 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3905 }; 3931 };
3906 }; 3932 };
3907} 3933}
… …
3948 return; 3974 return;
3949 } 3975 }
3950 3976
3951 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3952 3978
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 3980
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 3983 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines