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.497 by root, Fri Dec 18 03:49:46 2009 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
423 423
424=cut 424=cut
425 425
426our @SLOT_QUEUE; 426our @SLOT_QUEUE;
427our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
428 429
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
432 433
433 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
434 436
435 while () { 437 while () {
436 next_job: 438 next_job:
439
437 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 441
439 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 446 $job->[2]->send;
443 Coro::cede; 447 Coro::cede;
444 goto next_job; 448 goto next_job;
445 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 451 }
447 } 452 }
448 453
449 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 457 $signal->wait;
453 } else { 458 } else {
459 $busy = 0;
454 Coro::schedule; 460 Coro::schedule;
455 } 461 }
456 } 462 }
457}; 463};
458 464
459sub get_slot($;$$) { 465sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
461 467
462 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
463 469
464 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
465 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
466 473
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
496 503
497sub sync_job(&) { 504sub sync_job(&) {
498 my ($job) = @_; 505 my ($job) = @_;
499 506
500 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 508 my $time = AE::time;
502 509
503 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
505 512
506 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 530 } else {
524 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
525 } 532 }
526 } 533 }
527 534
528 my $time = EV::time - $time; 535 my $time = AE::time - $time;
529 536
530 $TICK_START += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
531 538
532 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
533 } else { 540 } else {
… …
1303} 1310}
1304 1311
1305use File::Glob (); 1312use File::Glob ();
1306 1313
1307cf::player->attach ( 1314cf::player->attach (
1308 on_command => sub { 1315 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1310 1317
1311 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1312 or return; 1319 or return;
1313 1320
… …
1392 . "\n};\n1"; 1399 . "\n};\n1";
1393 1400
1394 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1395 } 1402 }
1396 1403
1404 my $pass = 0;
1397 my %done; 1405 my %done;
1398 while (%todo) { 1406 while (%todo) {
1399 my $progress; 1407 my $progress;
1400 1408
1409 ++$pass;
1410
1411 ext:
1401 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1414 next ext
1404 unless exists $done{$_}; 1415 unless exists $done{$_};
1405 } 1416 }
1406 1417
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1419
1409 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1424
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1426 if exists $v->{meta}{mandatory};
1417 1427 } else {
1418 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1419 } 1434 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1435 }
1425 1436
1426 skip: 1437 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1429 } 1445 }
1430 }; 1446 };
1431} 1447}
1432 1448
1433############################################################################# 1449#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1518 } 1534 }
1519 } 1535 }
1520} 1536}
1521 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1522sub save($) { 1551sub save($) {
1523 my ($pl) = @_; 1552 my ($pl) = @_;
1524 1553
1525 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1526 1555
… …
1531 1560
1532 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1534 1563
1535 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1568
1537 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1570 cf::cede_to_tick;
1539} 1571}
1540 1572
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1786
1755 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1788 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2009 2041
2010 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
2011 } 2043 }
2012} 2044}
2013 2045
2014sub pre_load { } 2046sub pre_load { }
2015sub post_load { } 2047#sub post_load { } # XS
2016 2048
2017sub load { 2049sub load {
2018 my ($self) = @_; 2050 my ($self) = @_;
2019 2051
2020 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2109 }
2078 2110
2079 $self->post_load; 2111 $self->post_load;
2080} 2112}
2081 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2082sub customise_for { 2117sub customise_for {
2083 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2084 2119
2085 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2121 if $self->per_player;
… …
3115 3150
3116 $coro 3151 $coro
3117} 3152}
3118 3153
3119cf::client->attach ( 3154cf::client->attach (
3120 on_destroy => sub { 3155 on_client_destroy => sub {
3121 my ($ns) = @_; 3156 my ($ns) = @_;
3122 3157
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3159 },
3125); 3160);
… …
3141our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3142 3177
3143$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3144 3179
3145$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3146 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3147 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3148 sort time 3183 sort time
3149)); 3184));
3150 3185
3151# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3204 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3205 3240
3206 %vars = (_dummy => 0) unless %vars; 3241 %vars = (_dummy => 0) unless %vars;
3207 3242
3243 my @res;
3208 local $_; 3244 local $_;
3209 local @safe::cf::_safe_eval_args = values %vars;
3210 3245
3211 my $eval = 3246 my $eval =
3212 "do {\n" 3247 "do {\n"
3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3215 . $code 3250 . $code
3216 . "\n}" 3251 . "\n}"
3217 ; 3252 ;
3218 3253
3254 if ($CFG{safe_eval}) {
3219 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3220 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3222 3263
3223 if ($@) { 3264 if ($@) {
3224 warn "$@"; 3265 warn "$@";
3225 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3226 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3245=cut 3286=cut
3246 3287
3247sub register_script_function { 3288sub register_script_function {
3248 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3249 3290
3250 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3251 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3252} 3293}
3253 3294
3254=back 3295=back
3255 3296
3256=cut 3297=cut
… …
3277 3318
3278 $facedata->{version} == 2 3319 $facedata->{version} == 2
3279 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3280 3321
3281 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3282 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3283 type => FT_RSRC, 3325 type => FT_RSRC,
3284 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3285 }; 3328 };
3286 cf::cede_to_tick; 3329 cf::cede_to_tick;
3287 3330
3288 { 3331 {
3289 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3514 reload_config; 3557 reload_config;
3515 db_init; 3558 db_init;
3516 3559
3517 cf::init_uuid; 3560 cf::init_uuid;
3518 cf::init_signals; 3561 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3562 cf::init_skills;
3521 3563
3522 cf::init_beforeplay; 3564 cf::init_beforeplay;
3523 3565
3524 atomic; 3566 atomic;
… …
3542 3584
3543# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3544BEGIN { 3586BEGIN {
3545 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3549 }; 3591 };
3550 } 3592 }
3551} 3593}
3552 3594
3553sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = AE::time;
3597
3554 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3556 3600
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3602
3559 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3560 3604
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3606 or return;
3563 3607
3564 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3579 or return; 3623 or return;
3580 3624
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3626 and return;
3583 3627
3584 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3629
3586 1 3630 1
3587} 3631}
3588 3632
3589our $uuid_lock; 3633our $uuid_lock;
… …
3727 return; 3771 return;
3728 } 3772 }
3729 3773
3730 return if $RELOAD++; 3774 return if $RELOAD++;
3731 3775
3732 my $t1 = EV::time; 3776 my $t1 = AE::time;
3733 3777
3734 while ($RELOAD) { 3778 while ($RELOAD) {
3735 warn "reloading..."; 3779 warn "reloading...";
3736 3780
3737 warn "entering sync_job"; 3781 warn "entering sync_job";
… …
3840 3884
3841 warn "reloaded"; 3885 warn "reloaded";
3842 --$RELOAD; 3886 --$RELOAD;
3843 } 3887 }
3844 3888
3845 $t1 = EV::time - $t1; 3889 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 3890 warn "reload completed in ${t1}s\n";
3847}; 3891};
3848 3892
3849our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3850 3894
… …
3853 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3854 3898
3855 $RELOAD_WATCHER ||= cf::async { 3899 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 3900 Coro::AIO::aio_wait cache_extensions;
3857 3901
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 3903 do_reload_perl;
3860 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3861 }; 3905 };
3862 }; 3906 };
3863} 3907}
… …
3903 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3904 return; 3948 return;
3905 } 3949 }
3906 3950
3907 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3908 3954
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911 Coro::async_pool { 3957 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3935} 3981}
3936 3982
3937{ 3983{
3938 # configure BDB 3984 # configure BDB
3939 3985
3940 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3943 3989
3944 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;

Diff Legend

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