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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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::blocking_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; 1127 my $st = eval { Coro::Storable::thaw $av }
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1081 } 1130 }
1082 1131
1132 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1085 1135
1086 ($data, $av) 1136 ($data, $av)
1087} 1137}
1088 1138
1089=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
… …
1277 1327
1278=head3 cf::player 1328=head3 cf::player
1279 1329
1280=over 4 1330=over 4
1281 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1282=item cf::player::find $login 1346=item cf::player::find $login
1283 1347
1284Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1285 1349
1286=cut 1350=cut
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1389
1326 my $f = new_from_file cf::object::thawer path $login 1390 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1391 or return;
1328 1392
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1393 my $pl = cf::player::load_pl $f
1331 or return; 1394 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1395 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1396 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
… …
1891 1954
1892 { 1955 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1894 1957
1895 return unless $self->valid; 1958 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1960
1898 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1899 1962
1900 $self->alloc; 1963 $self->alloc;
1901 1964
… …
2015 } 2078 }
2016 2079
2017 $MAP_PREFETCH{$path} |= $load; 2080 $MAP_PREFETCH{$path} |= $load;
2018 2081
2019 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
2020 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2087 if (my $map = find $k) {
2023 $map->load if $v; 2088 $map->load if $v;
2024 } 2089 }
… …
2050 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2051 2116
2052 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2053 2118
2054 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2056 }; 2122 };
2057 2123
2058 if ($uniq) { 2124 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2246=cut 2312=cut
2247 2313
2248sub deref { 2314sub deref {
2249 my ($ref) = @_; 2315 my ($ref) = @_;
2250 2316
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2318 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2320 or return;
2258 $pl->ob->uuid eq $uuid 2321 $pl->ob->uuid eq $uuid
2259 or return; 2322 or return;
… …
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2494
2432 $self->enter_link; 2495 $self->enter_link;
2433 2496
2434 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2435 my $map = eval { 2519 my $map = eval {
2436 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2437 2521
2438 if ($map) { 2522 if ($map) {
2439 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2441 } else { 2525 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2527 }
2444 2528
2445 $map 2529 $map
2446 }; 2530 };
2447 2531
… …
2537 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2540 2624
2541 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2542 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2543 unless (eval { 2629 unless (eval {
2544 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2545 2631
2546 1; 2632 1;
… …
2583 2669
2584=cut 2670=cut
2585 2671
2586our %CHANNEL = ( 2672our %CHANNEL = (
2587 "c/identify" => { 2673 "c/identify" => {
2588 id => "identify", 2674 id => "infobox",
2589 title => "Identify", 2675 title => "Identify",
2590 reply => undef, 2676 reply => undef,
2591 tooltip => "Items recently identified", 2677 tooltip => "Items recently identified",
2592 }, 2678 },
2593 "c/examine" => { 2679 "c/examine" => {
2594 id => "examine", 2680 id => "infobox",
2595 title => "Examine", 2681 title => "Examine",
2596 reply => undef, 2682 reply => undef,
2597 tooltip => "Signs and other items you examined", 2683 tooltip => "Signs and other items you examined",
2598 }, 2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2599); 2691);
2600 2692
2601sub cf::client::send_msg { 2693sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2695
2604 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2605 2697
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2699
2608 # check predefined channels, for the benefit of C 2700 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2610 2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2611 if (ref $channel) { 2709 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2713 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg; 2714 if $self->can_msg;
… …
2833=pod 2931=pod
2834 2932
2835The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2836 2934
2837 cf::object 2935 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 2937 insert remove name archname title slaying race decrease_ob_nr
2840 2938
2841 cf::object::player 2939 cf::object::player
2842 player 2940 player
2843 2941
… …
2850=cut 2948=cut
2851 2949
2852for ( 2950for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 2952 insert remove inv name archname title slaying race
2855 decrease_ob_nr)], 2953 decrease_ob_nr destroy)],
2856 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2858 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2859) { 2957) {
2860 no strict 'refs'; 2958 no strict 'refs';
… …
3135sub main { 3233sub main {
3136 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
3140 Event::one_event; 3239 Event::one_event;
3141 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
3142 }; 3241 };
3143 3242
3144 reload_config; 3243 reload_config;
… …
3216 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3218 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3321 $pl->save;
3222 } 3322 }
3223 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3224 3324
3225 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3273 3373
3274 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3275 for (;;) { 3375 for (;;) {
3276 BDB::flush; 3376 BDB::flush;
3277 IO::AIO::flush; 3377 IO::AIO::flush;
3278 Coro::cede; 3378 Coro::cede_notself;
3279 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3280 warn "iterate..."; 3380 warn "iterate...";
3281 } 3381 }
3282 3382
3283 ++$RELOAD; 3383 ++$RELOAD;
… …
3388register_command "reload" => sub { 3488register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3390 3490
3391 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3495 reload_perl;
3496 };
3394 } 3497 }
3395}; 3498};
3396 3499
3397unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3398 3501
… …
3417 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3522 $signal->wait;
3420} 3523}
3421 3524
3422 my $min = 1e6;#d#
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3425 reentrant => 0, 3526 reentrant => 0,
3426 parked => 1, 3527 parked => 1,
3427 prio => 0, 3528 prio => 0,
3428 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3436 3537
3437 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3438 3539
3439 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3440 3541
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; 3542 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3466 3544
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3470 write_runtime 3549 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3472 }; 3551 };
3473 } 3552 }
3474 3553
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3555 $sig->send;
3480 } 3556 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3558 $sig->send;
… …
3492 3568
3493 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3571
3496 _post_tick; 3572 _post_tick;
3497
3498
3499 }, 3573 },
3500); 3574);
3501 3575
3502{ 3576{
3577 BDB::min_parallel 8;
3503 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3504 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3505 reentrant => 0, 3580 reentrant => 0,
3506 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3507 poll => 'r', 3582 poll => 'r',
3508 prio => 0, 3583 prio => 0,
3509 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3511 ); 3586 );
3512 BDB::min_parallel 8;
3513 3587
3514 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3515 my $status; 3589 my $status;
3516 my $current = $Coro::current; 3590 my $current = $Coro::current;
3517 ( 3591 (
… …
3526 ) 3600 )
3527 }; 3601 };
3528 3602
3529 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3609
3532 cf::sync_job { 3610 cf::sync_job {
3533 eval { 3611 eval {
3534 BDB::db_env_open 3612 BDB::db_env_open
3535 $DB_ENV, 3613 $DB_ENV,
… …
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3617 0666;
3540 3618
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 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 }; 3620 };
3546 3621
3547 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3623 };
3549 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3550} 3656}
3551 3657
3552{ 3658{
3553 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3554 3660
… …
3557 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3558 reentrant => 0, 3664 reentrant => 0,
3559 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3561 poll => 'r', 3667 poll => 'r',
3562 prio => 6, 3668 prio => 0,
3563 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3564 ); 3670 );
3565} 3671}
3566 3672
3567my $_log_backtrace; 3673my $_log_backtrace;
… …
3573 3679
3574 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3682 ++$_log_backtrace;
3577 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3578 my @bt = fork_call { 3686 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

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