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.360 by root, Sun Sep 9 06:25:46 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 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
… …
508=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
509 516
510Stores the given C<$value> in the family. It can currently store binary 517Stores 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). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
513=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
514 543
515our $DB; 544our $DB;
516 545
517sub db_init { 546sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 547 cf::sync_job {
522 eval { 548 $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 } 549 };
532} 550}
533 551
534sub db_get($$) { 552sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
536 554
… …
948 966
949=cut 967=cut
950 968
951############################################################################# 969#############################################################################
952# object support 970# object support
953#
954 971
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
955sub _can_merge { 1005sub _can_merge {
956 my ($ob1, $ob2) = @_; 1006 my ($ob1, $ob2) = @_;
957 1007
958 local $Storable::canonical = 1; 1008 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1009
962 $fob1 eq $fob2 1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
963} 1012}
964 1013
965sub reattach { 1014sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1016 my ($obj) = @_;
… …
1013); 1062);
1014 1063
1015sub object_freezer_save { 1064sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
1017 1066
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1067 sync_job {
1021 if (length $$rdata) { 1068 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
1024 1072
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1074 chmod SAVE_MODE, $fh;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1076 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1077 close $fh;
1030 1078
1031 if (@$objs) { 1079 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1085 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1087 }
… …
1048 } else { 1096 } else {
1049 aio_unlink $filename; 1097 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
1051 } 1099 }
1052 }; 1100 };
1053
1054 undef $guard;
1055} 1101}
1056 1102
1057sub object_freezer_as_string { 1103sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
1059 1105
… …
1064 1110
1065sub object_thawer_load { 1111sub object_thawer_load {
1066 my ($filename) = @_; 1112 my ($filename) = @_;
1067 1113
1068 my ($data, $av); 1114 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1115
1072 (aio_load $filename, $data) >= 0 1116 (aio_load $filename, $data) >= 0
1073 or return; 1117 or return;
1074 1118
1075 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1121 or return;
1078 1122
1079 undef $guard; 1123 my $st = eval { Coro::Storable::thaw $av }
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1081 } 1126 }
1082 1127
1128 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
1085 1131
1086 ($data, $av) 1132 ($data, $av)
1087} 1133}
1088 1134
1089=head2 COMMAND CALLBACKS 1135=head2 COMMAND CALLBACKS
… …
1277 1323
1278=head3 cf::player 1324=head3 cf::player
1279 1325
1280=over 4 1326=over 4
1281 1327
1328=item cf::player::num_playing
1329
1330Returns the official number of playing players, as per the Crossfire metaserver rules.
1331
1332=cut
1333
1334sub num_playing {
1335 scalar grep
1336 $_->ob->map
1337 && !$_->hidden
1338 && !$_->ob->flag (cf::FLAG_WIZ),
1339 cf::player::list
1340}
1341
1282=item cf::player::find $login 1342=item cf::player::find $login
1283 1343
1284Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1285 1345
1286=cut 1346=cut
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1385
1326 my $f = new_from_file cf::object::thawer path $login 1386 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1387 or return;
1328 1388
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1389 my $pl = cf::player::load_pl $f
1331 or return; 1390 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1391 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1392 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
… …
2015 } 2074 }
2016 2075
2017 $MAP_PREFETCH{$path} |= $load; 2076 $MAP_PREFETCH{$path} |= $load;
2018 2077
2019 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
2020 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2083 if (my $map = find $k) {
2023 $map->load if $v; 2084 $map->load if $v;
2024 } 2085 }
… …
2050 return if $self->{deny_save}; 2111 return if $self->{deny_save};
2051 2112
2052 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
2053 2114
2054 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
2056 }; 2118 };
2057 2119
2058 if ($uniq) { 2120 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2246=cut 2308=cut
2247 2309
2248sub deref { 2310sub deref {
2249 my ($ref) = @_; 2311 my ($ref) = @_;
2250 2312
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2314 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2316 or return;
2258 $pl->ob->uuid eq $uuid 2317 $pl->ob->uuid eq $uuid
2259 or return; 2318 or return;
… …
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2490
2432 $self->enter_link; 2491 $self->enter_link;
2433 2492
2434 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2496 # *tag paths override both path and x|y
2497 if ($path =~ /^\*(.*)$/) {
2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2499 my $ob = $obs[rand @obs];
2500
2501 # see if we actually can go there
2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2508
2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2512 }
2513 }
2514
2435 my $map = eval { 2515 my $map = eval {
2436 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2437 2517
2438 if ($map) { 2518 if ($map) {
2439 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2441 } else { 2521 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2523 }
2444 2524
2445 $map 2525 $map
2446 }; 2526 };
2447 2527
… …
2537 # if exit is damned, update players death & WoR home-position 2617 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp) 2618 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED); 2619 if $exit->flag (FLAG_DAMNED);
2540 2620
2541 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2542 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2543 unless (eval { 2625 unless (eval {
2544 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2545 2627
2546 1; 2628 1;
… …
2583 2665
2584=cut 2666=cut
2585 2667
2586our %CHANNEL = ( 2668our %CHANNEL = (
2587 "c/identify" => { 2669 "c/identify" => {
2588 id => "identify", 2670 id => "infobox",
2589 title => "Identify", 2671 title => "Identify",
2590 reply => undef, 2672 reply => undef,
2591 tooltip => "Items recently identified", 2673 tooltip => "Items recently identified",
2592 }, 2674 },
2593 "c/examine" => { 2675 "c/examine" => {
2594 id => "examine", 2676 id => "infobox",
2595 title => "Examine", 2677 title => "Examine",
2596 reply => undef, 2678 reply => undef,
2597 tooltip => "Signs and other items you examined", 2679 tooltip => "Signs and other items you examined",
2598 }, 2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2599); 2687);
2600 2688
2601sub cf::client::send_msg { 2689sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2690 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2691
2604 $msg = $self->pl->expand_cfpod ($msg); 2692 $msg = $self->pl->expand_cfpod ($msg);
2605 2693
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2695
2608 # check predefined channels, for the benefit of C 2696 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2610 2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2611 if (ref $channel) { 2705 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2706 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2707 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2708 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2709 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg; 2710 if $self->can_msg;
… …
2833=pod 2927=pod
2834 2928
2835The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2836 2930
2837 cf::object 2931 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 2932 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 2933 insert remove name archname title slaying race decrease_ob_nr
2840 2934
2841 cf::object::player 2935 cf::object::player
2842 player 2936 player
2843 2937
… …
2850=cut 2944=cut
2851 2945
2852for ( 2946for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 2948 insert remove inv name archname title slaying race
2855 decrease_ob_nr)], 2949 decrease_ob_nr destroy)],
2856 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2858 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2859) { 2953) {
2860 no strict 'refs'; 2954 no strict 'refs';
… …
3135sub main { 3229sub main {
3136 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
3140 Event::one_event; 3235 Event::one_event;
3141 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
3142 }; 3237 };
3143 3238
3144 reload_config; 3239 reload_config;
… …
3216 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
3218 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3317 $pl->save;
3222 } 3318 }
3223 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
3224 3320
3225 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
… …
3388register_command "reload" => sub { 3484register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
3390 3486
3391 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3491 reload_perl;
3492 };
3394 } 3493 }
3395}; 3494};
3396 3495
3397unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
3398 3497
… …
3417 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3518 $signal->wait;
3420} 3519}
3421 3520
3422 my $min = 1e6;#d#
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
3425 reentrant => 0, 3522 reentrant => 0,
3426 parked => 1, 3523 parked => 1,
3427 prio => 0, 3524 prio => 0,
3428 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
… …
3436 3533
3437 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
3438 3535
3439 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
3440 3537
3441 0 && sync_job {#d#
3442 for(1..10) {
3443 my $t = Event::time;
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3445 or die;
3446
3447 $map->width (50);
3448 $map->height (50);
3449 $map->alloc;
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3451 my $t = Event::time - $t;
3452
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 };
3463
3464 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
3466 3540
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
3470 write_runtime 3545 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
3472 }; 3547 };
3473 } 3548 }
3474 3549
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3551 $sig->send;
3480 } 3552 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3554 $sig->send;
… …
3492 3564
3493 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3567
3496 _post_tick; 3568 _post_tick;
3497
3498
3499 }, 3569 },
3500); 3570);
3501 3571
3502{ 3572{
3573 BDB::min_parallel 8;
3503 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
3504 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
3505 reentrant => 0, 3576 reentrant => 0,
3506 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
3507 poll => 'r', 3578 poll => 'r',
3508 prio => 0, 3579 prio => 0,
3509 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
3511 ); 3582 );
3512 BDB::min_parallel 8;
3513 3583
3514 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
3515 my $status; 3585 my $status;
3516 my $current = $Coro::current; 3586 my $current = $Coro::current;
3517 ( 3587 (
… …
3526 ) 3596 )
3527 }; 3597 };
3528 3598
3529 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3605
3532 cf::sync_job { 3606 cf::sync_job {
3533 eval { 3607 eval {
3534 BDB::db_env_open 3608 BDB::db_env_open
3535 $DB_ENV, 3609 $DB_ENV,
… …
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3613 0666;
3540 3614
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 3616 };
3546 3617
3547 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3619 };
3549 } 3620 }
3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 );
3642 $BDB_TRICKLE_WATCHER = Event->timer (
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 );
3550} 3652}
3551 3653
3552{ 3654{
3553 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
3554 3656
… …
3557 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3558 reentrant => 0, 3660 reentrant => 0,
3559 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3561 poll => 'r', 3663 poll => 'r',
3562 prio => 6, 3664 prio => 0,
3563 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3564 ); 3666 );
3565} 3667}
3566 3668
3567my $_log_backtrace; 3669my $_log_backtrace;
… …
3573 3675
3574 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3678 ++$_log_backtrace;
3577 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3578 my @bt = fork_call { 3682 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

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