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.428 by root, Thu May 1 06:33:19 2008 UTC vs.
Revision 1.436 by root, Sun Jun 15 20:32:51 2008 UTC

… …
25use strict; 25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35 35
36use Coro 4.50 (); 36use Coro ();
37use Coro::State; 37use Coro::State;
38use Coro::Handle; 38use Coro::Handle;
39use Coro::EV; 39use Coro::AnyEvent;
40use Coro::Timer; 40use Coro::Timer;
41use Coro::Signal; 41use Coro::Signal;
42use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
43use Coro::AIO; 44use Coro::AIO;
44use Coro::BDB; 45use Coro::BDB;
45use Coro::Storable; 46use Coro::Storable;
46use Coro::Util (); 47use Coro::Util ();
47 48
… …
49use BDB (); 50use BDB ();
50use Data::Dumper; 51use Data::Dumper;
51use Digest::MD5; 52use Digest::MD5;
52use Fcntl; 53use Fcntl;
53use YAML (); 54use YAML ();
54use IO::AIO 2.51 (); 55use IO::AIO ();
55use Time::HiRes; 56use Time::HiRes;
56use Compress::LZF; 57use Compress::LZF;
57use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
58 61
59# configure various modules to our taste 62# configure various modules to our taste
60# 63#
61$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
90our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 95our %RESOURCE;
93 96
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 99our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
99 101
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 102our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 103our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 104our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 105our $DB_ENV;
105 106
… …
1523 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1525 1526
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1530 1533
1531 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
2031 2034
2032 cf::lock_wait "map_data:$path";#d#remove 2035 cf::lock_wait "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
2034 2037
2035 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2041
2039 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
2040 or return; 2043 or return;
2041 2044
2042 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
… …
2045 or return; 2048 or return;
2046 2049
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2050 undef $guard1; 2054 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2055 $map->reset;
2053 return find $path; 2056 return find $path;
2054 } 2057 }
2055 2058
2056 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
… …
2611her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2612that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2613the new (success) or old (failed) map position. In either case, $done will 2616the new (success) or old (failed) map position. In either case, $done will
2614be called at the end of this process. 2617be called at the end of this process.
2615 2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2621
2616=cut 2622=cut
2617 2623
2618our $GOTOGEN; 2624our $GOTOGEN;
2619 2625
2620sub cf::object::player::goto { 2626sub cf::object::player::goto {
… …
2698} 2704}
2699 2705
2700sub prepare_random_map { 2706sub prepare_random_map {
2701 my ($exit) = @_; 2707 my ($exit) = @_;
2702 2708
2703 my $guard = cf::lock_acquire "exit_prepare:$exit";
2704
2705 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2706 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2707 # that depends on the exit object 2711 # that depends on the exit object
2708 2712
2709 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
… …
2711 if ($exit->map) { 2715 if ($exit->map) {
2712 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2713 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2714 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2715 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2716 } 2722 }
2717 2723
2718 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2719 2725
2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2725 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2726 undef $fh; 2732 undef $fh;
2727 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2728 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2729 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2730 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2731 } 2741 }
2732} 2742}
2733 2743
2734sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2735 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2736 2746
2737 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2738 2748
2739 if ($exit->slaying eq "/!") {
2740 #TODO: this should de-fi-ni-te-ly not be a sync-job
2741 # the problem is that $exit might not survive long enough
2742 # so it needs to be done right now, right here
2743 cf::sync_job { prepare_random_map $exit };
2744 }
2745
2746 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2747 my $hp = $exit->stats->hp;
2748 my $sp = $exit->stats->sp;
2749
2750 $self->enter_link; 2749 $self->enter_link;
2751 2750
2752 # if exit is damned, update players death & WoR home-position
2753 $self->contr->savebed ($slaying, $hp, $sp)
2754 if $exit->flag (FLAG_DAMNED);
2755
2756 (async { 2751 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2752 $Coro::current->{desc} = "enter_exit";
2758 2753
2759 $self->deactivate_recursive; # just to be sure
2760 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2761 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2762 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2763 1; 2775 1
2764 }) { 2776 }) {
2765 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2766 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2767 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2768 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
… …
3115 3127
3116=cut 3128=cut
3117 3129
3118for ( 3130for (
3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3120 insert remove inv name archname title slaying race 3132 insert remove inv nrof name archname title slaying race
3121 decrease split destroy)], 3133 decrease split destroy)],
3122 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
3123 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
3124 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
3125) { 3137) {
… …
3387} 3399}
3388 3400
3389sub init { 3401sub init {
3390 my $guard = freeze_mainloop; 3402 my $guard = freeze_mainloop;
3391 3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3392 reload_resources; 3406 reload_resources;
3393} 3407}
3394 3408
3395sub reload_config { 3409sub reload_config {
3396 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3428 reload_config; 3442 reload_config;
3429 db_init; 3443 db_init;
3430 load_extensions; 3444 load_extensions;
3431 3445
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 } 3447 }
3435 3448
3436 EV::loop; 3449 EV::loop;
3437} 3450}
3438 3451
… …
3779{ 3792{
3780 # configure BDB 3793 # configure BDB
3781 3794
3782 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3783 BDB::max_poll_reqs $TICK * 0.1; 3796 BDB::max_poll_reqs $TICK * 0.1;
3784 $Coro::BDB::WATCHER->priority (1); 3797 $AnyEvent::BDB::WATCHER->priority (1);
3785 3798
3786 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3787 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3789 | BDB::LOG_AUTOREMOVE, 1); 3802 | BDB::LOG_AUTOREMOVE, 1);
… …
3820{ 3833{
3821 # configure IO::AIO 3834 # configure IO::AIO
3822 3835
3823 IO::AIO::min_parallel 8; 3836 IO::AIO::min_parallel 8;
3824 IO::AIO::max_poll_time $TICK * 0.1; 3837 IO::AIO::max_poll_time $TICK * 0.1;
3825 $Coro::AIO::WATCHER->priority (1); 3838 undef $AnyEvent::AIO::WATCHER;
3826} 3839}
3827 3840
3828my $_log_backtrace; 3841my $_log_backtrace;
3829 3842
3830sub _log_backtrace { 3843sub _log_backtrace {

Diff Legend

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