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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.390 by root, Thu Oct 25 09:01:24 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
354our @SLOT_QUEUE; 354our @SLOT_QUEUE;
355our $SLOT_QUEUE; 355our $SLOT_QUEUE;
356 356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
359 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
360 362
361 while () { 363 while () {
362 next_job: 364 next_job:
363 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
371 } 373 }
372 } 374 }
373 } 375 }
374 376
375 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 380 $signal->wait;
379 } else { 381 } else {
380 Coro::schedule; 382 Coro::schedule;
381 } 383 }
… …
425 my $time = Event::time; 427 my $time = Event::time;
426 428
427 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
429 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
430 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 435 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
433 437
434 my $busy = 1; 438 my $busy = 1;
435 my @res; 439 my @res;
436 440
437 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 443 @res = eval { $job->() };
439 warn $@ if $@; 444 warn $@ if $@;
440 undef $busy; 445 undef $busy;
441 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
442 447
443 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
444 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
445 } 454 }
446 455
447 $time = Event::time - $time; 456 $time = Event::time - $time;
448 457
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
961 970
962=cut 971=cut
963 972
964############################################################################# 973#############################################################################
965# object support 974# object support
966#
967 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
968sub _can_merge { 1009sub _can_merge {
969 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
970 1011
971 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1013
975 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
976} 1016}
977 1017
978sub reattach { 1018sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1026); 1066);
1027 1067
1028sub object_freezer_save { 1068sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1030 1070
1031 my $guard = cf::lock_acquire "io";
1032
1033 sync_job { 1071 sync_job {
1034 if (length $$rdata) { 1072 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1073 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
… …
1043 close $fh; 1081 close $fh;
1044 1082
1045 if (@$objs) { 1083 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1089 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1091 }
… …
1062 } else { 1100 } else {
1063 aio_unlink $filename; 1101 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1065 } 1103 }
1066 }; 1104 };
1067
1068 undef $guard;
1069} 1105}
1070 1106
1071sub object_freezer_as_string { 1107sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1073 1109
… …
1078 1114
1079sub object_thawer_load { 1115sub object_thawer_load {
1080 my ($filename) = @_; 1116 my ($filename) = @_;
1081 1117
1082 my ($data, $av); 1118 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1119
1086 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1087 or return; 1121 or return;
1088 1122
1089 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1125 or return;
1092 1126
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1095 } 1129 }
1096 1130
1097 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
… …
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1388
1355 my $f = new_from_file cf::object::thawer path $login 1389 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1390 or return;
1357 1391
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1392 my $pl = cf::player::load_pl $f
1360 or return; 1393 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1394 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1395 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
… …
2044 } 2077 }
2045 2078
2046 $MAP_PREFETCH{$path} |= $load; 2079 $MAP_PREFETCH{$path} |= $load;
2047 2080
2048 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
2049 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2086 if (my $map = find $k) {
2052 $map->load if $v; 2087 $map->load if $v;
2053 } 2088 }
… …
2079 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2080 2115
2081 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2082 2117
2083 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2085 }; 2121 };
2086 2122
2087 if ($uniq) { 2123 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2275=cut 2311=cut
2276 2312
2277sub deref { 2313sub deref {
2278 my ($ref) = @_; 2314 my ($ref) = @_;
2279 2315
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2317 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2319 or return;
2287 $pl->ob->uuid eq $uuid 2320 $pl->ob->uuid eq $uuid
2288 or return; 2321 or return;
… …
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2493
2461 $self->enter_link; 2494 $self->enter_link;
2462 2495
2463 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2464 # *tag paths override both path and x|y 2499 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2500 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2502 my $ob = $obs[rand @obs];
2468 2503
… …
2585 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2588 2623
2589 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2590 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2628 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2593 2630
2594 1; 2631 1;
… …
2631 2668
2632=cut 2669=cut
2633 2670
2634our %CHANNEL = ( 2671our %CHANNEL = (
2635 "c/identify" => { 2672 "c/identify" => {
2636 id => "identify", 2673 id => "infobox",
2637 title => "Identify", 2674 title => "Identify",
2638 reply => undef, 2675 reply => undef,
2639 tooltip => "Items recently identified", 2676 tooltip => "Items recently identified",
2640 }, 2677 },
2641 "c/examine" => { 2678 "c/examine" => {
2642 id => "examine", 2679 id => "infobox",
2643 title => "Examine", 2680 title => "Examine",
2644 reply => undef, 2681 reply => undef,
2645 tooltip => "Signs and other items you examined", 2682 tooltip => "Signs and other items you examined",
2646 }, 2683 },
2684 "c/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2696 "c/who" => {
2697 id => "infobox",
2698 title => "Players",
2699 reply => undef,
2700 tooltip => "Shows players who are currently online",
2701 },
2702 "c/body" => {
2703 id => "infobox",
2704 title => "Body Parts",
2705 reply => undef,
2706 tooltip => "Shows which body parts you posess and are available",
2707 },
2708 "c/uptime" => {
2709 id => "infobox",
2710 title => "Uptime",
2711 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart",
2713 },
2714 "c/mapinfo" => {
2715 id => "infobox",
2716 title => "Map Info",
2717 reply => undef,
2718 tooltip => "Information related to the maps",
2719 },
2647); 2720);
2648 2721
2649sub cf::client::send_msg { 2722sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2723 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2724
2652 $msg = $self->pl->expand_cfpod ($msg); 2725 $msg = $self->pl->expand_cfpod ($msg);
2653 2726
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2727 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2728
2656 # check predefined channels, for the benefit of C 2729 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2730 if ($CHANNEL{$channel}) {
2731 $channel = $CHANNEL{$channel};
2658 2732
2733 $self->ext_msg (channel_info => $channel)
2734 if $self->can_msg;
2735
2736 $channel = $channel->{id};
2737
2659 if (ref $channel) { 2738 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2739 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2740 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2741 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2742 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2743 if $self->can_msg;
… …
2881=pod 2960=pod
2882 2961
2883The following functions and methods are available within a safe environment: 2962The following functions and methods are available within a safe environment:
2884 2963
2885 cf::object 2964 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 2965 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 2966 insert remove name archname title slaying race decrease_ob_nr
2888 2967
2889 cf::object::player 2968 cf::object::player
2890 player 2969 player
2891 2970
… …
2898=cut 2977=cut
2899 2978
2900for ( 2979for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2980 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 2981 insert remove inv name archname title slaying race
2903 decrease_ob_nr)], 2982 decrease_ob_nr destroy)],
2904 ["cf::object::player" => qw(player)], 2983 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 2984 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 2985 ["cf::map" => qw(trigger)],
2907) { 2986) {
2908 no strict 'refs'; 2987 no strict 'refs';
… …
3183sub main { 3262sub main {
3184 # we must not ever block the main coroutine 3263 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3264 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3265 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3266 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER";
3188 Event::one_event; 3268 Event::one_event;
3189 })->prio (Coro::PRIO_MAX); 3269 })->prio (Coro::PRIO_MAX);
3190 }; 3270 };
3191 3271
3192 reload_config; 3272 reload_config;
… …
3264 # and maps saved/destroyed asynchronously. 3344 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3345 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3346 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3347 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3348 $pl->valid or next;
3349 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3350 $pl->save;
3270 } 3351 }
3271 warn "end emergency player save\n"; 3352 warn "end emergency player save\n";
3272 3353
3273 warn "begin emergency map save\n"; 3354 warn "begin emergency map save\n";
… …
3321 3402
3322 warn "flushing outstanding aio requests"; 3403 warn "flushing outstanding aio requests";
3323 for (;;) { 3404 for (;;) {
3324 BDB::flush; 3405 BDB::flush;
3325 IO::AIO::flush; 3406 IO::AIO::flush;
3326 Coro::cede; 3407 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3408 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3409 warn "iterate...";
3329 } 3410 }
3330 3411
3331 ++$RELOAD; 3412 ++$RELOAD;
… …
3436register_command "reload" => sub { 3517register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3518 my ($who, $arg) = @_;
3438 3519
3439 if ($who->flag (FLAG_WIZ)) { 3520 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3521 $who->message ("reloading server.");
3522 async {
3523 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3524 reload_perl;
3525 };
3442 } 3526 }
3443}; 3527};
3444 3528
3445unshift @INC, $LIBDIR; 3529unshift @INC, $LIBDIR;
3446 3530
… …
3488 $NEXT_TICK += $TICK; 3572 $NEXT_TICK += $TICK;
3489 3573
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3574 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3575 $NEXT_RUNTIME_WRITE = $NOW + 10;
3492 Coro::async_pool { 3576 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3578 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3579 or warn "ERROR: unable to write runtime file: $!";
3495 }; 3580 };
3496 } 3581 }
3497 3582
… …
3607 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = Event->io (
3608 reentrant => 0, 3693 reentrant => 0,
3609 data => WF_AUTOCANCEL, 3694 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno, 3695 fd => IO::AIO::poll_fileno,
3611 poll => 'r', 3696 poll => 'r',
3612 prio => 6, 3697 prio => 0,
3613 cb => \&IO::AIO::poll_cb, 3698 cb => \&IO::AIO::poll_cb,
3614 ); 3699 );
3615} 3700}
3616 3701
3617my $_log_backtrace; 3702my $_log_backtrace;
… …
3623 3708
3624 # limit the # of concurrent backtraces 3709 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3710 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3711 ++$_log_backtrace;
3627 async { 3712 async {
3713 $Coro::current->{desc} = "abt $msg";
3714
3628 my @bt = fork_call { 3715 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3716 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3717 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3718 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3719 or die "addr2line: $!";

Diff Legend

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