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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 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) = @_;
… …
1041 close $fh; 1081 close $fh;
1042 1082
1043 if (@$objs) { 1083 if (@$objs) {
1044 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) {
1045 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1049 close $fh; 1089 close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1091 }
… …
1082 1122
1083 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1125 or return;
1086 1126
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1088 } 1129 }
1089 1130
1090 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
… …
2036 } 2077 }
2037 2078
2038 $MAP_PREFETCH{$path} |= $load; 2079 $MAP_PREFETCH{$path} |= $load;
2039 2080
2040 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
2041 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2086 if (my $map = find $k) {
2044 $map->load if $v; 2087 $map->load if $v;
2045 } 2088 }
… …
2071 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2072 2115
2073 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2074 2117
2075 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2077 }; 2121 };
2078 2122
2079 if ($uniq) { 2123 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2267=cut 2311=cut
2268 2312
2269sub deref { 2313sub deref {
2270 my ($ref) = @_; 2314 my ($ref) = @_;
2271 2315
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2317 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2319 or return;
2279 $pl->ob->uuid eq $uuid 2320 $pl->ob->uuid eq $uuid
2280 or return; 2321 or return;
… …
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2493
2453 $self->enter_link; 2494 $self->enter_link;
2454 2495
2455 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2456 # *tag paths override both path and x|y 2499 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2500 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2502 my $ob = $obs[rand @obs];
2460 2503
… …
2577 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2580 2623
2581 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2582 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2628 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2585 2630
2586 1; 2631 1;
… …
2623 2668
2624=cut 2669=cut
2625 2670
2626our %CHANNEL = ( 2671our %CHANNEL = (
2627 "c/identify" => { 2672 "c/identify" => {
2628 id => "identify", 2673 id => "infobox",
2629 title => "Identify", 2674 title => "Identify",
2630 reply => undef, 2675 reply => undef,
2631 tooltip => "Items recently identified", 2676 tooltip => "Items recently identified",
2632 }, 2677 },
2633 "c/examine" => { 2678 "c/examine" => {
2634 id => "examine", 2679 id => "infobox",
2635 title => "Examine", 2680 title => "Examine",
2636 reply => undef, 2681 reply => undef,
2637 tooltip => "Signs and other items you examined", 2682 tooltip => "Signs and other items you examined",
2638 }, 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 },
2639); 2696);
2640 2697
2641sub cf::client::send_msg { 2698sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2699 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2700
2644 $msg = $self->pl->expand_cfpod ($msg); 2701 $msg = $self->pl->expand_cfpod ($msg);
2645 2702
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2704
2648 # check predefined channels, for the benefit of C 2705 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2650 2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2651 if (ref $channel) { 2714 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2715 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2716 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2717 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2718 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2719 if $self->can_msg;
… …
2873=pod 2936=pod
2874 2937
2875The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2876 2939
2877 cf::object 2940 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 2941 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 2942 insert remove name archname title slaying race decrease_ob_nr
2880 2943
2881 cf::object::player 2944 cf::object::player
2882 player 2945 player
2883 2946
… …
2890=cut 2953=cut
2891 2954
2892for ( 2955for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 2957 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 2958 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2899) { 2962) {
2900 no strict 'refs'; 2963 no strict 'refs';
… …
3175sub main { 3238sub main {
3176 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
3180 Event::one_event; 3244 Event::one_event;
3181 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
3182 }; 3246 };
3183 3247
3184 reload_config; 3248 reload_config;
… …
3256 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3326 $pl->save;
3262 } 3327 }
3263 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
3264 3329
3265 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
… …
3313 3378
3314 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
3315 for (;;) { 3380 for (;;) {
3316 BDB::flush; 3381 BDB::flush;
3317 IO::AIO::flush; 3382 IO::AIO::flush;
3318 Coro::cede; 3383 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3385 warn "iterate...";
3321 } 3386 }
3322 3387
3323 ++$RELOAD; 3388 ++$RELOAD;
… …
3428register_command "reload" => sub { 3493register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
3430 3495
3431 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3500 reload_perl;
3501 };
3434 } 3502 }
3435}; 3503};
3436 3504
3437unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
3438 3506
… …
3480 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
3481 3549
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3554 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
3487 }; 3556 };
3488 } 3557 }
3489 3558
… …
3599 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3600 reentrant => 0, 3669 reentrant => 0,
3601 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3603 poll => 'r', 3672 poll => 'r',
3604 prio => 6, 3673 prio => 0,
3605 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3606 ); 3675 );
3607} 3676}
3608 3677
3609my $_log_backtrace; 3678my $_log_backtrace;
… …
3615 3684
3616 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3687 ++$_log_backtrace;
3619 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3620 my @bt = fork_call { 3691 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3694 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

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