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.499 by root, Sun Jan 10 17:43:46 2010 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 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.
… …
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
… …
423 426
424=cut 427=cut
425 428
426our @SLOT_QUEUE; 429our @SLOT_QUEUE;
427our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
428 432
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
432 436
433 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
434 439
435 while () { 440 while () {
436 next_job: 441 next_job:
442
437 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 444
439 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 449 $job->[2]->send;
443 Coro::cede; 450 Coro::cede;
444 goto next_job; 451 goto next_job;
445 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 454 }
447 } 455 }
448 456
449 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 460 $signal->wait;
453 } else { 461 } else {
462 $busy = 0;
454 Coro::schedule; 463 Coro::schedule;
455 } 464 }
456 } 465 }
457}; 466};
458 467
459sub get_slot($;$$) { 468sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
461 470
462 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
463 472
464 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
465 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
466 476
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
496 506
497sub sync_job(&) { 507sub sync_job(&) {
498 my ($job) = @_; 508 my ($job) = @_;
499 509
500 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 511 my $time = AE::time;
502 512
503 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
505 515
506 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 533 } else {
524 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
525 } 535 }
526 } 536 }
527 537
528 my $time = EV::time - $time; 538 my $time = AE::time - $time;
529 539
530 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
531 541
532 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
533 } else { 543 } else {
… …
1303} 1313}
1304 1314
1305use File::Glob (); 1315use File::Glob ();
1306 1316
1307cf::player->attach ( 1317cf::player->attach (
1308 on_command => sub { 1318 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1310 1320
1311 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1312 or return; 1322 or return;
1313 1323
… …
1392 . "\n};\n1"; 1402 . "\n};\n1";
1393 1403
1394 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1395 } 1405 }
1396 1406
1407 my $pass = 0;
1397 my %done; 1408 my %done;
1398 while (%todo) { 1409 while (%todo) {
1399 my $progress; 1410 my $progress;
1400 1411
1412 ++$pass;
1413
1414 ext:
1401 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1417 next ext
1404 unless exists $done{$_}; 1418 unless exists $done{$_};
1405 } 1419 }
1406 1420
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1422
1409 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1427
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1429 if exists $v->{meta}{mandatory};
1417 1430 } else {
1418 warn $msg; 1431 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg};
1433 $progress = 1;
1434
1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1419 } 1437 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1438 }
1425 1439
1426 skip: 1440 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1429 } 1448 }
1430 }; 1449 };
1431} 1450}
1432 1451
1433############################################################################# 1452#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1518 } 1537 }
1519 } 1538 }
1520} 1539}
1521 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1522sub save($) { 1554sub save($) {
1523 my ($pl) = @_; 1555 my ($pl) = @_;
1524 1556
1525 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1526 1558
… …
1531 1563
1532 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1534 1566
1535 cf::get_slot 0.01; 1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1571
1537 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1573 cf::cede_to_tick;
1539} 1574}
1540 1575
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1789
1755 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1791 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2009 2044
2010 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
2011 } 2046 }
2012} 2047}
2013 2048
2014sub pre_load { } 2049sub pre_load { }
2015sub post_load { } 2050#sub post_load { } # XS
2016 2051
2017sub load { 2052sub load {
2018 my ($self) = @_; 2053 my ($self) = @_;
2019 2054
2020 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2112 }
2078 2113
2079 $self->post_load; 2114 $self->post_load;
2080} 2115}
2081 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
2082sub customise_for { 2120sub customise_for {
2083 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
2084 2122
2085 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2124 if $self->per_player;
… …
3115 3153
3116 $coro 3154 $coro
3117} 3155}
3118 3156
3119cf::client->attach ( 3157cf::client->attach (
3120 on_destroy => sub { 3158 on_client_destroy => sub {
3121 my ($ns) = @_; 3159 my ($ns) = @_;
3122 3160
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3162 },
3125); 3163);
… …
3251=cut 3289=cut
3252 3290
3253sub register_script_function { 3291sub register_script_function {
3254 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
3255 3293
3256 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
3257 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
3258} 3296}
3259 3297
3260=back 3298=back
3261 3299
3262=cut 3300=cut
… …
3283 3321
3284 $facedata->{version} == 2 3322 $facedata->{version} == 2
3285 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3286 3324
3287 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3288 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3289 type => FT_RSRC, 3328 type => FT_RSRC,
3290 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3291 }; 3331 };
3292 cf::cede_to_tick; 3332 cf::cede_to_tick;
3293 3333
3294 { 3334 {
3295 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
… …
3520 reload_config; 3560 reload_config;
3521 db_init; 3561 db_init;
3522 3562
3523 cf::init_uuid; 3563 cf::init_uuid;
3524 cf::init_signals; 3564 cf::init_signals;
3525 cf::init_commands;
3526 cf::init_skills; 3565 cf::init_skills;
3527 3566
3528 cf::init_beforeplay; 3567 cf::init_beforeplay;
3529 3568
3530 atomic; 3569 atomic;
… …
3548 3587
3549# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3550BEGIN { 3589BEGIN {
3551 our %SIGWATCHER = (); 3590 our %SIGWATCHER = ();
3552 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3553 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3554 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3555 }; 3594 };
3556 } 3595 }
3557} 3596}
3558 3597
3559sub write_runtime_sync { 3598sub write_runtime_sync {
3599 my $t0 = AE::time;
3600
3560 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3561 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3562 3603
3563 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3564 3605
3565 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3566 3607
3567 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3568 or return; 3609 or return;
3569 3610
3570 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3571 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3572 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
… …
3585 or return; 3626 or return;
3586 3627
3587 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3588 and return; 3629 and return;
3589 3630
3590 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3591 3632
3592 1 3633 1
3593} 3634}
3594 3635
3595our $uuid_lock; 3636our $uuid_lock;
… …
3733 return; 3774 return;
3734 } 3775 }
3735 3776
3736 return if $RELOAD++; 3777 return if $RELOAD++;
3737 3778
3738 my $t1 = EV::time; 3779 my $t1 = AE::time;
3739 3780
3740 while ($RELOAD) { 3781 while ($RELOAD) {
3741 warn "reloading..."; 3782 warn "reloading...";
3742 3783
3743 warn "entering sync_job"; 3784 warn "entering sync_job";
… …
3846 3887
3847 warn "reloaded"; 3888 warn "reloaded";
3848 --$RELOAD; 3889 --$RELOAD;
3849 } 3890 }
3850 3891
3851 $t1 = EV::time - $t1; 3892 $t1 = AE::time - $t1;
3852 warn "reload completed in ${t1}s\n"; 3893 warn "reload completed in ${t1}s\n";
3853}; 3894};
3854 3895
3855our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3856 3897
… …
3859 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3860 3901
3861 $RELOAD_WATCHER ||= cf::async { 3902 $RELOAD_WATCHER ||= cf::async {
3862 Coro::AIO::aio_wait cache_extensions; 3903 Coro::AIO::aio_wait cache_extensions;
3863 3904
3864 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3865 do_reload_perl; 3906 do_reload_perl;
3866 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3867 }; 3908 };
3868 }; 3909 };
3869} 3910}
… …
3909 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3910 return; 3951 return;
3911 } 3952 }
3912 3953
3913 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3955
3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3914 3957
3915 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3916 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3917 Coro::async_pool { 3960 Coro::async_pool {
3918 $Coro::current->{desc} = "runtime saver"; 3961 $Coro::current->{desc} = "runtime saver";
… …
3941} 3984}
3942 3985
3943{ 3986{
3944 # configure BDB 3987 # configure BDB
3945 3988
3946 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3947 BDB::max_poll_reqs $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3948 $AnyEvent::BDB::WATCHER->priority (1); 3991 $AnyEvent::BDB::WATCHER->priority (1);
3949 3992
3950 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3951 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;

Diff Legend

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