ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.388 by root, Thu Oct 18 02:56:13 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 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 ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $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;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock 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
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return 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.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 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#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
340our @SLOT_QUEUE; 354our @SLOT_QUEUE;
341our $SLOT_QUEUE; 355our $SLOT_QUEUE;
342 356
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
345 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
346 362
347 while () { 363 while () {
348 next_job: 364 next_job:
349 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
357 } 373 }
358 } 374 }
359 } 375 }
360 376
361 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
362 # 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
363 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 380 $signal->wait;
365 } else { 381 } else {
366 Coro::schedule; 382 Coro::schedule;
367 } 383 }
411 my $time = Event::time; 427 my $time = Event::time;
412 428
413 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
415 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
416 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 435 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
419 437
420 my $busy = 1; 438 my $busy = 1;
421 my @res; 439 my @res;
422 440
423 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 443 @res = eval { $job->() };
425 warn $@ if $@; 444 warn $@ if $@;
426 undef $busy; 445 undef $busy;
427 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
428 447
429 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
430 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
431 } 454 }
432 455
433 $time = Event::time - $time; 456 $time = Event::time - $time;
434 457
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
474 497
475=cut 498=cut
476 499
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 500sub fork_call(&@) {
487 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
488 502
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 506
494 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 508 reset_signals;
508 local $SIG{__WARN__}; 509 &$cb
509 local $SIG{__DIE__}; 510 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 511
516 eval { 512 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 513}
529 514
530=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
531 516
532Returns a single value from the environment database. 517Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
535 520
536Stores 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
537data 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).
538 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
539=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}
540 547
541our $DB; 548our $DB;
542 549
543sub db_init { 550sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 551 cf::sync_job {
548 eval { 552 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 553 };
558} 554}
559 555
560sub db_get($$) { 556sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
562 558
612 if (1) { 608 if (1) {
613 $md5 = 609 $md5 =
614 join "\x00", 610 join "\x00",
615 $processversion, 611 $processversion,
616 map { 612 map {
617 Coro::cede; 613 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 615 } 0.. $#$src;
620 616
621 617
622 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
974 970
975=cut 971=cut
976 972
977############################################################################# 973#############################################################################
978# object support 974# object support
979#
980 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#
981sub _can_merge { 1009sub _can_merge {
982 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
983 1011
984 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1013
988 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
989} 1016}
990 1017
991sub reattach { 1018sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1020 my ($obj) = @_;
1041sub object_freezer_save { 1068sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1043 1070
1044 sync_job { 1071 sync_job {
1045 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1048 1076
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1081 close $fh;
1054 1082
1055 if (@$objs) { 1083 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1089 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1091 }
1071 } 1099 }
1072 } else { 1100 } else {
1073 aio_unlink $filename; 1101 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1075 } 1103 }
1076 } 1104 };
1077} 1105}
1078 1106
1079sub object_freezer_as_string { 1107sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1081 1109
1093 or return; 1121 or return;
1094 1122
1095 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1125 or return;
1126
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1099 } 1129 }
1100 1130
1131 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1103 return ($data, $av); 1135 ($data, $av)
1104} 1136}
1105 1137
1106=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1107 1139
1108=over 4 1140=over 4
1181 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1182 1214
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1216
1185 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1191 } else { 1232 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1234 }
1194 1235
1195 cf::override; 1236 cf::override;
1285 1326
1286=head3 cf::player 1327=head3 cf::player
1287 1328
1288=over 4 1329=over 4
1289 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
1290=item cf::player::find $login 1345=item cf::player::find $login
1291 1346
1292Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1293 1348
1294=cut 1349=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1388
1334 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1337 } 1397 }
1338 } 1398 }
1339} 1399}
1340 1400
1350 1410
1351 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1353 1413
1354 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1355 Coro::cede; 1415 cf::cede_to_tick;
1356} 1416}
1357 1417
1358sub new($) { 1418sub new($) {
1359 my ($login) = @_; 1419 my ($login) = @_;
1360 1420
1364 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1365 1425
1366 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1367 1427
1368 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1369} 1439}
1370 1440
1371=item $pl->quit_character 1441=item $pl->quit_character
1372 1442
1373Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1498 or return [];
1429 1499
1430 my @logins; 1500 my @logins;
1431 1501
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1436 1511
1437 utf8::decode $login; 1512 utf8::decode $login;
1438 push @logins, $login; 1513 push @logins, $login;
1439 } 1514 }
1440 1515
1478sub expand_cfpod { 1553sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1480 1555
1481 # escape & and < 1556 # escape & and <
1482 s/&/&amp;/g; 1557 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1484 1559
1485 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1486 1561
1487 1 while 1562 1 while
1488 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1568 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1495 }ge 1571 }ge
1496 # replace H<hint text> 1572 # replace H<hint text>
1517sub hintmode { 1593sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1595 $_[0]{hintmode}
1520} 1596}
1521 1597
1522=item $player->ext_reply ($msgid, %msg) 1598=item $player->ext_reply ($msgid, @msg)
1523 1599
1524Sends an ext reply to the player. 1600Sends an ext reply to the player.
1525 1601
1526=cut 1602=cut
1527 1603
1528sub ext_reply($$%) { 1604sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1605 my ($self, $id, @msg) = @_;
1530 1606
1531 $msg{msgid} = $id; 1607 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1608}
1534 1609
1535=item $player->ext_event ($type, %msg) 1610=item $player->ext_msg ($type, @msg)
1536 1611
1537Sends an ext event to the client. 1612Sends an ext event to the client.
1538 1613
1539=cut 1614=cut
1540 1615
1541sub ext_event($$%) { 1616sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1617 my ($self, $type, @msg) = @_;
1543 1618
1544 $self->ns->ext_event ($type, %msg); 1619 $self->ns->ext_msg ($type, @msg);
1545} 1620}
1546 1621
1547=head3 cf::region 1622=head3 cf::region
1548 1623
1549=over 4 1624=over 4
1765 1840
1766sub load_header_from($) { 1841sub load_header_from($) {
1767 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1768 1843
1769 utf8::encode $path; 1844 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1775 1853
1776 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1777 1855
1778 1 1856 1
1779} 1857}
1833sub find { 1911sub find {
1834 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1835 1913
1836 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1837 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1839 1918
1840 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1842 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1843 or return; 1924 or return;
1844 1925
1845 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1846 1927
1848 or return; 1929 or return;
1849 1930
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1853 $map->reset; 1936 $map->reset;
1854 undef $guard;
1855 return find $path; 1937 return find $path;
1856 } 1938 }
1857 1939
1858 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1859 } 1941 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1869 1951
1870 my $path = $self->{path}; 1952 my $path = $self->{path};
1871 1953
1872 { 1954 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1874 1956
1957 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1959
1877 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1878 1961
1879 $self->alloc; 1962 $self->alloc;
1880 1963
1881 $self->pre_load; 1964 $self->pre_load;
1882 Coro::cede; 1965 cf::cede_to_tick;
1883 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1885 or return; 1970 or return;
1886 1971
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1889 1974
1890 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1976 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1979 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1895 } 1983 }
1896 } 1984 }
1897 1985
1898 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1899 # now do the right thing for maps 1989 # now do the right thing for maps
1900 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1992 unless $self->difficulty;
1903 Coro::cede; 1993 cf::cede_to_tick;
1904 1994
1905 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1996 $self->decay_objects;
1907 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1908 $self->update_buttons; 1998 $self->update_buttons;
1909 Coro::cede; 1999 cf::cede_to_tick;
1910 $self->set_darkness_map; 2000 $self->set_darkness_map;
1911 Coro::cede; 2001 cf::cede_to_tick;
1912 $self->activate; 2002 $self->activate;
1913 } 2003 }
2004
2005 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME);
1914 2007
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2008 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 2009 }
1917 2010
1918 $self->post_load; 2011 $self->post_load;
1929 2022
1930 $self 2023 $self
1931} 2024}
1932 2025
1933# find and load all maps in the 3x3 area around a map 2026# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2027sub load_neighbours {
1935 my ($map) = @_; 2028 my ($map) = @_;
1936 2029
1937 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1938 2031
1939 for (0 .. 3) { 2032 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1941 or next; 2034 or next;
1942 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1943 or next; 2036 or next;
1944 $neigh->load; 2037 $neigh->load;
1945 2038
2039 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2042 }
1949 2043
1950 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1952 or next; 2047 or next;
1953 $neigh->load; 2048 $neigh->load;
1954 } 2049 }
1955} 2050}
1956 2051
1961} 2056}
1962 2057
1963sub do_load_sync { 2058sub do_load_sync {
1964 my ($map) = @_; 2059 my ($map) = @_;
1965 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1966 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1967} 2065}
1968 2066
1969our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1971 2069
1972sub find_async { 2070sub find_async {
1973 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1974 2072
1975 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1976 2074
1977 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2077 }
1980 2078
1981 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1982 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1983 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2086 if (my $map = find $k) {
1986 $map->load; 2087 $map->load if $v;
1987 } 2088 }
1988 2089
1989 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1990 } 2091 }
1991 } 2092 }
1992 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1993 }; 2094 };
1994 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
1997} 2098}
1998 2099
1999sub save { 2100sub save {
2000 my ($self) = @_; 2101 my ($self) = @_;
2001 2102
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2104
2004 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2005 2106
2006 return unless $self->dirty; 2107 return unless $self->dirty;
2007 2108
2013 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2014 2115
2015 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2016 2117
2017 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2019 }; 2121 };
2020 2122
2021 if ($uniq) { 2123 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2132 my ($self) = @_;
2031 2133
2032 # save first because save cedes 2134 # save first because save cedes
2033 $self->save; 2135 $self->save;
2034 2136
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2138
2037 return if $self->players; 2139 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2141 return if $self->{deny_save};
2040 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2147 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2148}
2044 2149
2045sub reset_at { 2150sub reset_at {
2046 my ($self) = @_; 2151 my ($self) = @_;
2047 2152
2079 if $uniq; 2184 if $uniq;
2080 } 2185 }
2081 2186
2082 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2083 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2191 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2192
2088 $self->unlink_save; 2193 $self->unlink_save;
2089 $self->destroy; 2194 $self->destroy;
2090} 2195}
2091 2196
2092my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
2093 2198
2094sub nuke { 2199sub nuke {
2095 my ($self) = @_; 2200 my ($self) = @_;
2096 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2097 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2098 2206
2099 $self->unlink_save; 2207 $self->unlink_save;
2100 2208
2101 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2214
2107 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2108 2217
2109 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2110} 2219}
2111 2220
2112=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
2188 2297
2189sub inv_recursive { 2298sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2191} 2300}
2192 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2193package cf; 2330package cf;
2194 2331
2195=back 2332=back
2196 2333
2197=head3 cf::object::player 2334=head3 cf::object::player
2219 2356
2220 } else { 2357 } else {
2221 my $pl = $self->contr; 2358 my $pl = $self->contr;
2222 2359
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2360 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2361 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2363
2232 } else { 2364 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2365 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2366 $self->message ($msg, $flags);
2235 } 2367 }
2236 } 2368 }
2369}
2370
2371=item $object->send_msg ($channel, $msg, $color, [extra...])
2372
2373=cut
2374
2375sub cf::object::send_msg {
2376 my $pl = shift->contr
2377 or return;
2378 $pl->send_msg (@_);
2237} 2379}
2238 2380
2239=item $player_object->may ("access") 2381=item $player_object->may ("access")
2240 2382
2241Returns wether the given player is authorized to access resource "access" 2383Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
2323 2465
2324 $map->load; 2466 $map->load;
2325 $map->load_diag; 2467 $map->load_neighbours;
2326 2468
2327 return unless $self->contr->active; 2469 return unless $self->contr->active;
2328 $self->activate_recursive; 2470 $self->activate_recursive;
2329 2471
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2493
2352 $self->enter_link; 2494 $self->enter_link;
2353 2495
2354 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2355 my $map = eval { 2518 my $map = eval {
2356 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2357 2520
2358 if ($map) { 2521 if ($map) {
2359 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2361 } else { 2524 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2526 }
2364 2527
2365 $map 2528 $map
2366 }; 2529 };
2367 2530
2457 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2460 2623
2461 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2462 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2628 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2465 2630
2466 1; 2631 1;
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2666the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2503 2668
2504=cut 2669=cut
2505 2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/lookat" => {
2685 id => "infobox",
2686 title => "Look",
2687 reply => undef,
2688 tooltip => "What you saw there",
2689 },
2690);
2691
2506sub cf::client::send_msg { 2692sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2693 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2694
2509 $msg = $self->pl->expand_cfpod ($msg); 2695 $msg = $self->pl->expand_cfpod ($msg);
2510 2696
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2697 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2698
2699 # check predefined channels, for the benefit of C
2700 if ($CHANNEL{$channel}) {
2701 $channel = $CHANNEL{$channel};
2702
2703 $self->ext_msg (channel_info => $channel)
2704 if $self->can_msg;
2705
2706 $channel = $channel->{id};
2707
2513 if (ref $channel) { 2708 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2709 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2710 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2711 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2712 $self->ext_msg (channel_info => $channel)
2713 if $self->can_msg;
2518 } 2714 }
2519 2715
2520 $channel = $channel->{id}; 2716 $channel = $channel->{id};
2521 } 2717 }
2522 2718
2523 return unless @extra || length $msg; 2719 return unless @extra || length $msg;
2524 2720
2525 if ($self->can_msg) { 2721 if ($self->can_msg) {
2722 # default colour, mask it out
2723 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2724 if $color & cf::NDI_DEF;
2725
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2726 $self->send_packet ("msg " . $self->{json_coder}->encode (
2727 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2728 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2729 if ($color >= 0) {
2730 # replace some tags by gcfclient-compatible ones
2731 for ($msg) {
2732 1 while
2733 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2734 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2735 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2736 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2737 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2738 }
2739
2740 $color &= cf::NDI_COLOR_MASK;
2741
2742 utf8::encode $msg;
2743
2539 if (0 && $msg =~ /\[/) { 2744 if (0 && $msg =~ /\[/) {
2745 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2746 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2747 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2748 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2749 $self->send_packet ("drawinfo $color $msg")
2544 } 2750 }
2545 } 2751 }
2546 } 2752 }
2547} 2753}
2548 2754
2549=item $client->ext_event ($type, %msg) 2755=item $client->ext_msg ($type, @msg)
2550 2756
2551Sends an ext event to the client. 2757Sends an ext event to the client.
2552 2758
2553=cut 2759=cut
2554 2760
2555sub cf::client::ext_event($$%) { 2761sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2762 my ($self, $type, @msg) = @_;
2557 2763
2558 return unless $self->extcmd; 2764 if ($self->extcmd == 2) {
2559 2765 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2766 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2767 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2768 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2769 }
2770}
2771
2772=item $client->ext_reply ($msgid, @msg)
2773
2774Sends an ext reply to the client.
2775
2776=cut
2777
2778sub cf::client::ext_reply($$@) {
2779 my ($self, $id, @msg) = @_;
2780
2781 if ($self->extcmd == 2) {
2782 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2783 } elsif ($self->extcmd == 1) {
2784 #TODO: version 1, remove
2785 unshift @msg, msgtype => "reply", msgid => $id;
2786 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2787 }
2562} 2788}
2563 2789
2564=item $success = $client->query ($flags, "text", \&cb) 2790=item $success = $client->query ($flags, "text", \&cb)
2565 2791
2566Queues a query to the client, calling the given callback with 2792Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2847 my ($ns, $buf) = @_;
2622 2848
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2849 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2850
2625 if (ref $msg) { 2851 if (ref $msg) {
2852 my ($type, $reply, @payload) =
2853 "ARRAY" eq ref $msg
2854 ? @$msg
2855 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2856
2857 my @reply;
2858
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2859 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2860 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2861 }
2862
2863 $ns->ext_reply ($reply, @reply)
2864 if $reply;
2865
2632 } else { 2866 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2867 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2868 }
2635 2869
2636 cf::override; 2870 cf::override;
2683our $safe = new Safe "safe"; 2917our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2918our $safe_hole = new Safe::Hole;
2685 2919
2686$SIG{FPE} = 'IGNORE'; 2920$SIG{FPE} = 'IGNORE';
2687 2921
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2922$safe->permit_only (Opcode::opset qw(
2923 :base_core :base_mem :base_orig :base_math
2924 grepstart grepwhile mapstart mapwhile
2925 sort time
2926));
2689 2927
2690# here we export the classes and methods available to script code 2928# here we export the classes and methods available to script code
2691 2929
2692=pod 2930=pod
2693 2931
2694The following functions and methods are available within a safe environment: 2932The following functions and methods are available within a safe environment:
2695 2933
2696 cf::object 2934 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2935 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 2936 insert remove name archname title slaying race decrease_ob_nr
2699 2937
2700 cf::object::player 2938 cf::object::player
2701 player 2939 player
2702 2940
2703 cf::player 2941 cf::player
2708 2946
2709=cut 2947=cut
2710 2948
2711for ( 2949for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2951 insert remove inv name archname title slaying race
2713 insert remove)], 2952 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 2953 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2954 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2955 ["cf::map" => qw(trigger)],
2717) { 2956) {
2718 no strict 'refs'; 2957 no strict 'refs';
2794# the server's init and main functions 3033# the server's init and main functions
2795 3034
2796sub load_facedata($) { 3035sub load_facedata($) {
2797 my ($path) = @_; 3036 my ($path) = @_;
2798 3037
3038 # HACK to clear player env face cache, we need some signal framework
3039 # for this (global event?)
3040 %ext::player_env::MUSIC_FACE_CACHE = ();
3041
3042 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3043
2799 warn "loading facedata from $path\n"; 3044 warn "loading facedata from $path\n";
2800 3045
2801 my $facedata; 3046 my $facedata;
2802 0 < aio_load $path, $facedata 3047 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3048 or die "$path: $!";
2804 3049
2805 $facedata = Coro::Storable::thaw $facedata; 3050 $facedata = Coro::Storable::thaw $facedata;
2806 3051
2807 $facedata->{version} == 2 3052 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3053 or cf::cleanup "$path: version mismatch, cannot proceed.";
3054
3055 # patch in the exptable
3056 $facedata->{resource}{"res/exp_table"} = {
3057 type => FT_RSRC,
3058 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3059 };
3060 cf::cede_to_tick;
2809 3061
2810 { 3062 {
2811 my $faces = $facedata->{faceinfo}; 3063 my $faces = $facedata->{faceinfo};
2812 3064
2813 while (my ($face, $info) = each %$faces) { 3065 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3066 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3067 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3068 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3071
2820 cf::cede_to_tick; 3072 cf::cede_to_tick;
2821 } 3073 }
2822 3074
2823 while (my ($face, $info) = each %$faces) { 3075 while (my ($face, $info) = each %$faces) {
2848 3100
2849 { 3101 {
2850 # TODO: for gcfclient pleasure, we should give resources 3102 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3103 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3104 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3105
3106 my $soundconf = delete $res->{"res/sound.conf"};
2854 3107
2855 while (my ($name, $info) = each %$res) { 3108 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3109 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data;
2863 3111
2864 if ($name =~ /\.jpg$/) { 3112 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3113 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3114
3115 my $meta = $enc->encode ({
3116 name => $name,
3117 %{ $info->{meta} || {} },
3118 });
3119
3120 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3121 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3122 $data = $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3123 }
2874 3124
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126 cf::face::set_type $idx, $info->{type};
3127
2875 cf::cede_to_tick; 3128 cf::cede_to_tick;
2876 } 3129 }
3130
3131 if ($soundconf) {
3132 $soundconf = $enc->decode (delete $soundconf->{data});
3133
3134 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135 my $sound = $soundconf->{compat}[$_]
3136 or next;
3137
3138 my $face = cf::face::find "sound/$sound->[1]";
3139 cf::sound::set $sound->[0] => $face;
3140 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3141 }
3142
3143 while (my ($k, $v) = each %{$soundconf->{event}}) {
3144 my $face = cf::face::find "sound/$v";
3145 cf::sound::set $k => $face;
3146 }
3147 }
2877 } 3148 }
2878 3149
2879 1 3150 1
2880} 3151}
2881 3152
3153register_exticmd fx_want => sub {
3154 my ($ns, $want) = @_;
3155
3156 while (my ($k, $v) = each %$want) {
3157 $ns->fx_want ($k, $v);
3158 }
3159};
3160
2882sub reload_regions { 3161sub reload_regions {
3162 # HACK to clear player env face cache, we need some signal framework
3163 # for this (global event?)
3164 %ext::player_env::MUSIC_FACE_CACHE = ();
3165
2883 load_resource_file "$MAPDIR/regions" 3166 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3167 or die "unable to load regions file\n";
2885 3168
2886 for (cf::region::list) { 3169 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3170 $_->{match} = qr/$_->{match}/
2923 3206
2924sub init { 3207sub init {
2925 reload_resources; 3208 reload_resources;
2926} 3209}
2927 3210
2928sub cfg_load { 3211sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3212 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3213 or return;
2931 3214
2932 local $/; 3215 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3216 *CFG = YAML::Syck::Load <$fh>;
2949sub main { 3232sub main {
2950 # we must not ever block the main coroutine 3233 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3234 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3236 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER";
2954 Event::one_event; 3238 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3239 })->prio (Coro::PRIO_MAX);
2956 }; 3240 };
2957 3241
2958 cfg_load; 3242 reload_config;
2959 db_init; 3243 db_init;
2960 load_extensions; 3244 load_extensions;
2961 3245
2962 $TICK_WATCHER->start; 3246 $TICK_WATCHER->start;
2963 Event::loop; 3247 Event::loop;
3030 # and maps saved/destroyed asynchronously. 3314 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3315 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3316 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3317 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3318 $pl->valid or next;
3319 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3320 $pl->save;
3036 } 3321 }
3037 warn "end emergency player save\n"; 3322 warn "end emergency player save\n";
3038 3323
3039 warn "begin emergency map save\n"; 3324 warn "begin emergency map save\n";
3087 3372
3088 warn "flushing outstanding aio requests"; 3373 warn "flushing outstanding aio requests";
3089 for (;;) { 3374 for (;;) {
3090 BDB::flush; 3375 BDB::flush;
3091 IO::AIO::flush; 3376 IO::AIO::flush;
3092 Coro::cede; 3377 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3378 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3379 warn "iterate...";
3095 } 3380 }
3096 3381
3097 ++$RELOAD; 3382 ++$RELOAD;
3156 warn "reloading cf.pm"; 3441 warn "reloading cf.pm";
3157 require cf; 3442 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3443 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3444
3160 warn "loading config and database again"; 3445 warn "loading config and database again";
3161 cf::cfg_load; 3446 cf::reload_config;
3162 3447
3163 warn "loading extensions"; 3448 warn "loading extensions";
3164 cf::load_extensions; 3449 cf::load_extensions;
3165 3450
3166 warn "reattaching attachments to objects/players"; 3451 warn "reattaching attachments to objects/players";
3202register_command "reload" => sub { 3487register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3488 my ($who, $arg) = @_;
3204 3489
3205 if ($who->flag (FLAG_WIZ)) { 3490 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3491 $who->message ("reloading server.");
3492 async {
3493 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3494 reload_perl;
3495 };
3208 } 3496 }
3209}; 3497};
3210 3498
3211unshift @INC, $LIBDIR; 3499unshift @INC, $LIBDIR;
3212 3500
3231 my $signal = new Coro::Signal; 3519 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3520 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3521 $signal->wait;
3234} 3522}
3235 3523
3236 my $min = 1e6;#d#
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer ( 3524$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3525 reentrant => 0,
3240 parked => 1, 3526 parked => 1,
3241 prio => 0, 3527 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3528 at => $NEXT_TICK || $TICK,
3250 3536
3251 $NOW = $tick_start = Event::time; 3537 $NOW = $tick_start = Event::time;
3252 3538
3253 cf::server_tick; # one server iteration 3539 cf::server_tick; # one server iteration
3254 3540
3255 0 && sync_job {#d#
3256 for(1..10) {
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 };
3277
3278 $RUNTIME += $TICK; 3541 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3542 $NEXT_TICK += $TICK;
3280 3543
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3544 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10; 3545 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool { 3546 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver";
3284 write_runtime 3548 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!"; 3549 or warn "ERROR: unable to write runtime file: $!";
3286 }; 3550 };
3287 } 3551 }
3288 3552
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3554 $sig->send;
3294 } 3555 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3556 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3557 $sig->send;
3306 3567
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3568 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3570
3310 _post_tick; 3571 _post_tick;
3311
3312
3313 }, 3572 },
3314); 3573);
3315 3574
3316{ 3575{
3576 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3577 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3578 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3579 reentrant => 0,
3320 fd => BDB::poll_fileno, 3580 fd => BDB::poll_fileno,
3321 poll => 'r', 3581 poll => 'r',
3322 prio => 0, 3582 prio => 0,
3323 data => WF_AUTOCANCEL, 3583 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3584 cb => \&BDB::poll_cb,
3325 ); 3585 );
3326 BDB::min_parallel 8;
3327 3586
3328 BDB::set_sync_prepare { 3587 BDB::set_sync_prepare {
3329 my $status; 3588 my $status;
3330 my $current = $Coro::current; 3589 my $current = $Coro::current;
3331 ( 3590 (
3340 ) 3599 )
3341 }; 3600 };
3342 3601
3343 unless ($DB_ENV) { 3602 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3603 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3605 | BDB::LOG_AUTOREMOVE, 1);
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3608
3346 cf::sync_job { 3609 cf::sync_job {
3347 eval { 3610 eval {
3348 BDB::db_env_open 3611 BDB::db_env_open
3349 $DB_ENV, 3612 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3614 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3615 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3616 0666;
3354 3617
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3618 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3619 };
3360 3620
3361 cf::cleanup "db_env_open(db): $@" if $@; 3621 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3622 };
3363 } 3623 }
3624
3625 $BDB_DEADLOCK_WATCHER = Event->timer (
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 );
3635 $BDB_CHECKPOINT_WATCHER = Event->timer (
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 );
3645 $BDB_TRICKLE_WATCHER = Event->timer (
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 );
3364} 3655}
3365 3656
3366{ 3657{
3367 IO::AIO::min_parallel 8; 3658 IO::AIO::min_parallel 8;
3368 3659
3371 $AIO_POLL_WATCHER = Event->io ( 3662 $AIO_POLL_WATCHER = Event->io (
3372 reentrant => 0, 3663 reentrant => 0,
3373 data => WF_AUTOCANCEL, 3664 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno, 3665 fd => IO::AIO::poll_fileno,
3375 poll => 'r', 3666 poll => 'r',
3376 prio => 6, 3667 prio => 0,
3377 cb => \&IO::AIO::poll_cb, 3668 cb => \&IO::AIO::poll_cb,
3378 ); 3669 );
3379} 3670}
3380 3671
3381my $_log_backtrace; 3672my $_log_backtrace;
3387 3678
3388 # limit the # of concurrent backtraces 3679 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3680 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3681 ++$_log_backtrace;
3391 async { 3682 async {
3683 $Coro::current->{desc} = "abt $msg";
3684
3392 my @bt = fork_call { 3685 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3686 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3687 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3688 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3689 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines