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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 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;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
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;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
159 162
160The raw value load value from the last tick. 163The raw value load value from the last tick.
161 164
162=item %cf::CFG 165=item %cf::CFG
163 166
164Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 168from wherever your confdir points to.
166 169
167=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
168 171
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
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';
272Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
358 } 373 }
359 } 374 }
360 } 375 }
361 376
362 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
363 # 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
364 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 380 $signal->wait;
366 } else { 381 } else {
367 Coro::schedule; 382 Coro::schedule;
368 } 383 }
391 406
392BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
393 408
394=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
395 410
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 412is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 414acceptable.
400 415
401If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
412 my $time = Event::time; 427 my $time = Event::time;
413 428
414 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
416 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
417 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 435 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
420 437
421 my $busy = 1; 438 my $busy = 1;
422 my @res; 439 my @res;
423 440
424 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 443 @res = eval { $job->() };
426 warn $@ if $@; 444 warn $@ if $@;
427 undef $busy; 445 undef $busy;
428 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
429 447
430 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
431 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
432 } 454 }
433 455
434 $time = Event::time - $time; 456 $time = Event::time - $time;
435 457
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
478sub fork_call(&@) { 500sub fork_call(&@) {
479 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
480 502
481 # we seemingly have to make a local copy of the whole thing, 503 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 504 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 505 # TODO: investigate and fix (likely this will be rather laborious)
484 506
485 my @res = Coro::Util::fork_eval { 507 my @res = Coro::Util::fork_eval {
486 reset_signals; 508 reset_signals;
487 &$cb 509 &$cb
488 }, @args; 510 }, @args;
497=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
498 520
499Stores 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
500data 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).
501 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
502=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}
503 547
504our $DB; 548our $DB;
505 549
506sub db_init { 550sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 551 cf::sync_job {
511 eval { 552 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 553 };
521} 554}
522 555
523sub db_get($$) { 556sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
525 558
575 if (1) { 608 if (1) {
576 $md5 = 609 $md5 =
577 join "\x00", 610 join "\x00",
578 $processversion, 611 $processversion,
579 map { 612 map {
580 Coro::cede; 613 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 615 } 0.. $#$src;
583 616
584 617
585 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
631 664
632In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 667Deliantra).
635 668
636=over 4 669=over 4
637 670
638=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
639 672
937 970
938=cut 971=cut
939 972
940############################################################################# 973#############################################################################
941# object support 974# object support
942#
943 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#
944sub _can_merge { 1009sub _can_merge {
945 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
946 1011
947 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1013
951 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
952} 1016}
953 1017
954sub reattach { 1018sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1020 my ($obj) = @_;
1004sub object_freezer_save { 1068sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1006 1070
1007 sync_job { 1071 sync_job {
1008 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1011 1076
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1081 close $fh;
1017 1082
1018 if (@$objs) { 1083 if (@$objs) {
1019 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) {
1020 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1089 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1091 }
1034 } 1099 }
1035 } else { 1100 } else {
1036 aio_unlink $filename; 1101 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1038 } 1103 }
1039 } 1104 };
1040} 1105}
1041 1106
1042sub object_freezer_as_string { 1107sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1044 1109
1056 or return; 1121 or return;
1057 1122
1058 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1125 or return;
1126
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1062 } 1129 }
1063 1130
1131 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1066 return ($data, $av); 1135 ($data, $av)
1067} 1136}
1068 1137
1069=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1070 1139
1071=over 4 1140=over 4
1149 my ($type, $reply, @payload) = 1218 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1219 "ARRAY" eq ref $msg
1151 ? @$msg 1220 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1222
1223 my @reply;
1224
1154 if (my $cb = $EXTCMD{$type}) { 1225 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1226 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1160 } else { 1232 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1234 }
1163 1235
1164 cf::override; 1236 cf::override;
1254 1326
1255=head3 cf::player 1327=head3 cf::player
1256 1328
1257=over 4 1329=over 4
1258 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1259=item cf::player::find $login 1345=item cf::player::find $login
1260 1346
1261Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1262 1348
1263=cut 1349=cut
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1388
1303 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1306 } 1397 }
1307 } 1398 }
1308} 1399}
1309 1400
1319 1410
1320 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1322 1413
1323 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1324 Coro::cede; 1415 cf::cede_to_tick;
1325} 1416}
1326 1417
1327sub new($) { 1418sub new($) {
1328 my ($login) = @_; 1419 my ($login) = @_;
1329 1420
1407 or return []; 1498 or return [];
1408 1499
1409 my @logins; 1500 my @logins;
1410 1501
1411 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1415 1511
1416 utf8::decode $login; 1512 utf8::decode $login;
1417 push @logins, $login; 1513 push @logins, $login;
1418 } 1514 }
1419 1515
1452 1548
1453Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1454 1550
1455=cut 1551=cut
1456 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1457sub expand_cfpod { 1564sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1459 1566
1460 # escape & and < 1567 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1568
1464 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1465 1572
1466 1 while 1573 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1578 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1579 <
1473 $self->gender ? $2 : $1 1580 (?:
1474 }ge 1581 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1582 | < $interior >
1476 || s{H<([^\>]*)>} 1583 )
1584 >
1585 %gcsx
1477 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1606 "")
1481 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1483 1618
1619 for ($xml) {
1484 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1486 1622
1487 # compress some whitespace 1623 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1492 1629
1493 $_ 1630 $xml
1494} 1631}
1632
1633no re 'eval';
1495 1634
1496sub hintmode { 1635sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1637 $_[0]{hintmode}
1499} 1638}
1505=cut 1644=cut
1506 1645
1507sub ext_reply($$@) { 1646sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1647 my ($self, $id, @msg) = @_;
1509 1648
1510 if ($self->ns->extcmd == 2) { 1649 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1650}
1518 1651
1519=item $player->ext_msg ($type, @msg) 1652=item $player->ext_msg ($type, @msg)
1520 1653
1521Sends an ext event to the client. 1654Sends an ext event to the client.
1749 1882
1750sub load_header_from($) { 1883sub load_header_from($) {
1751 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1752 1885
1753 utf8::encode $path; 1886 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1759 1895
1760 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1761 1897
1762 1 1898 1
1763} 1899}
1817sub find { 1953sub find {
1818 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1819 1955
1820 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1821 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1823 1960
1824 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1826 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1827 or return; 1966 or return;
1828 1967
1829 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1830 1969
1832 or return; 1971 or return;
1833 1972
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1837 $map->reset; 1978 $map->reset;
1838 undef $guard;
1839 return find $path; 1979 return find $path;
1840 } 1980 }
1841 1981
1842 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1843 } 1983 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1853 1993
1854 my $path = $self->{path}; 1994 my $path = $self->{path};
1855 1995
1856 { 1996 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1858 1998
1999 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2001
1861 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1862 2003
1863 $self->alloc; 2004 $self->alloc;
1864 2005
1865 $self->pre_load; 2006 $self->pre_load;
1866 Coro::cede; 2007 cf::cede_to_tick;
1867 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1869 or return; 2012 or return;
1870 2013
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1873 2016
1874 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2018 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2021 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1879 } 2025 }
1880 } 2026 }
1881 2027
1882 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1883 # now do the right thing for maps 2031 # now do the right thing for maps
1884 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2034 unless $self->difficulty;
1887 Coro::cede; 2035 cf::cede_to_tick;
1888 2036
1889 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2038 $self->decay_objects;
1891 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1892 $self->update_buttons; 2040 $self->update_buttons;
1893 Coro::cede; 2041 cf::cede_to_tick;
1894 $self->set_darkness_map; 2042 $self->set_darkness_map;
1895 Coro::cede; 2043 cf::cede_to_tick;
1896 $self->activate; 2044 $self->activate;
1897 } 2045 }
1898 2046
1899 $self->{last_save} = $cf::RUNTIME; 2047 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2048 $self->last_access ($cf::RUNTIME);
1916 2064
1917 $self 2065 $self
1918} 2066}
1919 2067
1920# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2069sub load_neighbours {
1922 my ($map) = @_; 2070 my ($map) = @_;
1923 2071
1924 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1925 2073
1926 for (0 .. 3) { 2074 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1928 or next; 2076 or next;
1929 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1930 or next; 2078 or next;
1931 $neigh->load; 2079 $neigh->load;
1932 2080
2081 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2084 }
1936 2085
1937 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1939 or next; 2089 or next;
1940 $neigh->load; 2090 $neigh->load;
1941 } 2091 }
1942} 2092}
1943 2093
1948} 2098}
1949 2099
1950sub do_load_sync { 2100sub do_load_sync {
1951 my ($map) = @_; 2101 my ($map) = @_;
1952 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1953 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1954} 2107}
1955 2108
1956our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1958 2111
1959sub find_async { 2112sub find_async {
1960 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1961 2114
1962 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1963 2116
1964 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2119 }
1967 2120
1968 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1969 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1970 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2128 if (my $map = find $k) {
1973 $map->load; 2129 $map->load if $v;
1974 } 2130 }
1975 2131
1976 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1977 } 2133 }
1978 } 2134 }
1979 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1980 }; 2136 };
1981 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
1984} 2140}
1985 2141
1986sub save { 2142sub save {
1987 my ($self) = @_; 2143 my ($self) = @_;
1988 2144
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2146
1991 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1992 2148
1993 return unless $self->dirty; 2149 return unless $self->dirty;
1994 2150
2000 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2001 2157
2002 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2003 2159
2004 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2006 }; 2163 };
2007 2164
2008 if ($uniq) { 2165 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 my ($self) = @_; 2174 my ($self) = @_;
2018 2175
2019 # save first because save cedes 2176 # save first because save cedes
2020 $self->save; 2177 $self->save;
2021 2178
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2180
2024 return if $self->players; 2181 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2027 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2189 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2190}
2031 2191
2032sub reset_at { 2192sub reset_at {
2033 my ($self) = @_; 2193 my ($self) = @_;
2034 2194
2066 if $uniq; 2226 if $uniq;
2067 } 2227 }
2068 2228
2069 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2070 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2233 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2234
2075 $self->unlink_save; 2235 $self->unlink_save;
2076 $self->destroy; 2236 $self->destroy;
2077} 2237}
2078 2238
2079my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2080 2240
2081sub nuke { 2241sub nuke {
2082 my ($self) = @_; 2242 my ($self) = @_;
2083 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2084 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2085 2248
2086 $self->unlink_save; 2249 $self->unlink_save;
2087 2250
2088 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2256
2094 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2095 2259
2096 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2097} 2261}
2098 2262
2099=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
2175 2339
2176sub inv_recursive { 2340sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2178} 2342}
2179 2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
2180package cf; 2372package cf;
2181 2373
2182=back 2374=back
2183 2375
2184=head3 cf::object::player 2376=head3 cf::object::player
2312 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
2315 2507
2316 $map->load; 2508 $map->load;
2317 $map->load_diag; 2509 $map->load_neighbours;
2318 2510
2319 return unless $self->contr->active; 2511 return unless $self->contr->active;
2320 $self->activate_recursive; 2512 $self->activate_recursive;
2321 2513
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2535
2344 $self->enter_link; 2536 $self->enter_link;
2345 2537
2346 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2347 my $map = eval { 2560 my $map = eval {
2348 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2349 2562
2350 if ($map) { 2563 if ($map) {
2351 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2353 } else { 2566 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2568 }
2356 2569
2357 $map 2570 $map
2358 }; 2571 };
2359 2572
2449 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2452 2665
2453 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2454 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2455 unless (eval { 2670 unless (eval {
2456 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2457 2672
2458 1; 2673 1;
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2495 2710
2496=cut 2711=cut
2497 2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2498sub cf::client::send_msg { 2765sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2767
2501 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2502 2769
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2505 if (ref $channel) { 2781 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2510 } 2787 }
2511 2788
2512 $channel = $channel->{id}; 2789 $channel = $channel->{id};
2513 } 2790 }
2514 2791
2555=cut 2832=cut
2556 2833
2557sub cf::client::ext_msg($$@) { 2834sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2835 my ($self, $type, @msg) = @_;
2559 2836
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2837 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2839 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2840 push @msg, msgtype => "event_$type";
2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2860 }
2568} 2861}
2569 2862
2570=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2632 my ($type, $reply, @payload) = 2925 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2926 "ARRAY" eq ref $msg
2634 ? @$msg 2927 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2929
2930 my @reply;
2931
2637 if (my $cb = $EXTICMD{$type}) { 2932 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2933 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2643 } else { 2939 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2941 }
2646 2942
2647 cf::override; 2943 cf::override;
2707=pod 3003=pod
2708 3004
2709The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2710 3006
2711 cf::object 3007 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 3009 insert remove name archname title slaying race decrease_ob_nr
2714 3010
2715 cf::object::player 3011 cf::object::player
2716 player 3012 player
2717 3013
2718 cf::player 3014 cf::player
2723 3019
2724=cut 3020=cut
2725 3021
2726for ( 3022for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 3024 insert remove inv name archname title slaying race
3025 decrease_ob_nr destroy)],
2729 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2732) { 3029) {
2733 no strict 'refs'; 3030 no strict 'refs';
2809# the server's init and main functions 3106# the server's init and main functions
2810 3107
2811sub load_facedata($) { 3108sub load_facedata($) {
2812 my ($path) = @_; 3109 my ($path) = @_;
2813 3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3116
2814 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2815 3118
2816 my $facedata; 3119 my $facedata;
2817 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3121 or die "$path: $!";
2819 3122
2820 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2821 3124
2822 $facedata->{version} == 2 3125 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
2824 3134
2825 { 3135 {
2826 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2827 3137
2828 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3140 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3141 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3144
2835 cf::cede_to_tick; 3145 cf::cede_to_tick;
2836 } 3146 }
2837 3147
2838 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2863 3173
2864 { 3174 {
2865 # TODO: for gcfclient pleasure, we should give resources 3175 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3176 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3177 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3178
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3179 my $soundconf = delete $res->{"res/sound.conf"};
2871 3180
2872 while (my ($name, $info) = each %$res) { 3181 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
2879 3184
2880 if ($info->{type} & 1) { 3185 if ($info->{type} & 1) {
2881 # prepend meta info 3186 # prepend meta info
2882 3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3193 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 3194 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3195 $data = $info->{data};
2889 } 3196 }
2890 3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3199 cf::face::set_type $idx, $info->{type};
2892 3200
2893 cf::cede_to_tick; 3201 cf::cede_to_tick;
2894 } 3202 }
2895 3203
2922 $ns->fx_want ($k, $v); 3230 $ns->fx_want ($k, $v);
2923 } 3231 }
2924}; 3232};
2925 3233
2926sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2927 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
2929 3241
2930 for (cf::region::list) { 3242 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3243 $_->{match} = qr/$_->{match}/
2967 3279
2968sub init { 3280sub init {
2969 reload_resources; 3281 reload_resources;
2970} 3282}
2971 3283
2972sub cfg_load { 3284sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3286 or return;
2975 3287
2976 local $/; 3288 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2993sub main { 3305sub main {
2994 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2998 Event::one_event; 3311 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3000 }; 3313 };
3001 3314
3002 cfg_load; 3315 reload_config;
3003 db_init; 3316 db_init;
3004 load_extensions; 3317 load_extensions;
3005 3318
3006 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
3007 Event::loop; 3320 Event::loop;
3074 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3393 $pl->save;
3080 } 3394 }
3081 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3082 3396
3083 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
3131 3445
3132 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3133 for (;;) { 3447 for (;;) {
3134 BDB::flush; 3448 BDB::flush;
3135 IO::AIO::flush; 3449 IO::AIO::flush;
3136 Coro::cede; 3450 Coro::cede_notself;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3138 warn "iterate..."; 3452 warn "iterate...";
3139 } 3453 }
3140 3454
3141 ++$RELOAD; 3455 ++$RELOAD;
3200 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
3201 require cf; 3515 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3517
3204 warn "loading config and database again"; 3518 warn "loading config and database again";
3205 cf::cfg_load; 3519 cf::reload_config;
3206 3520
3207 warn "loading extensions"; 3521 warn "loading extensions";
3208 cf::load_extensions; 3522 cf::load_extensions;
3209 3523
3210 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
3246register_command "reload" => sub { 3560register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3248 3562
3249 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3567 reload_perl;
3568 };
3252 } 3569 }
3253}; 3570};
3254 3571
3255unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3256 3573
3275 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3594 $signal->wait;
3278} 3595}
3279 3596
3280 my $min = 1e6;#d#
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3598 reentrant => 0,
3284 parked => 1, 3599 parked => 1,
3285 prio => 0, 3600 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
3294 3609
3295 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3296 3611
3297 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3298 3613
3299 0 && sync_job {#d#
3300 for(1..10) {
3301 my $t = Event::time;
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303 or die;
3304
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 };
3321
3322 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3324 3616
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3328 write_runtime 3621 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3330 }; 3623 };
3331 } 3624 }
3332 3625
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3627 $sig->send;
3338 } 3628 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3630 $sig->send;
3350 3640
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3643
3354 _post_tick; 3644 _post_tick;
3355
3356
3357 }, 3645 },
3358); 3646);
3359 3647
3360{ 3648{
3649 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3652 reentrant => 0,
3364 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3365 poll => 'r', 3654 poll => 'r',
3366 prio => 0, 3655 prio => 0,
3367 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3369 ); 3658 );
3370 BDB::min_parallel 8;
3371 3659
3372 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3373 my $status; 3661 my $status;
3374 my $current = $Coro::current; 3662 my $current = $Coro::current;
3375 ( 3663 (
3384 ) 3672 )
3385 }; 3673 };
3386 3674
3387 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3681
3390 cf::sync_job { 3682 cf::sync_job {
3391 eval { 3683 eval {
3392 BDB::db_env_open 3684 BDB::db_env_open
3393 $DB_ENV, 3685 $DB_ENV,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3689 0666;
3398 3690
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3692 };
3404 3693
3405 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3695 };
3407 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3408} 3728}
3409 3729
3410{ 3730{
3411 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3412 3732
3415 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3416 reentrant => 0, 3736 reentrant => 0,
3417 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3419 poll => 'r', 3739 poll => 'r',
3420 prio => 6, 3740 prio => 0,
3421 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3422 ); 3742 );
3423} 3743}
3424 3744
3425my $_log_backtrace; 3745my $_log_backtrace;
3431 3751
3432 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3754 ++$_log_backtrace;
3435 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3436 my @bt = fork_call { 3758 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines