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.508 by root, Sun Mar 28 22:29:50 2010 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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
… …
162 165
163our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
164 167
165sub cf::map::normalise; 168sub cf::map::normalise;
166 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
167############################################################################# 174#############################################################################
168 175
169%REFLECT = (); 176%REFLECT = ();
170for (@REFLECT) { 177for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
260 267
261 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
262 269
263 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 272 return;#d#
266 }#d# 273 }#d#
267 274
268 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
396} 403}
397 404
398=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
399 406
400Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 408get spread over time.
402 409
403=cut 410=cut
404 411
405sub periodic($$) { 412sub periodic($$) {
406 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
503 510
504sub sync_job(&) { 511sub sync_job(&) {
505 my ($job) = @_; 512 my ($job) = @_;
506 513
507 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
508 my $time = EV::time; 515 my $time = AE::time;
509 516
510 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
512 519
513 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
530 } else { 537 } else {
531 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
532 } 539 }
533 } 540 }
534 541
535 my $time = EV::time - $time; 542 my $time = AE::time - $time;
536 543
537 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
538 545
539 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
540 } else { 547 } else {
… …
584 reset_signals; 591 reset_signals;
585 &$cb 592 &$cb
586 }, @args; 593 }, @args;
587 594
588 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
589} 607}
590 608
591=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
592 610
593=cut 611=cut
… …
1310} 1328}
1311 1329
1312use File::Glob (); 1330use File::Glob ();
1313 1331
1314cf::player->attach ( 1332cf::player->attach (
1315 on_command => sub { 1333 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1317 1335
1318 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1319 or return; 1337 or return;
1320 1338
… …
1422 if (length $@) { 1440 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1441 warn "$v->{path}: $@\n";
1424 1442
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1444 if exists $v->{meta}{mandatory};
1445
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1427 } else { 1448 } else {
1428 $done{$k} = delete $todo{$k}; 1449 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1450 push @EXTS, $v->{pkg};
1430 $progress = 1; 1451 $progress = 1;
1431 1452
… …
1533 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1534 } 1555 }
1535 } 1556 }
1536} 1557}
1537 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1538sub save($) { 1572sub save($) {
1539 my ($pl) = @_; 1573 my ($pl) = @_;
1540 1574
1541 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1542 1576
… …
1547 1581
1548 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1550 1584
1551 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1589
1553 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1591 cf::cede_to_tick;
1555} 1592}
1556 1593
… …
1658 \@logins 1695 \@logins
1659} 1696}
1660 1697
1661=item $player->maps 1698=item $player->maps
1662 1699
1700=item cf::player::maps $login
1701
1663Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1664player. May block. 1703player. May block.
1665 1704
1666=cut 1705=cut
1667 1706
… …
1728 1767
1729=cut 1768=cut
1730 1769
1731sub find_by_path($) { 1770sub find_by_path($) {
1732 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1733 1774
1734 my ($match, $specificity); 1775 my ($match, $specificity);
1735 1776
1736 for my $region (list) { 1777 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
… …
2182 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2183 2224
2184 () 2225 ()
2185} 2226}
2186 2227
2228# common code, used by both ->save and ->swapout
2187sub save { 2229sub _save {
2188 my ($self) = @_; 2230 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2231
2192 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2193 2233
2194 return unless $self->dirty; 2234 return unless $self->dirty;
2195 2235
… …
2215 } else { 2255 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2257 }
2218} 2258}
2219 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2220sub swap_out { 2268sub swap_out {
2221 my ($self) = @_; 2269 my ($self) = @_;
2222 2270
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2272
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2231 2276
2232 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2233
2234 $self->deactivate; 2278 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2236 $self->clear; 2286 $self->clear;
2237} 2287}
2238 2288
2239sub reset_at { 2289sub reset_at {
2240 my ($self) = @_; 2290 my ($self) = @_;
… …
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2620
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2573 2623
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2625}
2576 2626
2577sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2579 2629
… …
3134 3184
3135 $coro 3185 $coro
3136} 3186}
3137 3187
3138cf::client->attach ( 3188cf::client->attach (
3139 on_destroy => sub { 3189 on_client_destroy => sub {
3140 my ($ns) = @_; 3190 my ($ns) = @_;
3141 3191
3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143 }, 3193 },
3144); 3194);
… …
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517 3567
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3569
3525 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
… …
3532 }; 3577 };
3533 3578
3534 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3535 3580
3536 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3537 cf::load_settings; 3587 cf::load_settings;
3538 cf::load_materials; 3588 cf::load_materials;
3539 3589
3540 reload_resources; 3590 reload_resources;
3541 reload_config; 3591 reload_config;
3542 db_init; 3592 db_init;
3543 3593
3544 cf::init_uuid; 3594 cf::init_uuid;
3545 cf::init_signals; 3595 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3596 cf::init_skills;
3548 3597
3549 cf::init_beforeplay; 3598 cf::init_beforeplay;
3550 3599
3551 atomic; 3600 atomic;
… …
3558 use POSIX (); 3607 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3609
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3562 }; 3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3563 3615
3564 main_loop; 3616 main_loop;
3565} 3617}
3566 3618
3567############################################################################# 3619#############################################################################
… …
3569 3621
3570# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3571BEGIN { 3623BEGIN {
3572 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3576 }; 3628 };
3577 } 3629 }
3578} 3630}
3579 3631
3580sub write_runtime_sync { 3632sub write_runtime_sync {
3581 my $t0 = EV::time; 3633 my $t0 = AE::time;
3582 3634
3583 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3585 3637
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3660 or return;
3609 3661
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3663 and return;
3612 3664
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3666
3615 1 3667 1
3616} 3668}
3617 3669
3618our $uuid_lock; 3670our $uuid_lock;
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3800 }
3749 warn "cleared package $pkg\n";#d#
3750} 3801}
3751 3802
3752sub do_reload_perl() { 3803sub do_reload_perl() {
3753 # can/must only be called in main 3804 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3755 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3756 return; 3807 return;
3757 } 3808 }
3758 3809
3759 return if $RELOAD++; 3810 return if $RELOAD++;
3760 3811
3761 my $t1 = EV::time; 3812 my $t1 = AE::time;
3762 3813
3763 while ($RELOAD) { 3814 while ($RELOAD) {
3764 warn "reloading..."; 3815 warn "reloading...";
3765 3816
3766 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3869 3920
3870 warn "reloaded"; 3921 warn "reloaded";
3871 --$RELOAD; 3922 --$RELOAD;
3872 } 3923 }
3873 3924
3874 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3876}; 3927};
3877 3928
3878our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3879 3930
… …
3882 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3883 3934
3884 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3886 3937
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 3939 do_reload_perl;
3889 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3890 }; 3941 };
3891 }; 3942 };
3892} 3943}
… …
3933 return; 3984 return;
3934 } 3985 }
3935 3986
3936 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3937 3988
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 3990
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 3993 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";

Diff Legend

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