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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.383 by root, Thu Oct 11 21:09:29 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
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
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
327=item cf::async { BLOCK } 399=item cf::async { BLOCK }
328 400
329Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
355 my $time = Event::time; 427 my $time = Event::time;
356 428
357 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
359 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
360 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 435 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
363 437
364 my $busy = 1; 438 my $busy = 1;
365 my @res; 439 my @res;
366 440
367 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 443 @res = eval { $job->() };
369 warn $@ if $@; 444 warn $@ if $@;
370 undef $busy; 445 undef $busy;
371 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
372 447
416Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
418 493
419=cut 494=cut
420 495
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 496sub fork_call(&@) {
431 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
432 498
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 502
438 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 504 reset_signals;
452 local $SIG{__WARN__}; 505 &$cb
453 local $SIG{__DIE__}; 506 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 507
460 eval { 508 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 509}
473 510
474=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
475 512
476Returns a single value from the environment database. 513Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
479 516
480Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
483=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
484 543
485our $DB; 544our $DB;
486 545
487sub db_init { 546sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 547 cf::sync_job {
492 eval { 548 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 549 };
502} 550}
503 551
504sub db_get($$) { 552sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
506 554
556 if (1) { 604 if (1) {
557 $md5 = 605 $md5 =
558 join "\x00", 606 join "\x00",
559 $processversion, 607 $processversion,
560 map { 608 map {
561 Coro::cede; 609 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 611 } 0.. $#$src;
564 612
565 613
566 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
918 966
919=cut 967=cut
920 968
921############################################################################# 969#############################################################################
922# object support 970# object support
971#
972
973sub _can_merge {
974 my ($ob1, $ob2) = @_;
975
976 local $Storable::canonical = 1;
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979
980 $fob1 eq $fob2
981}
923 982
924sub reattach { 983sub reattach {
925 # basically do the same as instantiate, without calling instantiate 984 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 985 my ($obj) = @_;
927 986
974sub object_freezer_save { 1033sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
976 1035
977 sync_job { 1036 sync_job {
978 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
981 1041
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1046 close $fh;
987 1047
988 if (@$objs) { 1048 if (@$objs) {
989 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
990 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1054 close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
996 } 1056 }
1004 } 1064 }
1005 } else { 1065 } else {
1006 aio_unlink $filename; 1066 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1008 } 1068 }
1009 } 1069 };
1010} 1070}
1011 1071
1012sub object_freezer_as_string { 1072sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1014 1074
1026 or return; 1086 or return;
1027 1087
1028 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1090 or return;
1031 $av = eval { (Storable::thaw $av)->{objs} };
1032 }
1033 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1036 return ($data, $av); 1101 ($data, $av)
1037} 1102}
1038 1103
1039=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1040 1105
1041=over 4 1106=over 4
1114 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1115 1180
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1182
1118 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1124 } else { 1198 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1200 }
1127 1201
1128 cf::override; 1202 cf::override;
1218 1292
1219=head3 cf::player 1293=head3 cf::player
1220 1294
1221=over 4 1295=over 4
1222 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1223=item cf::player::find $login 1311=item cf::player::find $login
1224 1312
1225Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1226 1314
1227=cut 1315=cut
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1354
1267 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1270 } 1363 }
1271 } 1364 }
1272} 1365}
1273 1366
1283 1376
1284 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1286 1379
1287 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1288 Coro::cede; 1381 cf::cede_to_tick;
1289} 1382}
1290 1383
1291sub new($) { 1384sub new($) {
1292 my ($login) = @_; 1385 my ($login) = @_;
1293 1386
1297 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1298 1391
1299 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1300 1393
1301 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1302} 1405}
1303 1406
1304=item $pl->quit_character 1407=item $pl->quit_character
1305 1408
1306Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1361 or return []; 1464 or return [];
1362 1465
1363 my @logins; 1466 my @logins;
1364 1467
1365 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1369 1477
1370 utf8::decode $login; 1478 utf8::decode $login;
1371 push @logins, $login; 1479 push @logins, $login;
1372 } 1480 }
1373 1481
1411sub expand_cfpod { 1519sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1413 1521
1414 # escape & and < 1522 # escape & and <
1415 s/&/&amp;/g; 1523 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1417 1525
1418 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1419 1527
1420 1 while 1528 1 while
1421 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1534 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1428 }ge 1537 }ge
1429 # replace H<hint text> 1538 # replace H<hint text>
1450sub hintmode { 1559sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1561 $_[0]{hintmode}
1453} 1562}
1454 1563
1455=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1456 1565
1457Sends an ext reply to the player. 1566Sends an ext reply to the player.
1458 1567
1459=cut 1568=cut
1460 1569
1461sub ext_reply($$%) { 1570sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1463 1572
1464 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1574}
1467 1575
1468=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1469 1577
1470Sends an ext event to the client. 1578Sends an ext event to the client.
1471 1579
1472=cut 1580=cut
1473 1581
1474sub ext_event($$%) { 1582sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1476 1584
1477 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1478} 1586}
1479 1587
1480=head3 cf::region 1588=head3 cf::region
1481 1589
1482=over 4 1590=over 4
1698 1806
1699sub load_header_from($) { 1807sub load_header_from($) {
1700 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1701 1809
1702 utf8::encode $path; 1810 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1708 1819
1709 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1710 1821
1711 1 1822 1
1712} 1823}
1766sub find { 1877sub find {
1767 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1768 1879
1769 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1770 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1772 1884
1773 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1775 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1776 or return; 1890 or return;
1777 1891
1778 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1779 1893
1781 or return; 1895 or return;
1782 1896
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1786 $map->reset; 1902 $map->reset;
1787 undef $guard;
1788 return find $path; 1903 return find $path;
1789 } 1904 }
1790 1905
1791 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1792 } 1907 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1802 1917
1803 my $path = $self->{path}; 1918 my $path = $self->{path};
1804 1919
1805 { 1920 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1807 1922
1923 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 1925
1810 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1811 1927
1812 $self->alloc; 1928 $self->alloc;
1813 1929
1814 $self->pre_load; 1930 $self->pre_load;
1815 Coro::cede; 1931 cf::cede_to_tick;
1816 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1818 or return; 1936 or return;
1819 1937
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1822 1940
1823 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 1942 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 1945 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1828 } 1949 }
1829 } 1950 }
1830 1951
1831 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1832 # now do the right thing for maps 1955 # now do the right thing for maps
1833 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1958 unless $self->difficulty;
1836 Coro::cede; 1959 cf::cede_to_tick;
1837 1960
1838 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1962 $self->decay_objects;
1840 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1841 $self->update_buttons; 1964 $self->update_buttons;
1842 Coro::cede; 1965 cf::cede_to_tick;
1843 $self->set_darkness_map; 1966 $self->set_darkness_map;
1844 Coro::cede; 1967 cf::cede_to_tick;
1845 $self->activate; 1968 $self->activate;
1846 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1847 1973
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1975 }
1850 1976
1851 $self->post_load; 1977 $self->post_load;
1862 1988
1863 $self 1989 $self
1864} 1990}
1865 1991
1866# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1867sub load_diag { 1993sub load_neighbours {
1868 my ($map) = @_; 1994 my ($map) = @_;
1869 1995
1870 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1871 1997
1872 for (0 .. 3) { 1998 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1874 or next; 2000 or next;
1875 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1876 or next; 2002 or next;
1877 $neigh->load; 2003 $neigh->load;
1878 2004
2005 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2008 }
1882 2009
1883 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1885 or next; 2013 or next;
1886 $neigh->load; 2014 $neigh->load;
1887 } 2015 }
1888} 2016}
1889 2017
1894} 2022}
1895 2023
1896sub do_load_sync { 2024sub do_load_sync {
1897 my ($map) = @_; 2025 my ($map) = @_;
1898 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1899 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1900} 2031}
1901 2032
1902our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1904 2035
1905sub find_async { 2036sub find_async {
1906 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1907 2038
1908 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1909 2040
1910 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2043 }
1913 2044
1914 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1915 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1916 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2052 if (my $map = find $k) {
1919 $map->load; 2053 $map->load if $v;
1920 } 2054 }
1921 2055
1922 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
1923 } 2057 }
1924 } 2058 }
1925 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
1926 }; 2060 };
1927 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
1930} 2064}
1931 2065
1932sub save { 2066sub save {
1933 my ($self) = @_; 2067 my ($self) = @_;
1934 2068
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2070
1937 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
1938 2072
1939 return unless $self->dirty; 2073 return unless $self->dirty;
1940 2074
1946 return if $self->{deny_save}; 2080 return if $self->{deny_save};
1947 2081
1948 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
1949 2083
1950 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
1952 }; 2087 };
1953 2088
1954 if ($uniq) { 2089 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1963 my ($self) = @_; 2098 my ($self) = @_;
1964 2099
1965 # save first because save cedes 2100 # save first because save cedes
1966 $self->save; 2101 $self->save;
1967 2102
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2104
1970 return if $self->players; 2105 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2107 return if $self->{deny_save};
1973 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2113 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2114}
1977 2115
1978sub reset_at { 2116sub reset_at {
1979 my ($self) = @_; 2117 my ($self) = @_;
1980 2118
2012 if $uniq; 2150 if $uniq;
2013 } 2151 }
2014 2152
2015 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2016 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2157 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2158
2021 $self->unlink_save; 2159 $self->unlink_save;
2022 $self->destroy; 2160 $self->destroy;
2023} 2161}
2024 2162
2025my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
2026 2164
2027sub nuke { 2165sub nuke {
2028 my ($self) = @_; 2166 my ($self) = @_;
2029 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
2030 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2031 2172
2032 $self->unlink_save; 2173 $self->unlink_save;
2033 2174
2034 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2180
2040 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
2041 2183
2042 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2043} 2185}
2044 2186
2045=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
2121 2263
2122sub inv_recursive { 2264sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2124} 2266}
2125 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2126package cf; 2296package cf;
2127 2297
2128=back 2298=back
2129 2299
2130=head3 cf::object::player 2300=head3 cf::object::player
2152 2322
2153 } else { 2323 } else {
2154 my $pl = $self->contr; 2324 my $pl = $self->contr;
2155 2325
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2327 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2329
2165 } else { 2330 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2168 } 2333 }
2169 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
2170} 2345}
2171 2346
2172=item $player_object->may ("access") 2347=item $player_object->may ("access")
2173 2348
2174Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2256 2431
2257 $map->load; 2432 $map->load;
2258 $map->load_diag; 2433 $map->load_neighbours;
2259 2434
2260 return unless $self->contr->active; 2435 return unless $self->contr->active;
2261 $self->activate_recursive; 2436 $self->activate_recursive;
2262 2437
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2459
2285 $self->enter_link; 2460 $self->enter_link;
2286 2461
2287 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2288 my $map = eval { 2484 my $map = eval {
2289 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2290 2486
2291 if ($map) { 2487 if ($map) {
2292 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2294 } else { 2490 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2492 }
2297 2493
2298 $map 2494 $map
2299 }; 2495 };
2300 2496
2390 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2393 2589
2394 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2395 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2594 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2398 2596
2399 1; 2597 1;
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2632the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2436 2634
2437=cut 2635=cut
2438 2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2439sub cf::client::send_msg { 2658sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2660
2442 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2443 2662
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2448 if (ref $channel) { 2674 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2453 } 2680 }
2454 2681
2455 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2456 } 2683 }
2457 2684
2685 return unless @extra || length $msg;
2686
2458 if ($self->can_msg) { 2687 if ($self->can_msg) {
2688 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF;
2691
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2692 $self->send_packet ("msg " . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2694 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705
2706 $color &= cf::NDI_COLOR_MASK;
2707
2708 utf8::encode $msg;
2709
2472 if (0 && $msg =~ /\[/) { 2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2713 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2715 $self->send_packet ("drawinfo $color $msg")
2477 } 2716 }
2478 } 2717 }
2479 } 2718 }
2480} 2719}
2481 2720
2482=item $client->ext_event ($type, %msg) 2721=item $client->ext_msg ($type, @msg)
2483 2722
2484Sends an ext event to the client. 2723Sends an ext event to the client.
2485 2724
2486=cut 2725=cut
2487 2726
2488sub cf::client::ext_event($$%) { 2727sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2728 my ($self, $type, @msg) = @_;
2490 2729
2491 return unless $self->extcmd; 2730 if ($self->extcmd == 2) {
2492 2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2733 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 }
2736}
2737
2738=item $client->ext_reply ($msgid, @msg)
2739
2740Sends an ext reply to the client.
2741
2742=cut
2743
2744sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_;
2746
2747 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 }
2495} 2754}
2496 2755
2497=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
2498 2757
2499Queues a query to the client, calling the given callback with 2758Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 2813 my ($ns, $buf) = @_;
2555 2814
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2815 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2816
2558 if (ref $msg) { 2817 if (ref $msg) {
2818 my ($type, $reply, @payload) =
2819 "ARRAY" eq ref $msg
2820 ? @$msg
2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2822
2823 my @reply;
2824
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2825 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2826 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2565 } else { 2832 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 2834 }
2568 2835
2569 cf::override; 2836 cf::override;
2616our $safe = new Safe "safe"; 2883our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2884our $safe_hole = new Safe::Hole;
2618 2885
2619$SIG{FPE} = 'IGNORE'; 2886$SIG{FPE} = 'IGNORE';
2620 2887
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2888$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math
2890 grepstart grepwhile mapstart mapwhile
2891 sort time
2892));
2622 2893
2623# here we export the classes and methods available to script code 2894# here we export the classes and methods available to script code
2624 2895
2625=pod 2896=pod
2626 2897
2627The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2628 2899
2629 cf::object 2900 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 2901 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 2902 insert remove name archname title slaying race decrease_ob_nr
2632 2903
2633 cf::object::player 2904 cf::object::player
2634 player 2905 player
2635 2906
2636 cf::player 2907 cf::player
2641 2912
2642=cut 2913=cut
2643 2914
2644for ( 2915for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race
2646 insert remove)], 2918 decrease_ob_nr destroy)],
2647 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2650) { 2922) {
2651 no strict 'refs'; 2923 no strict 'refs';
2727# the server's init and main functions 2999# the server's init and main functions
2728 3000
2729sub load_facedata($) { 3001sub load_facedata($) {
2730 my ($path) = @_; 3002 my ($path) = @_;
2731 3003
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009
2732 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2733 3011
2734 my $facedata; 3012 my $facedata;
2735 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3014 or die "$path: $!";
2737 3015
2738 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2739 3017
2740 $facedata->{version} == 2 3018 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3019 or cf::cleanup "$path: version mismatch, cannot proceed.";
3020
3021 # patch in the exptable
3022 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3025 };
3026 cf::cede_to_tick;
2742 3027
2743 { 3028 {
2744 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2745 3030
2746 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 3033 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3034 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3037
2753 cf::cede_to_tick; 3038 cf::cede_to_tick;
2754 } 3039 }
2755 3040
2756 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
2781 3066
2782 { 3067 {
2783 # TODO: for gcfclient pleasure, we should give resources 3068 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3069 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3070 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 3071
3072 my $soundconf = delete $res->{"res/sound.conf"};
2787 3073
2788 while (my ($name, $info) = each %$res) { 3074 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
2796 3077
2797 if ($name =~ /\.jpg$/) { 3078 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3079 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
3086 $data = pack "(w/a*)*", $meta, $info->{data};
2800 } else { 3087 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3088 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3089 }
2807 3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
2808 cf::cede_to_tick; 3094 cf::cede_to_tick;
2809 } 3095 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
2810 } 3114 }
2811 3115
2812 1 3116 1
2813} 3117}
2814 3118
3119register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_;
3121
3122 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v);
3124 }
3125};
3126
2815sub reload_regions { 3127sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
2816 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
2818 3134
2819 for (cf::region::list) { 3135 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3136 $_->{match} = qr/$_->{match}/
2856 3172
2857sub init { 3173sub init {
2858 reload_resources; 3174 reload_resources;
2859} 3175}
2860 3176
2861sub cfg_load { 3177sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3179 or return;
2864 3180
2865 local $/; 3181 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
2882sub main { 3198sub main {
2883 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
2887 Event::one_event; 3204 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
2889 }; 3206 };
2890 3207
2891 cfg_load; 3208 reload_config;
2892 db_init; 3209 db_init;
2893 load_extensions; 3210 load_extensions;
2894 3211
2895 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
2896 Event::loop; 3213 Event::loop;
2963 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3286 $pl->save;
2969 } 3287 }
2970 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
2971 3289
2972 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
3089 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
3090 require cf; 3408 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3410
3093 warn "loading config and database again"; 3411 warn "loading config and database again";
3094 cf::cfg_load; 3412 cf::reload_config;
3095 3413
3096 warn "loading extensions"; 3414 warn "loading extensions";
3097 cf::load_extensions; 3415 cf::load_extensions;
3098 3416
3099 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
3135register_command "reload" => sub { 3453register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
3137 3455
3138 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3460 reload_perl;
3461 };
3141 } 3462 }
3142}; 3463};
3143 3464
3144unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
3145 3466
3164 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3487 $signal->wait;
3167} 3488}
3168 3489
3169 my $min = 1e6;#d#
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
3172 reentrant => 0, 3491 reentrant => 0,
3173 parked => 1, 3492 parked => 1,
3174 prio => 0, 3493 prio => 0,
3175 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
3183 3502
3184 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
3185 3504
3186 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
3187 3506
3188 0 && sync_job {#d#
3189 for(1..10) {
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 };
3210
3211 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
3213 3509
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
3217 write_runtime 3514 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
3219 }; 3516 };
3220 } 3517 }
3221 3518
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3520 $sig->send;
3227 } 3521 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3523 $sig->send;
3239 3533
3240 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3536
3243 _post_tick; 3537 _post_tick;
3244
3245
3246 }, 3538 },
3247); 3539);
3248 3540
3249{ 3541{
3542 BDB::min_parallel 8;
3250 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3251 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3252 reentrant => 0, 3545 reentrant => 0,
3253 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3254 poll => 'r', 3547 poll => 'r',
3255 prio => 0, 3548 prio => 0,
3256 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3258 ); 3551 );
3259 BDB::min_parallel 8;
3260 3552
3261 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3262 my $status; 3554 my $status;
3263 my $current = $Coro::current; 3555 my $current = $Coro::current;
3264 ( 3556 (
3273 ) 3565 )
3274 }; 3566 };
3275 3567
3276 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 3574
3279 cf::sync_job { 3575 cf::sync_job {
3280 eval { 3576 eval {
3281 BDB::db_env_open 3577 BDB::db_env_open
3282 $DB_ENV, 3578 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3582 0666;
3287 3583
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3585 };
3293 3586
3294 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3588 };
3296 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
3297} 3621}
3298 3622
3299{ 3623{
3300 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3301 3625
3304 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3305 reentrant => 0, 3629 reentrant => 0,
3306 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3308 poll => 'r', 3632 poll => 'r',
3309 prio => 6, 3633 prio => 0,
3310 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3311 ); 3635 );
3312} 3636}
3313 3637
3314my $_log_backtrace; 3638my $_log_backtrace;
3320 3644
3321 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3647 ++$_log_backtrace;
3324 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3325 my @bt = fork_call { 3651 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines