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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.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::blocking_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;
1098 $av = eval { (Storable::thaw $av)->{objs} };
1099 }
1100 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
1103 return ($data, $av); 1136 ($data, $av)
1104} 1137}
1105 1138
1106=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
1107 1140
1108=over 4 1141=over 4
1181 my ($pl, $buf) = @_; 1214 my ($pl, $buf) = @_;
1182 1215
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1216 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1217
1185 if (ref $msg) { 1218 if (ref $msg) {
1219 my ($type, $reply, @payload) =
1220 "ARRAY" eq ref $msg
1221 ? @$msg
1222 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1223
1224 my @reply;
1225
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1226 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1227 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
1191 } else { 1233 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1235 }
1194 1236
1195 cf::override; 1237 cf::override;
1285 1327
1286=head3 cf::player 1328=head3 cf::player
1287 1329
1288=over 4 1330=over 4
1289 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1290=item cf::player::find $login 1346=item cf::player::find $login
1291 1347
1292Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1293 1349
1294=cut 1350=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1389
1334 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1337 } 1398 }
1338 } 1399 }
1339} 1400}
1340 1401
1350 1411
1351 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1353 1414
1354 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1355 Coro::cede; 1416 cf::cede_to_tick;
1356} 1417}
1357 1418
1358sub new($) { 1419sub new($) {
1359 my ($login) = @_; 1420 my ($login) = @_;
1360 1421
1364 $self->{deny_save} = 1; 1425 $self->{deny_save} = 1;
1365 1426
1366 $cf::PLAYER{$login} = $self; 1427 $cf::PLAYER{$login} = $self;
1367 1428
1368 $self 1429 $self
1430}
1431
1432=item $player->send_msg ($channel, $msg, $color, [extra...])
1433
1434=cut
1435
1436sub send_msg {
1437 my $ns = shift->ns
1438 or return;
1439 $ns->send_msg (@_);
1369} 1440}
1370 1441
1371=item $pl->quit_character 1442=item $pl->quit_character
1372 1443
1373Nukes the player without looking back. If logged in, the connection will 1444Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1499 or return [];
1429 1500
1430 my @logins; 1501 my @logins;
1431 1502
1432 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1436 1512
1437 utf8::decode $login; 1513 utf8::decode $login;
1438 push @logins, $login; 1514 push @logins, $login;
1439 } 1515 }
1440 1516
1478sub expand_cfpod { 1554sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1555 ((my $self), (local $_)) = @_;
1480 1556
1481 # escape & and < 1557 # escape & and <
1482 s/&/&amp;/g; 1558 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1559 s/(?<![BIUGHT])</&lt;/g;
1484 1560
1485 # this is buggy, it needs to properly take care of nested <'s 1561 # this is buggy, it needs to properly take care of nested <'s
1486 1562
1487 1 while 1563 1 while
1488 # replace B<>, I<>, U<> etc. 1564 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1565 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1569 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1570 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1571 $self->gender ? $2 : $1
1495 }ge 1572 }ge
1496 # replace H<hint text> 1573 # replace H<hint text>
1517sub hintmode { 1594sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1596 $_[0]{hintmode}
1520} 1597}
1521 1598
1522=item $player->ext_reply ($msgid, %msg) 1599=item $player->ext_reply ($msgid, @msg)
1523 1600
1524Sends an ext reply to the player. 1601Sends an ext reply to the player.
1525 1602
1526=cut 1603=cut
1527 1604
1528sub ext_reply($$%) { 1605sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1606 my ($self, $id, @msg) = @_;
1530 1607
1531 $msg{msgid} = $id; 1608 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1609}
1534 1610
1535=item $player->ext_event ($type, %msg) 1611=item $player->ext_msg ($type, @msg)
1536 1612
1537Sends an ext event to the client. 1613Sends an ext event to the client.
1538 1614
1539=cut 1615=cut
1540 1616
1541sub ext_event($$%) { 1617sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1618 my ($self, $type, @msg) = @_;
1543 1619
1544 $self->ns->ext_event ($type, %msg); 1620 $self->ns->ext_msg ($type, @msg);
1545} 1621}
1546 1622
1547=head3 cf::region 1623=head3 cf::region
1548 1624
1549=over 4 1625=over 4
1765 1841
1766sub load_header_from($) { 1842sub load_header_from($) {
1767 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1768 1844
1769 utf8::encode $path; 1845 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1775 1854
1776 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1777 1856
1778 1 1857 1
1779} 1858}
1833sub find { 1912sub find {
1834 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1835 1914
1836 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1837 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1839 1919
1840 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1842 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1843 or return; 1925 or return;
1844 1926
1845 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1846 1928
1848 or return; 1930 or return;
1849 1931
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1853 $map->reset; 1937 $map->reset;
1854 undef $guard;
1855 return find $path; 1938 return find $path;
1856 } 1939 }
1857 1940
1858 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1859 } 1942 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1869 1952
1870 my $path = $self->{path}; 1953 my $path = $self->{path};
1871 1954
1872 { 1955 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1874 1957
1958 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1960
1877 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1878 1962
1879 $self->alloc; 1963 $self->alloc;
1880 1964
1881 $self->pre_load; 1965 $self->pre_load;
1882 Coro::cede; 1966 cf::cede_to_tick;
1883 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1885 or return; 1971 or return;
1886 1972
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1889 1975
1890 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 1977 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 1980 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1895 } 1984 }
1896 } 1985 }
1897 1986
1898 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1899 # now do the right thing for maps 1990 # now do the right thing for maps
1900 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1993 unless $self->difficulty;
1903 Coro::cede; 1994 cf::cede_to_tick;
1904 1995
1905 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1997 $self->decay_objects;
1907 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1908 $self->update_buttons; 1999 $self->update_buttons;
1909 Coro::cede; 2000 cf::cede_to_tick;
1910 $self->set_darkness_map; 2001 $self->set_darkness_map;
1911 Coro::cede; 2002 cf::cede_to_tick;
1912 $self->activate; 2003 $self->activate;
1913 } 2004 }
2005
2006 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME);
1914 2008
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2009 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 2010 }
1917 2011
1918 $self->post_load; 2012 $self->post_load;
1929 2023
1930 $self 2024 $self
1931} 2025}
1932 2026
1933# find and load all maps in the 3x3 area around a map 2027# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2028sub load_neighbours {
1935 my ($map) = @_; 2029 my ($map) = @_;
1936 2030
1937 my @diag; # diagonal neighbours 2031 my @neigh; # diagonal neighbours
1938 2032
1939 for (0 .. 3) { 2033 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2034 my $neigh = $map->tile_path ($_)
1941 or next; 2035 or next;
1942 $neigh = find $neigh, $map 2036 $neigh = find $neigh, $map
1943 or next; 2037 or next;
1944 $neigh->load; 2038 $neigh->load;
1945 2039
2040 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2041 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2042 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2043 }
1949 2044
1950 for (@diag) { 2045 for (grep defined $_->[0], @neigh) {
2046 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2047 my $neigh = find $path, $origin
1952 or next; 2048 or next;
1953 $neigh->load; 2049 $neigh->load;
1954 } 2050 }
1955} 2051}
1956 2052
1961} 2057}
1962 2058
1963sub do_load_sync { 2059sub do_load_sync {
1964 my ($map) = @_; 2060 my ($map) = @_;
1965 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1966 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1967} 2066}
1968 2067
1969our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1971 2070
1972sub find_async { 2071sub find_async {
1973 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1974 2073
1975 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1976 2075
1977 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2078 }
1980 2079
1981 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1982 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1983 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2087 if (my $map = find $k) {
1986 $map->load; 2088 $map->load if $v;
1987 } 2089 }
1988 2090
1989 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1990 } 2092 }
1991 } 2093 }
1992 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1993 }; 2095 };
1994 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
1997} 2099}
1998 2100
1999sub save { 2101sub save {
2000 my ($self) = @_; 2102 my ($self) = @_;
2001 2103
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2105
2004 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
2005 2107
2006 return unless $self->dirty; 2108 return unless $self->dirty;
2007 2109
2013 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2014 2116
2015 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2016 2118
2017 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2019 }; 2122 };
2020 2123
2021 if ($uniq) { 2124 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2133 my ($self) = @_;
2031 2134
2032 # save first because save cedes 2135 # save first because save cedes
2033 $self->save; 2136 $self->save;
2034 2137
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2139
2037 return if $self->players; 2140 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2142 return if $self->{deny_save};
2040 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2148 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2149}
2044 2150
2045sub reset_at { 2151sub reset_at {
2046 my ($self) = @_; 2152 my ($self) = @_;
2047 2153
2079 if $uniq; 2185 if $uniq;
2080 } 2186 }
2081 2187
2082 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2083 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2192 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2193
2088 $self->unlink_save; 2194 $self->unlink_save;
2089 $self->destroy; 2195 $self->destroy;
2090} 2196}
2091 2197
2092my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
2093 2199
2094sub nuke { 2200sub nuke {
2095 my ($self) = @_; 2201 my ($self) = @_;
2096 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
2097 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
2098 2207
2099 $self->unlink_save; 2208 $self->unlink_save;
2100 2209
2101 bless $self, "cf::map"; 2210 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2215
2107 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
2108 2218
2109 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
2110} 2220}
2111 2221
2112=item $maps = cf::map::tmp_maps 2222=item $maps = cf::map::tmp_maps
2188 2298
2189sub inv_recursive { 2299sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2191} 2301}
2192 2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
2329}
2330
2193package cf; 2331package cf;
2194 2332
2195=back 2333=back
2196 2334
2197=head3 cf::object::player 2335=head3 cf::object::player
2219 2357
2220 } else { 2358 } else {
2221 my $pl = $self->contr; 2359 my $pl = $self->contr;
2222 2360
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2361 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2362 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2363 $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 2364
2232 } else { 2365 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2366 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2367 $self->message ($msg, $flags);
2235 } 2368 }
2236 } 2369 }
2370}
2371
2372=item $object->send_msg ($channel, $msg, $color, [extra...])
2373
2374=cut
2375
2376sub cf::object::send_msg {
2377 my $pl = shift->contr
2378 or return;
2379 $pl->send_msg (@_);
2237} 2380}
2238 2381
2239=item $player_object->may ("access") 2382=item $player_object->may ("access")
2240 2383
2241Returns wether the given player is authorized to access resource "access" 2384Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2463 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2464 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2465 if $x <=0 && $y <= 0;
2323 2466
2324 $map->load; 2467 $map->load;
2325 $map->load_diag; 2468 $map->load_neighbours;
2326 2469
2327 return unless $self->contr->active; 2470 return unless $self->contr->active;
2328 $self->activate_recursive; 2471 $self->activate_recursive;
2329 2472
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2494
2352 $self->enter_link; 2495 $self->enter_link;
2353 2496
2354 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2355 my $map = eval { 2519 my $map = eval {
2356 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2357 2521
2358 if ($map) { 2522 if ($map) {
2359 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2361 } else { 2525 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2527 }
2364 2528
2365 $map 2529 $map
2366 }; 2530 };
2367 2531
2457 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2460 2624
2461 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2462 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2629 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2465 2631
2466 1; 2632 1;
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2667the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2668the message unless the client supports the msg packet.
2503 2669
2504=cut 2670=cut
2505 2671
2672our %CHANNEL = (
2673 "c/identify" => {
2674 id => "infobox",
2675 title => "Identify",
2676 reply => undef,
2677 tooltip => "Items recently identified",
2678 },
2679 "c/examine" => {
2680 id => "infobox",
2681 title => "Examine",
2682 reply => undef,
2683 tooltip => "Signs and other items you examined",
2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2691);
2692
2506sub cf::client::send_msg { 2693sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2695
2509 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2510 2697
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2699
2700 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2513 if (ref $channel) { 2709 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2518 } 2715 }
2519 2716
2520 $channel = $channel->{id}; 2717 $channel = $channel->{id};
2521 } 2718 }
2522 2719
2523 return unless @extra || length $msg; 2720 return unless @extra || length $msg;
2524 2721
2525 if ($self->can_msg) { 2722 if ($self->can_msg) {
2723 # default colour, mask it out
2724 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2725 if $color & cf::NDI_DEF;
2726
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2727 $self->send_packet ("msg " . $self->{json_coder}->encode (
2728 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2729 } 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) { 2730 if ($color >= 0) {
2731 # replace some tags by gcfclient-compatible ones
2732 for ($msg) {
2733 1 while
2734 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2735 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2736 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2737 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2738 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2739 }
2740
2741 $color &= cf::NDI_COLOR_MASK;
2742
2743 utf8::encode $msg;
2744
2539 if (0 && $msg =~ /\[/) { 2745 if (0 && $msg =~ /\[/) {
2746 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2747 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2748 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2749 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2750 $self->send_packet ("drawinfo $color $msg")
2544 } 2751 }
2545 } 2752 }
2546 } 2753 }
2547} 2754}
2548 2755
2549=item $client->ext_event ($type, %msg) 2756=item $client->ext_msg ($type, @msg)
2550 2757
2551Sends an ext event to the client. 2758Sends an ext event to the client.
2552 2759
2553=cut 2760=cut
2554 2761
2555sub cf::client::ext_event($$%) { 2762sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2763 my ($self, $type, @msg) = @_;
2557 2764
2558 return unless $self->extcmd; 2765 if ($self->extcmd == 2) {
2559 2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2767 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2768 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2770 }
2771}
2772
2773=item $client->ext_reply ($msgid, @msg)
2774
2775Sends an ext reply to the client.
2776
2777=cut
2778
2779sub cf::client::ext_reply($$@) {
2780 my ($self, $id, @msg) = @_;
2781
2782 if ($self->extcmd == 2) {
2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2784 } elsif ($self->extcmd == 1) {
2785 #TODO: version 1, remove
2786 unshift @msg, msgtype => "reply", msgid => $id;
2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2788 }
2562} 2789}
2563 2790
2564=item $success = $client->query ($flags, "text", \&cb) 2791=item $success = $client->query ($flags, "text", \&cb)
2565 2792
2566Queues a query to the client, calling the given callback with 2793Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2848 my ($ns, $buf) = @_;
2622 2849
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2850 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2851
2625 if (ref $msg) { 2852 if (ref $msg) {
2853 my ($type, $reply, @payload) =
2854 "ARRAY" eq ref $msg
2855 ? @$msg
2856 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2857
2858 my @reply;
2859
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2860 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2861 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2862 }
2863
2864 $ns->ext_reply ($reply, @reply)
2865 if $reply;
2866
2632 } else { 2867 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2868 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2869 }
2635 2870
2636 cf::override; 2871 cf::override;
2683our $safe = new Safe "safe"; 2918our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2919our $safe_hole = new Safe::Hole;
2685 2920
2686$SIG{FPE} = 'IGNORE'; 2921$SIG{FPE} = 'IGNORE';
2687 2922
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2923$safe->permit_only (Opcode::opset qw(
2924 :base_core :base_mem :base_orig :base_math
2925 grepstart grepwhile mapstart mapwhile
2926 sort time
2927));
2689 2928
2690# here we export the classes and methods available to script code 2929# here we export the classes and methods available to script code
2691 2930
2692=pod 2931=pod
2693 2932
2694The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2695 2934
2696 cf::object 2935 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 2937 insert remove name archname title slaying race decrease_ob_nr
2699 2938
2700 cf::object::player 2939 cf::object::player
2701 player 2940 player
2702 2941
2703 cf::player 2942 cf::player
2708 2947
2709=cut 2948=cut
2710 2949
2711for ( 2950for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2952 insert remove inv name archname title slaying race
2713 insert remove)], 2953 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2717) { 2957) {
2718 no strict 'refs'; 2958 no strict 'refs';
2794# the server's init and main functions 3034# the server's init and main functions
2795 3035
2796sub load_facedata($) { 3036sub load_facedata($) {
2797 my ($path) = @_; 3037 my ($path) = @_;
2798 3038
3039 # HACK to clear player env face cache, we need some signal framework
3040 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = ();
3042
3043 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3044
2799 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2800 3046
2801 my $facedata; 3047 my $facedata;
2802 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3049 or die "$path: $!";
2804 3050
2805 $facedata = Coro::Storable::thaw $facedata; 3051 $facedata = Coro::Storable::thaw $facedata;
2806 3052
2807 $facedata->{version} == 2 3053 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3054 or cf::cleanup "$path: version mismatch, cannot proceed.";
3055
3056 # patch in the exptable
3057 $facedata->{resource}{"res/exp_table"} = {
3058 type => FT_RSRC,
3059 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3060 };
3061 cf::cede_to_tick;
2809 3062
2810 { 3063 {
2811 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
2812 3065
2813 while (my ($face, $info) = each %$faces) { 3066 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3067 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3068 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3069 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3072
2820 cf::cede_to_tick; 3073 cf::cede_to_tick;
2821 } 3074 }
2822 3075
2823 while (my ($face, $info) = each %$faces) { 3076 while (my ($face, $info) = each %$faces) {
2848 3101
2849 { 3102 {
2850 # TODO: for gcfclient pleasure, we should give resources 3103 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3104 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3105 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3106
3107 my $soundconf = delete $res->{"res/sound.conf"};
2854 3108
2855 while (my ($name, $info) = each %$res) { 3109 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; 3110 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data;
2863 3112
2864 if ($name =~ /\.jpg$/) { 3113 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3114 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3115
3116 my $meta = $enc->encode ({
3117 name => $name,
3118 %{ $info->{meta} || {} },
3119 });
3120
3121 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 3122 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3123 $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 } 3124 }
2874 3125
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
2875 cf::cede_to_tick; 3129 cf::cede_to_tick;
2876 } 3130 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
2877 } 3149 }
2878 3150
2879 1 3151 1
2880} 3152}
2881 3153
3154register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_;
3156
3157 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v);
3159 }
3160};
3161
2882sub reload_regions { 3162sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
2883 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
2885 3169
2886 for (cf::region::list) { 3170 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3171 $_->{match} = qr/$_->{match}/
2923 3207
2924sub init { 3208sub init {
2925 reload_resources; 3209 reload_resources;
2926} 3210}
2927 3211
2928sub cfg_load { 3212sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3214 or return;
2931 3215
2932 local $/; 3216 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
2949sub main { 3233sub main {
2950 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
2954 Event::one_event; 3239 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
2956 }; 3241 };
2957 3242
2958 cfg_load; 3243 reload_config;
2959 db_init; 3244 db_init;
2960 load_extensions; 3245 load_extensions;
2961 3246
2962 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
2963 Event::loop; 3248 Event::loop;
3030 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3321 $pl->save;
3036 } 3322 }
3037 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3038 3324
3039 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
3087 3373
3088 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3089 for (;;) { 3375 for (;;) {
3090 BDB::flush; 3376 BDB::flush;
3091 IO::AIO::flush; 3377 IO::AIO::flush;
3092 Coro::cede; 3378 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3380 warn "iterate...";
3095 } 3381 }
3096 3382
3097 ++$RELOAD; 3383 ++$RELOAD;
3156 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
3157 require cf; 3443 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3445
3160 warn "loading config and database again"; 3446 warn "loading config and database again";
3161 cf::cfg_load; 3447 cf::reload_config;
3162 3448
3163 warn "loading extensions"; 3449 warn "loading extensions";
3164 cf::load_extensions; 3450 cf::load_extensions;
3165 3451
3166 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
3202register_command "reload" => sub { 3488register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3204 3490
3205 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3495 reload_perl;
3496 };
3208 } 3497 }
3209}; 3498};
3210 3499
3211unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3212 3501
3231 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3522 $signal->wait;
3234} 3523}
3235 3524
3236 my $min = 1e6;#d#
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3239 reentrant => 0, 3526 reentrant => 0,
3240 parked => 1, 3527 parked => 1,
3241 prio => 0, 3528 prio => 0,
3242 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
3250 3537
3251 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3252 3539
3253 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3254 3541
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; 3542 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3280 3544
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3284 write_runtime 3549 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3286 }; 3551 };
3287 } 3552 }
3288 3553
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3555 $sig->send;
3294 } 3556 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3558 $sig->send;
3306 3568
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3571
3310 _post_tick; 3572 _post_tick;
3311
3312
3313 }, 3573 },
3314); 3574);
3315 3575
3316{ 3576{
3577 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3319 reentrant => 0, 3580 reentrant => 0,
3320 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3321 poll => 'r', 3582 poll => 'r',
3322 prio => 0, 3583 prio => 0,
3323 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3325 ); 3586 );
3326 BDB::min_parallel 8;
3327 3587
3328 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3329 my $status; 3589 my $status;
3330 my $current = $Coro::current; 3590 my $current = $Coro::current;
3331 ( 3591 (
3340 ) 3600 )
3341 }; 3601 };
3342 3602
3343 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3609
3346 cf::sync_job { 3610 cf::sync_job {
3347 eval { 3611 eval {
3348 BDB::db_env_open 3612 BDB::db_env_open
3349 $DB_ENV, 3613 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3617 0666;
3354 3618
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 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 }; 3620 };
3360 3621
3361 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3623 };
3363 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3364} 3656}
3365 3657
3366{ 3658{
3367 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3368 3660
3371 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3372 reentrant => 0, 3664 reentrant => 0,
3373 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3375 poll => 'r', 3667 poll => 'r',
3376 prio => 6, 3668 prio => 0,
3377 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3378 ); 3670 );
3379} 3671}
3380 3672
3381my $_log_backtrace; 3673my $_log_backtrace;
3387 3679
3388 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3682 ++$_log_backtrace;
3391 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3392 my @bt = fork_call { 3686 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines