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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 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
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
327=item cf::get_slot $time[, $priority] 341=item cf::get_slot $time[, $priority[, $name]]
328 342
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 343Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 344This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 345of cpu time till the next tick. The slot is only valid till the next cede.
332 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
333Useful for short background jobs. 350Useful for short background jobs.
334 351
335=cut 352=cut
336 353
337our @SLOT_QUEUE; 354our @SLOT_QUEUE;
338our $SLOT_QUEUE; 355our $SLOT_QUEUE;
339 356
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
342 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
343 362
344 while () { 363 while () {
345 next_job: 364 next_job:
346 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
354 } 373 }
355 } 374 }
356 } 375 }
357 376
358 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
359 # 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
360 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 380 $signal->wait;
362 } else { 381 } else {
363 Coro::schedule; 382 Coro::schedule;
364 } 383 }
365 } 384 }
366}; 385};
367 386
368sub get_slot($;$) { 387sub get_slot($;$$) {
369 my ($time, $pri) = @_; 388 my ($time, $pri, $name) = @_;
370 389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 395 $SLOT_QUEUE->ready;
374 $sig->wait; 396 $sig->wait;
375} 397}
376 398
405 my $time = Event::time; 427 my $time = Event::time;
406 428
407 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
409 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
410 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
411 # (but this is cancel-safe) 435 # (but this is cancel-safe)
412 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
413 437
414 my $busy = 1; 438 my $busy = 1;
415 my @res; 439 my @res;
416 440
417 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 443 @res = eval { $job->() };
419 warn $@ if $@; 444 warn $@ if $@;
420 undef $busy; 445 undef $busy;
421 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
422 447
466Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
468 493
469=cut 494=cut
470 495
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 496sub fork_call(&@) {
481 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
482 498
483# 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,
484# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 502
488 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 504 reset_signals;
502 local $SIG{__WARN__}; 505 &$cb
503 local $SIG{__DIE__}; 506 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 507
510 eval { 508 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 509}
523 510
524=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
525 512
526Returns a single value from the environment database. 513Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
529 516
530Stores 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
531data 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).
532 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
533=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}
534 543
535our $DB; 544our $DB;
536 545
537sub db_init { 546sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 547 cf::sync_job {
542 eval { 548 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 549 };
552} 550}
553 551
554sub db_get($$) { 552sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
556 554
606 if (1) { 604 if (1) {
607 $md5 = 605 $md5 =
608 join "\x00", 606 join "\x00",
609 $processversion, 607 $processversion,
610 map { 608 map {
611 Coro::cede; 609 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 611 } 0.. $#$src;
614 612
615 613
616 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
973# 971#
974 972
975sub _can_merge { 973sub _can_merge {
976 my ($ob1, $ob2) = @_; 974 my ($ob1, $ob2) = @_;
977 975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
978 local $Storable::canonical = 1; 981 local $Storable::canonical = 1;
979 my $fob1 = Storable::freeze $ob1; 982 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2; 983 my $fob2 = Storable::freeze $ob2;
981
982 $fob1 eq $fob2 984 $fob1 eq $fob2
985 }
983} 986}
984 987
985sub reattach { 988sub reattach {
986 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 990 my ($obj) = @_;
1035sub object_freezer_save { 1038sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
1037 1040
1038 sync_job { 1041 sync_job {
1039 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
1042 1046
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1051 close $fh;
1048 1052
1049 if (@$objs) { 1053 if (@$objs) {
1050 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1051 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1059 close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1061 }
1065 } 1069 }
1066 } else { 1070 } else {
1067 aio_unlink $filename; 1071 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
1069 } 1073 }
1070 } 1074 };
1071} 1075}
1072 1076
1073sub object_freezer_as_string { 1077sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
1075 1079
1087 or return; 1091 or return;
1088 1092
1089 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1095 or return;
1092 $av = eval { (Storable::thaw $av)->{objs} };
1093 }
1094 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
1097 return ($data, $av); 1106 ($data, $av)
1098} 1107}
1099 1108
1100=head2 COMMAND CALLBACKS 1109=head2 COMMAND CALLBACKS
1101 1110
1102=over 4 1111=over 4
1175 my ($pl, $buf) = @_; 1184 my ($pl, $buf) = @_;
1176 1185
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1186 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1187
1179 if (ref $msg) { 1188 if (ref $msg) {
1189 my ($type, $reply, @payload) =
1190 "ARRAY" eq ref $msg
1191 ? @$msg
1192 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1193
1194 my @reply;
1195
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1196 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1197 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1198 }
1199
1200 $pl->ext_reply ($reply, @reply)
1201 if $reply;
1202
1185 } else { 1203 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1205 }
1188 1206
1189 cf::override; 1207 cf::override;
1279 1297
1280=head3 cf::player 1298=head3 cf::player
1281 1299
1282=over 4 1300=over 4
1283 1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1315
1284=item cf::player::find $login 1316=item cf::player::find $login
1285 1317
1286Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1287 1319
1288=cut 1320=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1359
1328 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1331 } 1368 }
1332 } 1369 }
1333} 1370}
1334 1371
1344 1381
1345 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1347 1384
1348 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1349 Coro::cede; 1386 cf::cede_to_tick;
1350} 1387}
1351 1388
1352sub new($) { 1389sub new($) {
1353 my ($login) = @_; 1390 my ($login) = @_;
1354 1391
1358 $self->{deny_save} = 1; 1395 $self->{deny_save} = 1;
1359 1396
1360 $cf::PLAYER{$login} = $self; 1397 $cf::PLAYER{$login} = $self;
1361 1398
1362 $self 1399 $self
1400}
1401
1402=item $player->send_msg ($channel, $msg, $color, [extra...])
1403
1404=cut
1405
1406sub send_msg {
1407 my $ns = shift->ns
1408 or return;
1409 $ns->send_msg (@_);
1363} 1410}
1364 1411
1365=item $pl->quit_character 1412=item $pl->quit_character
1366 1413
1367Nukes the player without looking back. If logged in, the connection will 1414Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1469 or return [];
1423 1470
1424 my @logins; 1471 my @logins;
1425 1472
1426 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1430 1482
1431 utf8::decode $login; 1483 utf8::decode $login;
1432 push @logins, $login; 1484 push @logins, $login;
1433 } 1485 }
1434 1486
1472sub expand_cfpod { 1524sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1525 ((my $self), (local $_)) = @_;
1474 1526
1475 # escape & and < 1527 # escape & and <
1476 s/&/&amp;/g; 1528 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1529 s/(?<![BIUGHT])</&lt;/g;
1478 1530
1479 # this is buggy, it needs to properly take care of nested <'s 1531 # this is buggy, it needs to properly take care of nested <'s
1480 1532
1481 1 while 1533 1 while
1482 # replace B<>, I<>, U<> etc. 1534 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1535 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1539 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1540 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1541 $self->gender ? $2 : $1
1489 }ge 1542 }ge
1490 # replace H<hint text> 1543 # replace H<hint text>
1511sub hintmode { 1564sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1566 $_[0]{hintmode}
1514} 1567}
1515 1568
1516=item $player->ext_reply ($msgid, %msg) 1569=item $player->ext_reply ($msgid, @msg)
1517 1570
1518Sends an ext reply to the player. 1571Sends an ext reply to the player.
1519 1572
1520=cut 1573=cut
1521 1574
1522sub ext_reply($$%) { 1575sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1576 my ($self, $id, @msg) = @_;
1524 1577
1525 $msg{msgid} = $id; 1578 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1579}
1528 1580
1529=item $player->ext_event ($type, %msg) 1581=item $player->ext_msg ($type, @msg)
1530 1582
1531Sends an ext event to the client. 1583Sends an ext event to the client.
1532 1584
1533=cut 1585=cut
1534 1586
1535sub ext_event($$%) { 1587sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1588 my ($self, $type, @msg) = @_;
1537 1589
1538 $self->ns->ext_event ($type, %msg); 1590 $self->ns->ext_msg ($type, @msg);
1539} 1591}
1540 1592
1541=head3 cf::region 1593=head3 cf::region
1542 1594
1543=over 4 1595=over 4
1759 1811
1760sub load_header_from($) { 1812sub load_header_from($) {
1761 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1762 1814
1763 utf8::encode $path; 1815 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1769 1824
1770 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1771 1826
1772 1 1827 1
1773} 1828}
1827sub find { 1882sub find {
1828 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1829 1884
1830 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1831 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1833 1889
1834 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1836 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1837 or return; 1895 or return;
1838 1896
1839 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1840 1898
1842 or return; 1900 or return;
1843 1901
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1847 $map->reset; 1907 $map->reset;
1848 undef $guard;
1849 return find $path; 1908 return find $path;
1850 } 1909 }
1851 1910
1852 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1853 } 1912 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1863 1922
1864 my $path = $self->{path}; 1923 my $path = $self->{path};
1865 1924
1866 { 1925 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1868 1927
1928 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1930
1871 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1872 1932
1873 $self->alloc; 1933 $self->alloc;
1874 1934
1875 $self->pre_load; 1935 $self->pre_load;
1876 Coro::cede; 1936 cf::cede_to_tick;
1877 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1879 or return; 1941 or return;
1880 1942
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1883 1945
1884 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1947 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1950 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1889 } 1954 }
1890 } 1955 }
1891 1956
1892 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1893 # now do the right thing for maps 1960 # now do the right thing for maps
1894 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1963 unless $self->difficulty;
1897 Coro::cede; 1964 cf::cede_to_tick;
1898 1965
1899 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1967 $self->decay_objects;
1901 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1902 $self->update_buttons; 1969 $self->update_buttons;
1903 Coro::cede; 1970 cf::cede_to_tick;
1904 $self->set_darkness_map; 1971 $self->set_darkness_map;
1905 Coro::cede; 1972 cf::cede_to_tick;
1906 $self->activate; 1973 $self->activate;
1907 } 1974 }
1975
1976 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME);
1908 1978
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1979 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1980 }
1911 1981
1912 $self->post_load; 1982 $self->post_load;
1923 1993
1924 $self 1994 $self
1925} 1995}
1926 1996
1927# find and load all maps in the 3x3 area around a map 1997# find and load all maps in the 3x3 area around a map
1928sub load_diag { 1998sub load_neighbours {
1929 my ($map) = @_; 1999 my ($map) = @_;
1930 2000
1931 my @diag; # diagonal neighbours 2001 my @neigh; # diagonal neighbours
1932 2002
1933 for (0 .. 3) { 2003 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2004 my $neigh = $map->tile_path ($_)
1935 or next; 2005 or next;
1936 $neigh = find $neigh, $map 2006 $neigh = find $neigh, $map
1937 or next; 2007 or next;
1938 $neigh->load; 2008 $neigh->load;
1939 2009
2010 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2011 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2012 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2013 }
1943 2014
1944 for (@diag) { 2015 for (grep defined $_->[0], @neigh) {
2016 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2017 my $neigh = find $path, $origin
1946 or next; 2018 or next;
1947 $neigh->load; 2019 $neigh->load;
1948 } 2020 }
1949} 2021}
1950 2022
1955} 2027}
1956 2028
1957sub do_load_sync { 2029sub do_load_sync {
1958 my ($map) = @_; 2030 my ($map) = @_;
1959 2031
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main;
2034
1960 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1961} 2036}
1962 2037
1963our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2039our $MAP_PREFETCHER = undef;
1965 2040
1966sub find_async { 2041sub find_async {
1967 my ($path, $origin) = @_; 2042 my ($path, $origin, $load) = @_;
1968 2043
1969 $path = normalise $path, $origin && $origin->{path}; 2044 $path = normalise $path, $origin && $origin->{path};
1970 2045
1971 if (my $map = $cf::MAP{$path}) { 2046 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2048 }
1974 2049
1975 undef $MAP_PREFETCH{$path}; 2050 $MAP_PREFETCH{$path} |= $load;
2051
1976 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1977 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2057 if (my $map = find $k) {
1980 $map->load; 2058 $map->load if $v;
1981 } 2059 }
1982 2060
1983 delete $MAP_PREFETCH{$path}; 2061 delete $MAP_PREFETCH{$k};
1984 } 2062 }
1985 } 2063 }
1986 undef $MAP_PREFETCHER; 2064 undef $MAP_PREFETCHER;
1987 }; 2065 };
1988 $MAP_PREFETCHER->prio (6); 2066 $MAP_PREFETCHER->prio (6);
1991} 2069}
1992 2070
1993sub save { 2071sub save {
1994 my ($self) = @_; 2072 my ($self) = @_;
1995 2073
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2075
1998 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
1999 2077
2000 return unless $self->dirty; 2078 return unless $self->dirty;
2001 2079
2007 return if $self->{deny_save}; 2085 return if $self->{deny_save};
2008 2086
2009 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
2010 2088
2011 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
2013 }; 2092 };
2014 2093
2015 if ($uniq) { 2094 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2103 my ($self) = @_;
2025 2104
2026 # save first because save cedes 2105 # save first because save cedes
2027 $self->save; 2106 $self->save;
2028 2107
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2109
2031 return if $self->players; 2110 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2112 return if $self->{deny_save};
2034 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2118 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2119}
2038 2120
2039sub reset_at { 2121sub reset_at {
2040 my ($self) = @_; 2122 my ($self) = @_;
2041 2123
2073 if $uniq; 2155 if $uniq;
2074 } 2156 }
2075 2157
2076 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
2077 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2162 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2163
2082 $self->unlink_save; 2164 $self->unlink_save;
2083 $self->destroy; 2165 $self->destroy;
2084} 2166}
2085 2167
2086my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
2087 2169
2088sub nuke { 2170sub nuke {
2089 my ($self) = @_; 2171 my ($self) = @_;
2090 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
2091 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
2092 2177
2093 $self->unlink_save; 2178 $self->unlink_save;
2094 2179
2095 bless $self, "cf::map"; 2180 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2185
2101 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
2102 2188
2103 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
2104} 2190}
2105 2191
2106=item $maps = cf::map::tmp_maps 2192=item $maps = cf::map::tmp_maps
2182 2268
2183sub inv_recursive { 2269sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2185} 2271}
2186 2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
2299}
2300
2187package cf; 2301package cf;
2188 2302
2189=back 2303=back
2190 2304
2191=head3 cf::object::player 2305=head3 cf::object::player
2213 2327
2214 } else { 2328 } else {
2215 my $pl = $self->contr; 2329 my $pl = $self->contr;
2216 2330
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2331 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2332 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2334
2226 } else { 2335 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2336 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2337 $self->message ($msg, $flags);
2229 } 2338 }
2230 } 2339 }
2340}
2341
2342=item $object->send_msg ($channel, $msg, $color, [extra...])
2343
2344=cut
2345
2346sub cf::object::send_msg {
2347 my $pl = shift->contr
2348 or return;
2349 $pl->send_msg (@_);
2231} 2350}
2232 2351
2233=item $player_object->may ("access") 2352=item $player_object->may ("access")
2234 2353
2235Returns wether the given player is authorized to access resource "access" 2354Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2433 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2434 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2435 if $x <=0 && $y <= 0;
2317 2436
2318 $map->load; 2437 $map->load;
2319 $map->load_diag; 2438 $map->load_neighbours;
2320 2439
2321 return unless $self->contr->active; 2440 return unless $self->contr->active;
2322 $self->activate_recursive; 2441 $self->activate_recursive;
2323 2442
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2464
2346 $self->enter_link; 2465 $self->enter_link;
2347 2466
2348 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2349 my $map = eval { 2489 my $map = eval {
2350 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2351 2491
2352 if ($map) { 2492 if ($map) {
2353 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2355 } else { 2495 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2497 }
2358 2498
2359 $map 2499 $map
2360 }; 2500 };
2361 2501
2451 # if exit is damned, update players death & WoR home-position 2591 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2592 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2593 if $exit->flag (FLAG_DAMNED);
2454 2594
2455 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2456 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2599 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2459 2601
2460 1; 2602 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2637the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2638the message unless the client supports the msg packet.
2497 2639
2498=cut 2640=cut
2499 2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2500sub cf::client::send_msg { 2663sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2664 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2665
2503 $msg = $self->pl->expand_cfpod ($msg); 2666 $msg = $self->pl->expand_cfpod ($msg);
2504 2667
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2507 if (ref $channel) { 2679 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2680 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2681 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2682 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2512 } 2685 }
2513 2686
2514 $channel = $channel->{id}; 2687 $channel = $channel->{id};
2515 } 2688 }
2516 2689
2517 return unless @extra || length $msg; 2690 return unless @extra || length $msg;
2518 2691
2519 if ($self->can_msg) { 2692 if ($self->can_msg) {
2693 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF;
2696
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2697 $self->send_packet ("msg " . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2699 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710
2711 $color &= cf::NDI_COLOR_MASK;
2712
2713 utf8::encode $msg;
2714
2533 if (0 && $msg =~ /\[/) { 2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2718 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2720 $self->send_packet ("drawinfo $color $msg")
2538 } 2721 }
2539 } 2722 }
2540 } 2723 }
2541} 2724}
2542 2725
2543=item $client->ext_event ($type, %msg) 2726=item $client->ext_msg ($type, @msg)
2544 2727
2545Sends an ext event to the client. 2728Sends an ext event to the client.
2546 2729
2547=cut 2730=cut
2548 2731
2549sub cf::client::ext_event($$%) { 2732sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2733 my ($self, $type, @msg) = @_;
2551 2734
2552 return unless $self->extcmd; 2735 if ($self->extcmd == 2) {
2553 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2738 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 }
2741}
2742
2743=item $client->ext_reply ($msgid, @msg)
2744
2745Sends an ext reply to the client.
2746
2747=cut
2748
2749sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_;
2751
2752 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 }
2556} 2759}
2557 2760
2558=item $success = $client->query ($flags, "text", \&cb) 2761=item $success = $client->query ($flags, "text", \&cb)
2559 2762
2560Queues a query to the client, calling the given callback with 2763Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2818 my ($ns, $buf) = @_;
2616 2819
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2820 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2821
2619 if (ref $msg) { 2822 if (ref $msg) {
2823 my ($type, $reply, @payload) =
2824 "ARRAY" eq ref $msg
2825 ? @$msg
2826 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2827
2828 my @reply;
2829
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2830 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2831 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2832 }
2833
2834 $ns->ext_reply ($reply, @reply)
2835 if $reply;
2836
2626 } else { 2837 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2839 }
2629 2840
2630 cf::override; 2841 cf::override;
2677our $safe = new Safe "safe"; 2888our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2889our $safe_hole = new Safe::Hole;
2679 2890
2680$SIG{FPE} = 'IGNORE'; 2891$SIG{FPE} = 'IGNORE';
2681 2892
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2893$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math
2895 grepstart grepwhile mapstart mapwhile
2896 sort time
2897));
2683 2898
2684# here we export the classes and methods available to script code 2899# here we export the classes and methods available to script code
2685 2900
2686=pod 2901=pod
2687 2902
2688The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2689 2904
2690 cf::object 2905 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2906 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 2907 insert remove name archname title slaying race decrease_ob_nr
2693 2908
2694 cf::object::player 2909 cf::object::player
2695 player 2910 player
2696 2911
2697 cf::player 2912 cf::player
2702 2917
2703=cut 2918=cut
2704 2919
2705for ( 2920for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race
2707 insert remove)], 2923 decrease_ob_nr destroy)],
2708 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2711) { 2927) {
2712 no strict 'refs'; 2928 no strict 'refs';
2788# the server's init and main functions 3004# the server's init and main functions
2789 3005
2790sub load_facedata($) { 3006sub load_facedata($) {
2791 my ($path) = @_; 3007 my ($path) = @_;
2792 3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3014
2793 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2794 3016
2795 my $facedata; 3017 my $facedata;
2796 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3019 or die "$path: $!";
2798 3020
2799 $facedata = Coro::Storable::thaw $facedata; 3021 $facedata = Coro::Storable::thaw $facedata;
2800 3022
2801 $facedata->{version} == 2 3023 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3024 or cf::cleanup "$path: version mismatch, cannot proceed.";
3025
3026 # patch in the exptable
3027 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3030 };
3031 cf::cede_to_tick;
2803 3032
2804 { 3033 {
2805 my $faces = $facedata->{faceinfo}; 3034 my $faces = $facedata->{faceinfo};
2806 3035
2807 while (my ($face, $info) = each %$faces) { 3036 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3037 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3038 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3039 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3042
2814 cf::cede_to_tick; 3043 cf::cede_to_tick;
2815 } 3044 }
2816 3045
2817 while (my ($face, $info) = each %$faces) { 3046 while (my ($face, $info) = each %$faces) {
2842 3071
2843 { 3072 {
2844 # TODO: for gcfclient pleasure, we should give resources 3073 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3074 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3075 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3076
3077 my $soundconf = delete $res->{"res/sound.conf"};
2848 3078
2849 while (my ($name, $info) = each %$res) { 3079 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3080 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
2857 3082
2858 if ($name =~ /\.jpg$/) { 3083 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3084 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3092 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3093 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3094 }
2868 3095
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
2869 cf::cede_to_tick; 3099 cf::cede_to_tick;
2870 } 3100 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
2871 } 3119 }
2872 3120
2873 1 3121 1
2874} 3122}
2875 3123
3124register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_;
3126
3127 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v);
3129 }
3130};
3131
2876sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2877 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
2879 3139
2880 for (cf::region::list) { 3140 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3141 $_->{match} = qr/$_->{match}/
2917 3177
2918sub init { 3178sub init {
2919 reload_resources; 3179 reload_resources;
2920} 3180}
2921 3181
2922sub cfg_load { 3182sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3184 or return;
2925 3185
2926 local $/; 3186 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
2943sub main { 3203sub main {
2944 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
2948 Event::one_event; 3209 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
2950 }; 3211 };
2951 3212
2952 cfg_load; 3213 reload_config;
2953 db_init; 3214 db_init;
2954 load_extensions; 3215 load_extensions;
2955 3216
2956 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
2957 Event::loop; 3218 Event::loop;
3024 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3291 $pl->save;
3030 } 3292 }
3031 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
3032 3294
3033 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
3150 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
3151 require cf; 3413 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3415
3154 warn "loading config and database again"; 3416 warn "loading config and database again";
3155 cf::cfg_load; 3417 cf::reload_config;
3156 3418
3157 warn "loading extensions"; 3419 warn "loading extensions";
3158 cf::load_extensions; 3420 cf::load_extensions;
3159 3421
3160 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
3196register_command "reload" => sub { 3458register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
3198 3460
3199 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3465 reload_perl;
3466 };
3202 } 3467 }
3203}; 3468};
3204 3469
3205unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
3206 3471
3225 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3492 $signal->wait;
3228} 3493}
3229 3494
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3496 reentrant => 0,
3234 parked => 1, 3497 parked => 1,
3235 prio => 0, 3498 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
3244 3507
3245 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
3246 3509
3247 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
3248 3511
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
3271
3272 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
3274 3514
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
3278 write_runtime 3519 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3521 };
3281 } 3522 }
3282 3523
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3525 $sig->send;
3288 } 3526 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3528 $sig->send;
3300 3538
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3541
3304 _post_tick; 3542 _post_tick;
3305
3306
3307 }, 3543 },
3308); 3544);
3309 3545
3310{ 3546{
3547 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3550 reentrant => 0,
3314 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
3315 poll => 'r', 3552 poll => 'r',
3316 prio => 0, 3553 prio => 0,
3317 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
3319 ); 3556 );
3320 BDB::min_parallel 8;
3321 3557
3322 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
3323 my $status; 3559 my $status;
3324 my $current = $Coro::current; 3560 my $current = $Coro::current;
3325 ( 3561 (
3334 ) 3570 )
3335 }; 3571 };
3336 3572
3337 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3579
3340 cf::sync_job { 3580 cf::sync_job {
3341 eval { 3581 eval {
3342 BDB::db_env_open 3582 BDB::db_env_open
3343 $DB_ENV, 3583 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3587 0666;
3348 3588
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3590 };
3354 3591
3355 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3593 };
3357 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3358} 3626}
3359 3627
3360{ 3628{
3361 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3362 3630
3365 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3366 reentrant => 0, 3634 reentrant => 0,
3367 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3369 poll => 'r', 3637 poll => 'r',
3370 prio => 6, 3638 prio => 0,
3371 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3372 ); 3640 );
3373} 3641}
3374 3642
3375my $_log_backtrace; 3643my $_log_backtrace;
3381 3649
3382 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3652 ++$_log_backtrace;
3385 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3386 my @bt = fork_call { 3656 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines