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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.440 by root, Mon Aug 11 23:23:41 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 1.6;
45use Coro::Storable; 46use Coro::Storable;
46use Coro::Util (); 47use Coro::Util ();
47 48
48use JSON::XS 2.01 (); 49use JSON::XS 2.01 ();
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
… …
242for my $pkg (qw( 243for my $pkg (qw(
243 cf::global cf::attachable 244 cf::global cf::attachable
244 cf::object cf::object::player 245 cf::object cf::object::player
245 cf::client cf::player 246 cf::client cf::player
246 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
247 cf::map cf::party cf::region 249 cf::party cf::region
248)) { 250)) {
249 no strict 'refs'; 251 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 253}
252 254
… …
1523 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1526 $pl->password ("*"); # this should lock out the player until we nuked the dir
1525 1527
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1530 1534
1531 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
2031 2035
2032 cf::lock_wait "map_data:$path";#d#remove 2036 cf::lock_wait "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
2034 2038
2035 $cf::MAP{$path} || do { 2039 $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 2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2042
2039 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
2040 or return; 2044 or return;
2041 2045
2042 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
… …
2045 or return; 2049 or return;
2046 2050
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
2050 undef $guard1; 2055 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2056 $map->reset;
2053 return find $path; 2057 return find $path;
2054 } 2058 }
2055 2059
2056 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
… …
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2087 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2088 $f->skip_block;
2085 $self->_load_objects ($f) 2089 $self->_load_objects ($f)
2086 or return; 2090 or return;
2087 2091
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
2089 if delete $self->{load_original}; 2093 if delete $self->{load_original};
2090 2094
2091 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2096 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2097 unless (aio_stat $uniq) {
… …
2459can be C<undef>. Does the right thing when the player is currently in a 2463can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2464dialogue with the given NPC character.
2461 2465
2462=cut 2466=cut
2463 2467
2468our $SAY_CHANNEL = {
2469 id => "say",
2470 title => "Map",
2471 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2473};
2474
2475our $CHAT_CHANNEL = {
2476 id => "chat",
2477 title => "Chat",
2478 reply => "chat ",
2479 tooltip => "Player chat and shouts, global to the server.",
2480};
2481
2464# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2483# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2484#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2486 my ($self, $npc, $msg, $flags) = @_;
… …
2479 my $dialog = $pl->{npc_dialog}; 2497 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2498 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2499
2482 } else { 2500 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2503 }
2486 } 2504 }
2487} 2505}
2488 2506
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2507=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2596Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2598that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2599the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process. 2618be called at the end of this process.
2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2601 2622
2602=cut 2623=cut
2603 2624
2604our $GOTOGEN; 2625our $GOTOGEN;
2605 2626
… …
2684} 2705}
2685 2706
2686sub prepare_random_map { 2707sub prepare_random_map {
2687 my ($exit) = @_; 2708 my ($exit) = @_;
2688 2709
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2712 # that depends on the exit object
2694 2713
2695 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2697 if ($exit->map) { 2716 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2702 } 2723 }
2703 2724
2704 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2705 2726
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2733 undef $fh;
2713 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2714 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2717 } 2742 }
2718} 2743}
2719 2744
2720sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2722 2747
2723 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2724 2749
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2750 $self->enter_link;
2737 2751
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2752 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2753 $Coro::current->{desc} = "enter_exit";
2744 2754
2745 $self->deactivate_recursive; # just to be sure
2746 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2747 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2748 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2749 1; 2776 1
2750 }) { 2777 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2752 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2753 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
… …
3101 3128
3102=cut 3129=cut
3103 3130
3104for ( 3131for (
3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race 3133 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3134 decrease split destroy change_exp)],
3108 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
3110 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
3111) { 3138) {
3112 no strict 'refs'; 3139 no strict 'refs';
… …
3372 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
3373} 3400}
3374 3401
3375sub init { 3402sub init {
3376 my $guard = freeze_mainloop; 3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3377 3406
3378 reload_resources; 3407 reload_resources;
3379} 3408}
3380 3409
3381sub reload_config { 3410sub reload_config {
… …
3414 reload_config; 3443 reload_config;
3415 db_init; 3444 db_init;
3416 load_extensions; 3445 load_extensions;
3417 3446
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 evthread_start IO::AIO::poll_fileno;
3420 } 3448 }
3421 3449
3422 EV::loop; 3450 EV::loop;
3423} 3451}
3424 3452
… …
3765{ 3793{
3766 # configure BDB 3794 # configure BDB
3767 3795
3768 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
3769 BDB::max_poll_reqs $TICK * 0.1; 3797 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 3798 $AnyEvent::BDB::WATCHER->priority (1);
3771 3799
3772 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | BDB::LOG_AUTOREMOVE, 1); 3803 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3804 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 3807
3779 cf::sync_job { 3808 cf::sync_job {
3780 eval { 3809 eval {
… …
3806{ 3835{
3807 # configure IO::AIO 3836 # configure IO::AIO
3808 3837
3809 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 3840 undef $AnyEvent::AIO::WATCHER;
3812} 3841}
3813 3842
3814my $_log_backtrace; 3843my $_log_backtrace;
3815 3844
3816sub _log_backtrace { 3845sub _log_backtrace {

Diff Legend

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