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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.388 by root, Thu Oct 18 02:56:13 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;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
352our @SLOT_QUEUE; 354our @SLOT_QUEUE;
353our $SLOT_QUEUE; 355our $SLOT_QUEUE;
354 356
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
357 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
358 362
359 while () { 363 while () {
360 next_job: 364 next_job:
361 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
369 } 373 }
370 } 374 }
371 } 375 }
372 376
373 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
374 # 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
375 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 380 $signal->wait;
377 } else { 381 } else {
378 Coro::schedule; 382 Coro::schedule;
379 } 383 }
… …
423 my $time = Event::time; 427 my $time = Event::time;
424 428
425 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
427 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
428 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
429 # (but this is cancel-safe) 435 # (but this is cancel-safe)
430 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
431 437
432 my $busy = 1; 438 my $busy = 1;
433 my @res; 439 my @res;
434 440
435 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 443 @res = eval { $job->() };
437 warn $@ if $@; 444 warn $@ if $@;
438 undef $busy; 445 undef $busy;
439 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
440 447
441 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
442 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
443 } 454 }
444 455
445 $time = Event::time - $time; 456 $time = Event::time - $time;
446 457
447 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
508=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
509 520
510Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
513=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
514 547
515our $DB; 548our $DB;
516 549
517sub db_init { 550sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 551 cf::sync_job {
522 eval { 552 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 553 };
532} 554}
533 555
534sub db_get($$) { 556sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
536 558
… …
948 970
949=cut 971=cut
950 972
951############################################################################# 973#############################################################################
952# object support 974# object support
953#
954 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#
955sub _can_merge { 1009sub _can_merge {
956 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
957 1011
958 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1013
962 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
963} 1016}
964 1017
965sub reattach { 1018sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1013); 1066);
1014 1067
1015sub object_freezer_save { 1068sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1017 1070
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1071 sync_job {
1021 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1024 1076
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1081 close $fh;
1030 1082
1031 if (@$objs) { 1083 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1089 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1091 }
… …
1048 } else { 1100 } else {
1049 aio_unlink $filename; 1101 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1051 } 1103 }
1052 }; 1104 };
1053
1054 undef $guard;
1055} 1105}
1056 1106
1057sub object_freezer_as_string { 1107sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1059 1109
… …
1064 1114
1065sub object_thawer_load { 1115sub object_thawer_load {
1066 my ($filename) = @_; 1116 my ($filename) = @_;
1067 1117
1068 my ($data, $av); 1118 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1119
1072 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1073 or return; 1121 or return;
1074 1122
1075 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1125 or return;
1078 1126
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1081 } 1129 }
1082 1130
1131 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1085 1134
1086 ($data, $av) 1135 ($data, $av)
1087} 1136}
1088 1137
1089=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
… …
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1388
1340 my $f = new_from_file cf::object::thawer path $login 1389 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1390 or return;
1342 1391
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1392 my $pl = cf::player::load_pl $f
1345 or return; 1393 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1394 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1395 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
… …
2029 } 2077 }
2030 2078
2031 $MAP_PREFETCH{$path} |= $load; 2079 $MAP_PREFETCH{$path} |= $load;
2032 2080
2033 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
2034 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2086 if (my $map = find $k) {
2037 $map->load if $v; 2087 $map->load if $v;
2038 } 2088 }
… …
2064 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2065 2115
2066 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2067 2117
2068 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2070 }; 2121 };
2071 2122
2072 if ($uniq) { 2123 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2260=cut 2311=cut
2261 2312
2262sub deref { 2313sub deref {
2263 my ($ref) = @_; 2314 my ($ref) = @_;
2264 2315
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2317 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2319 or return;
2272 $pl->ob->uuid eq $uuid 2320 $pl->ob->uuid eq $uuid
2273 or return; 2321 or return;
… …
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2493
2446 $self->enter_link; 2494 $self->enter_link;
2447 2495
2448 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
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#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2449 my $map = eval { 2518 my $map = eval {
2450 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2451 2520
2452 if ($map) { 2521 if ($map) {
2453 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2455 } else { 2524 } else {
2456 $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);
2457 } 2526 }
2458 2527
2459 $map 2528 $map
2460 }; 2529 };
2461 2530
… …
2551 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2554 2623
2555 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2556 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2557 unless (eval { 2628 unless (eval {
2558 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2559 2630
2560 1; 2631 1;
… …
2597 2668
2598=cut 2669=cut
2599 2670
2600our %CHANNEL = ( 2671our %CHANNEL = (
2601 "c/identify" => { 2672 "c/identify" => {
2602 id => "identify", 2673 id => "infobox",
2603 title => "Identify", 2674 title => "Identify",
2604 reply => undef, 2675 reply => undef,
2605 tooltip => "Items recently identified", 2676 tooltip => "Items recently identified",
2606 }, 2677 },
2607 "c/examine" => { 2678 "c/examine" => {
2608 id => "examine", 2679 id => "infobox",
2609 title => "Examine", 2680 title => "Examine",
2610 reply => undef, 2681 reply => undef,
2611 tooltip => "Signs and other items you examined", 2682 tooltip => "Signs and other items you examined",
2612 }, 2683 },
2684 "c/lookat" => {
2685 id => "infobox",
2686 title => "Look",
2687 reply => undef,
2688 tooltip => "What you saw there",
2689 },
2613); 2690);
2614 2691
2615sub cf::client::send_msg { 2692sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2693 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2694
2618 $msg = $self->pl->expand_cfpod ($msg); 2695 $msg = $self->pl->expand_cfpod ($msg);
2619 2696
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2697 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2698
2622 # check predefined channels, for the benefit of C 2699 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2700 if ($CHANNEL{$channel}) {
2701 $channel = $CHANNEL{$channel};
2624 2702
2703 $self->ext_msg (channel_info => $channel)
2704 if $self->can_msg;
2705
2706 $channel = $channel->{id};
2707
2625 if (ref $channel) { 2708 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2709 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2710 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2711 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2712 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2713 if $self->can_msg;
… …
2847=pod 2930=pod
2848 2931
2849The following functions and methods are available within a safe environment: 2932The following functions and methods are available within a safe environment:
2850 2933
2851 cf::object 2934 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 2935 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 2936 insert remove name archname title slaying race decrease_ob_nr
2854 2937
2855 cf::object::player 2938 cf::object::player
2856 player 2939 player
2857 2940
… …
2864=cut 2947=cut
2865 2948
2866for ( 2949for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 2951 insert remove inv name archname title slaying race
2869 decrease_ob_nr)], 2952 decrease_ob_nr destroy)],
2870 ["cf::object::player" => qw(player)], 2953 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 2954 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 2955 ["cf::map" => qw(trigger)],
2873) { 2956) {
2874 no strict 'refs'; 2957 no strict 'refs';
… …
3149sub main { 3232sub main {
3150 # we must not ever block the main coroutine 3233 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3234 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3236 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER";
3154 Event::one_event; 3238 Event::one_event;
3155 })->prio (Coro::PRIO_MAX); 3239 })->prio (Coro::PRIO_MAX);
3156 }; 3240 };
3157 3241
3158 reload_config; 3242 reload_config;
… …
3230 # and maps saved/destroyed asynchronously. 3314 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3315 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3316 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3317 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3318 $pl->valid or next;
3319 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3320 $pl->save;
3236 } 3321 }
3237 warn "end emergency player save\n"; 3322 warn "end emergency player save\n";
3238 3323
3239 warn "begin emergency map save\n"; 3324 warn "begin emergency map save\n";
… …
3287 3372
3288 warn "flushing outstanding aio requests"; 3373 warn "flushing outstanding aio requests";
3289 for (;;) { 3374 for (;;) {
3290 BDB::flush; 3375 BDB::flush;
3291 IO::AIO::flush; 3376 IO::AIO::flush;
3292 Coro::cede; 3377 Coro::cede_notself;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3378 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate..."; 3379 warn "iterate...";
3295 } 3380 }
3296 3381
3297 ++$RELOAD; 3382 ++$RELOAD;
… …
3402register_command "reload" => sub { 3487register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3488 my ($who, $arg) = @_;
3404 3489
3405 if ($who->flag (FLAG_WIZ)) { 3490 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3491 $who->message ("reloading server.");
3492 async {
3493 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3494 reload_perl;
3495 };
3408 } 3496 }
3409}; 3497};
3410 3498
3411unshift @INC, $LIBDIR; 3499unshift @INC, $LIBDIR;
3412 3500
… …
3431 my $signal = new Coro::Signal; 3519 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3520 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3521 $signal->wait;
3434} 3522}
3435 3523
3436 my $min = 1e6;#d#
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer ( 3524$TICK_WATCHER = Event->timer (
3439 reentrant => 0, 3525 reentrant => 0,
3440 parked => 1, 3526 parked => 1,
3441 prio => 0, 3527 prio => 0,
3442 at => $NEXT_TICK || $TICK, 3528 at => $NEXT_TICK || $TICK,
… …
3450 3536
3451 $NOW = $tick_start = Event::time; 3537 $NOW = $tick_start = Event::time;
3452 3538
3453 cf::server_tick; # one server iteration 3539 cf::server_tick; # one server iteration
3454 3540
3455 0 && sync_job {#d#
3456 for(1..10) {
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 };
3477
3478 $RUNTIME += $TICK; 3541 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK; 3542 $NEXT_TICK += $TICK;
3480 3543
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3544 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10; 3545 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool { 3546 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver";
3484 write_runtime 3548 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!"; 3549 or warn "ERROR: unable to write runtime file: $!";
3486 }; 3550 };
3487 } 3551 }
3488 3552
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3554 $sig->send;
3494 } 3555 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3556 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3557 $sig->send;
… …
3506 3567
3507 $LOAD = ($NOW - $tick_start) / $TICK; 3568 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3570
3510 _post_tick; 3571 _post_tick;
3511
3512
3513 }, 3572 },
3514); 3573);
3515 3574
3516{ 3575{
3576 BDB::min_parallel 8;
3517 BDB::max_poll_time $TICK * 0.1; 3577 BDB::max_poll_time $TICK * 0.1;
3518 $BDB_POLL_WATCHER = Event->io ( 3578 $BDB_POLL_WATCHER = Event->io (
3519 reentrant => 0, 3579 reentrant => 0,
3520 fd => BDB::poll_fileno, 3580 fd => BDB::poll_fileno,
3521 poll => 'r', 3581 poll => 'r',
3522 prio => 0, 3582 prio => 0,
3523 data => WF_AUTOCANCEL, 3583 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb, 3584 cb => \&BDB::poll_cb,
3525 ); 3585 );
3526 BDB::min_parallel 8;
3527 3586
3528 BDB::set_sync_prepare { 3587 BDB::set_sync_prepare {
3529 my $status; 3588 my $status;
3530 my $current = $Coro::current; 3589 my $current = $Coro::current;
3531 ( 3590 (
… …
3540 ) 3599 )
3541 }; 3600 };
3542 3601
3543 unless ($DB_ENV) { 3602 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3603 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3605 | BDB::LOG_AUTOREMOVE, 1);
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3608
3546 cf::sync_job { 3609 cf::sync_job {
3547 eval { 3610 eval {
3548 BDB::db_env_open 3611 BDB::db_env_open
3549 $DB_ENV, 3612 $DB_ENV,
… …
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3614 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3615 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3616 0666;
3554 3617
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3618 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 3619 };
3560 3620
3561 cf::cleanup "db_env_open(db): $@" if $@; 3621 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3622 };
3563 } 3623 }
3624
3625 $BDB_DEADLOCK_WATCHER = Event->timer (
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 );
3635 $BDB_CHECKPOINT_WATCHER = Event->timer (
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 );
3645 $BDB_TRICKLE_WATCHER = Event->timer (
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 );
3564} 3655}
3565 3656
3566{ 3657{
3567 IO::AIO::min_parallel 8; 3658 IO::AIO::min_parallel 8;
3568 3659
… …
3571 $AIO_POLL_WATCHER = Event->io ( 3662 $AIO_POLL_WATCHER = Event->io (
3572 reentrant => 0, 3663 reentrant => 0,
3573 data => WF_AUTOCANCEL, 3664 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno, 3665 fd => IO::AIO::poll_fileno,
3575 poll => 'r', 3666 poll => 'r',
3576 prio => 6, 3667 prio => 0,
3577 cb => \&IO::AIO::poll_cb, 3668 cb => \&IO::AIO::poll_cb,
3578 ); 3669 );
3579} 3670}
3580 3671
3581my $_log_backtrace; 3672my $_log_backtrace;
… …
3587 3678
3588 # limit the # of concurrent backtraces 3679 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3680 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3681 ++$_log_backtrace;
3591 async { 3682 async {
3683 $Coro::current->{desc} = "abt $msg";
3684
3592 my @bt = fork_call { 3685 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3686 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3687 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3688 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3689 or die "addr2line: $!";

Diff Legend

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