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.367 by root, Wed Sep 12 11:10:11 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
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 86our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 87our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 88our $DB_ENV;
88 89
89our %CFG; 90our %CFG;
… …
353our @SLOT_QUEUE; 354our @SLOT_QUEUE;
354our $SLOT_QUEUE; 355our $SLOT_QUEUE;
355 356
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
358 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
359 362
360 while () { 363 while () {
361 next_job: 364 next_job:
362 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
370 } 373 }
371 } 374 }
372 } 375 }
373 376
374 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 380 $signal->wait;
378 } else { 381 } else {
379 Coro::schedule; 382 Coro::schedule;
380 } 383 }
… …
424 my $time = Event::time; 427 my $time = Event::time;
425 428
426 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
428 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
429 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 435 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
432 437
433 my $busy = 1; 438 my $busy = 1;
434 my @res; 439 my @res;
435 440
436 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 443 @res = eval { $job->() };
438 warn $@ if $@; 444 warn $@ if $@;
439 undef $busy; 445 undef $busy;
440 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
441 447
442 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
443 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
444 } 454 }
445 455
446 $time = Event::time - $time; 456 $time = Event::time - $time;
447 457
448 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
960 970
961=cut 971=cut
962 972
963############################################################################# 973#############################################################################
964# object support 974# object support
965#
966 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#
967sub _can_merge { 1009sub _can_merge {
968 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
969 1011
970 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1013
974 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
975} 1016}
976 1017
977sub reattach { 1018sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1025); 1066);
1026 1067
1027sub object_freezer_save { 1068sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1029 1070
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1071 sync_job {
1033 if (length $$rdata) { 1072 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1073 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
… …
1042 close $fh; 1081 close $fh;
1043 1082
1044 if (@$objs) { 1083 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1089 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1091 }
… …
1061 } else { 1100 } else {
1062 aio_unlink $filename; 1101 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1064 } 1103 }
1065 }; 1104 };
1066
1067 undef $guard;
1068} 1105}
1069 1106
1070sub object_freezer_as_string { 1107sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1072 1109
… …
1077 1114
1078sub object_thawer_load { 1115sub object_thawer_load {
1079 my ($filename) = @_; 1116 my ($filename) = @_;
1080 1117
1081 my ($data, $av); 1118 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1119
1085 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1086 or return; 1121 or return;
1087 1122
1088 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1125 or return;
1091 1126
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1094 } 1129 }
1095 1130
1096 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1388
1354 my $f = new_from_file cf::object::thawer path $login 1389 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1390 or return;
1356 1391
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1392 my $pl = cf::player::load_pl $f
1359 or return; 1393 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1394 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1395 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
… …
2043 } 2077 }
2044 2078
2045 $MAP_PREFETCH{$path} |= $load; 2079 $MAP_PREFETCH{$path} |= $load;
2046 2080
2047 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
2048 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2086 if (my $map = find $k) {
2051 $map->load if $v; 2087 $map->load if $v;
2052 } 2088 }
… …
2078 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2079 2115
2080 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2081 2117
2082 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2084 }; 2121 };
2085 2122
2086 if ($uniq) { 2123 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2311=cut
2275 2312
2276sub deref { 2313sub deref {
2277 my ($ref) = @_; 2314 my ($ref) = @_;
2278 2315
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2317 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2319 or return;
2286 $pl->ob->uuid eq $uuid 2320 $pl->ob->uuid eq $uuid
2287 or return; 2321 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2493
2460 $self->enter_link; 2494 $self->enter_link;
2461 2495
2462 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2463 # *tag paths override both path and x|y 2499 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2500 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2502 my $ob = $obs[rand @obs];
2467 2503
2468 # see if we actually can go there 2504 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2471 2511
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2473 } 2515 }
2474 } 2516 }
2475 2517
2476 my $map = eval { 2518 my $map = eval {
2477 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2478 2520
2479 if ($map) { 2521 if ($map) {
2480 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2482 } else { 2524 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2526 }
2485 2527
2486 $map 2528 $map
2487 }; 2529 };
2488 2530
… …
2578 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2581 2623
2582 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2583 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2584 unless (eval { 2628 unless (eval {
2585 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2586 2630
2587 1; 2631 1;
… …
2624 2668
2625=cut 2669=cut
2626 2670
2627our %CHANNEL = ( 2671our %CHANNEL = (
2628 "c/identify" => { 2672 "c/identify" => {
2629 id => "identify", 2673 id => "infobox",
2630 title => "Identify", 2674 title => "Identify",
2631 reply => undef, 2675 reply => undef,
2632 tooltip => "Items recently identified", 2676 tooltip => "Items recently identified",
2633 }, 2677 },
2634 "c/examine" => { 2678 "c/examine" => {
2635 id => "examine", 2679 id => "infobox",
2636 title => "Examine", 2680 title => "Examine",
2637 reply => undef, 2681 reply => undef,
2638 tooltip => "Signs and other items you examined", 2682 tooltip => "Signs and other items you examined",
2639 }, 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 },
2640); 2696);
2641 2697
2642sub cf::client::send_msg { 2698sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2699 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2700
2645 $msg = $self->pl->expand_cfpod ($msg); 2701 $msg = $self->pl->expand_cfpod ($msg);
2646 2702
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2704
2649 # check predefined channels, for the benefit of C 2705 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2651 2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2652 if (ref $channel) { 2714 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2715 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2716 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2717 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2718 $self->ext_msg (channel_info => $channel)
2657 if $self->can_msg; 2719 if $self->can_msg;
… …
2874=pod 2936=pod
2875 2937
2876The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2877 2939
2878 cf::object 2940 cf::object
2879 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
2880 insert remove name archname title slaying race decrease_ob_nr 2942 insert remove name archname title slaying race decrease_ob_nr
2881 2943
2882 cf::object::player 2944 cf::object::player
2883 player 2945 player
2884 2946
… …
2891=cut 2953=cut
2892 2954
2893for ( 2955for (
2894 ["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
2895 insert remove inv name archname title slaying race 2957 insert remove inv name archname title slaying race
2896 decrease_ob_nr)], 2958 decrease_ob_nr destroy)],
2897 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2899 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2900) { 2962) {
2901 no strict 'refs'; 2963 no strict 'refs';
… …
3176sub main { 3238sub main {
3177 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
3179 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#
3180 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
3181 Event::one_event; 3244 Event::one_event;
3182 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
3183 }; 3246 };
3184 3247
3185 reload_config; 3248 reload_config;
… …
3257 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
3259 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3326 $pl->save;
3263 } 3327 }
3264 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
3265 3329
3266 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
… …
3314 3378
3315 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
3316 for (;;) { 3380 for (;;) {
3317 BDB::flush; 3381 BDB::flush;
3318 IO::AIO::flush; 3382 IO::AIO::flush;
3319 Coro::cede; 3383 Coro::cede_notself;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
3321 warn "iterate..."; 3385 warn "iterate...";
3322 } 3386 }
3323 3387
3324 ++$RELOAD; 3388 ++$RELOAD;
… …
3429register_command "reload" => sub { 3493register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
3431 3495
3432 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3500 reload_perl;
3501 };
3435 } 3502 }
3436}; 3503};
3437 3504
3438unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
3439 3506
… …
3457 3524
3458 my $signal = new Coro::Signal; 3525 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3526 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3527 $signal->wait;
3461} 3528}
3462
3463our $stat_fh;
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465 3529
3466$TICK_WATCHER = Event->timer ( 3530$TICK_WATCHER = Event->timer (
3467 reentrant => 0, 3531 reentrant => 0,
3468 parked => 1, 3532 parked => 1,
3469 prio => 0, 3533 prio => 0,
… …
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3539 unless ++$bug_warning > 10;
3476 return; 3540 return;
3477 } 3541 }
3478 3542
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time; 3543 $NOW = $tick_start = Event::time;
3482 3544
3483 cf::server_tick; # one server iteration 3545 cf::server_tick; # one server iteration
3484 3546
3485 $RUNTIME += $TICK; 3547 $RUNTIME += $TICK;
3486 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
3487 3549
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
3490 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3554 write_runtime
3492 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
3493 }; 3556 };
3494 } 3557 }
3495 3558
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3560 $sig->send;
3501 } 3561 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3562 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3563 $sig->send;
… …
3513 3573
3514 $LOAD = ($NOW - $tick_start) / $TICK; 3574 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3576
3517 _post_tick; 3577 _post_tick;
3518
3519 # gather some statistics#d#
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3522 }, 3578 },
3523); 3579);
3524 3580
3525{ 3581{
3526 BDB::min_parallel 8; 3582 BDB::min_parallel 8;
… …
3549 ) 3605 )
3550 }; 3606 };
3551 3607
3552 unless ($DB_ENV) { 3608 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 3609 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1);
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 3614
3555 cf::sync_job { 3615 cf::sync_job {
3556 eval { 3616 eval {
3557 BDB::db_env_open 3617 BDB::db_env_open
3558 $DB_ENV, 3618 $DB_ENV,
… …
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3620 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3621 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3622 0666;
3563 3623
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3624 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 3625 };
3570 3626
3571 cf::cleanup "db_env_open(db): $@" if $@; 3627 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3628 };
3573 } 3629 }
3574 3630
3631 $BDB_DEADLOCK_WATCHER = Event->timer (
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 );
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3641 $BDB_CHECKPOINT_WATCHER = Event->timer (
3576 after => 11, 3642 after => 11,
3577 interval => 60, 3643 interval => 60,
3578 hard => 1, 3644 hard => 1,
3579 prio => 0, 3645 prio => 0,
… …
3602 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3603 reentrant => 0, 3669 reentrant => 0,
3604 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3606 poll => 'r', 3672 poll => 'r',
3607 prio => 6, 3673 prio => 0,
3608 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3609 ); 3675 );
3610} 3676}
3611 3677
3612my $_log_backtrace; 3678my $_log_backtrace;
… …
3618 3684
3619 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 3687 ++$_log_backtrace;
3622 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3623 my @bt = fork_call { 3691 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 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 |"
3627 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

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