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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.388 by root, Thu Oct 18 02:56:13 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
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, 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
373 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
374 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
375 } 454 }
376 455
377 $time = Event::time - $time; 456 $time = Event::time - $time;
378 457
379 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
416Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
418 497
419=cut 498=cut
420 499
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(&@) { 500sub fork_call(&@) {
431 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
432 502
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 506
438 if (my $pid = fork) { 507 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; 508 reset_signals;
452 local $SIG{__WARN__}; 509 &$cb
453 local $SIG{__DIE__}; 510 }, @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 511
460 eval { 512 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} 513}
473 514
474=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
475 516
476Returns a single value from the environment database. 517Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
479 520
480Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
483=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
484 547
485our $DB; 548our $DB;
486 549
487sub db_init { 550sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 551 cf::sync_job {
492 eval { 552 $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 } 553 };
502} 554}
503 555
504sub db_get($$) { 556sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
506 558
556 if (1) { 608 if (1) {
557 $md5 = 609 $md5 =
558 join "\x00", 610 join "\x00",
559 $processversion, 611 $processversion,
560 map { 612 map {
561 Coro::cede; 613 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 615 } 0.. $#$src;
564 616
565 617
566 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
918 970
919=cut 971=cut
920 972
921############################################################################# 973#############################################################################
922# object support 974# object support
923#
924 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
925sub _can_merge { 1009sub _can_merge {
926 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
927 1011
928 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1013
932 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
933} 1016}
934 1017
935sub reattach { 1018sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1020 my ($obj) = @_;
985sub object_freezer_save { 1068sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
987 1070
988 sync_job { 1071 sync_job {
989 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
992 1076
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1081 close $fh;
998 1082
999 if (@$objs) { 1083 if (@$objs) {
1000 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1001 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1089 close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1091 }
1015 } 1099 }
1016 } else { 1100 } else {
1017 aio_unlink $filename; 1101 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1019 } 1103 }
1020 } 1104 };
1021} 1105}
1022 1106
1023sub object_freezer_as_string { 1107sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1025 1109
1037 or return; 1121 or return;
1038 1122
1039 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1125 or return;
1126
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1043 } 1129 }
1044 1130
1131 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1047 return ($data, $av); 1135 ($data, $av)
1048} 1136}
1049 1137
1050=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1051 1139
1052=over 4 1140=over 4
1125 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1126 1214
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1216
1129 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1135 } else { 1232 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1234 }
1138 1235
1139 cf::override; 1236 cf::override;
1229 1326
1230=head3 cf::player 1327=head3 cf::player
1231 1328
1232=over 4 1329=over 4
1233 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1234=item cf::player::find $login 1345=item cf::player::find $login
1235 1346
1236Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1237 1348
1238=cut 1349=cut
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1388
1278 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1281 } 1397 }
1282 } 1398 }
1283} 1399}
1284 1400
1294 1410
1295 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1297 1413
1298 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1299 Coro::cede; 1415 cf::cede_to_tick;
1300} 1416}
1301 1417
1302sub new($) { 1418sub new($) {
1303 my ($login) = @_; 1419 my ($login) = @_;
1304 1420
1308 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1309 1425
1310 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1311 1427
1312 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1313} 1439}
1314 1440
1315=item $pl->quit_character 1441=item $pl->quit_character
1316 1442
1317Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1498 or return [];
1373 1499
1374 my @logins; 1500 my @logins;
1375 1501
1376 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1380 1511
1381 utf8::decode $login; 1512 utf8::decode $login;
1382 push @logins, $login; 1513 push @logins, $login;
1383 } 1514 }
1384 1515
1422sub expand_cfpod { 1553sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1424 1555
1425 # escape & and < 1556 # escape & and <
1426 s/&/&amp;/g; 1557 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1428 1559
1429 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1430 1561
1431 1 while 1562 1 while
1432 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1568 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1439 }ge 1571 }ge
1440 # replace H<hint text> 1572 # replace H<hint text>
1461sub hintmode { 1593sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1595 $_[0]{hintmode}
1464} 1596}
1465 1597
1466=item $player->ext_reply ($msgid, %msg) 1598=item $player->ext_reply ($msgid, @msg)
1467 1599
1468Sends an ext reply to the player. 1600Sends an ext reply to the player.
1469 1601
1470=cut 1602=cut
1471 1603
1472sub ext_reply($$%) { 1604sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1605 my ($self, $id, @msg) = @_;
1474 1606
1475 $msg{msgid} = $id; 1607 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1608}
1478 1609
1479=item $player->ext_event ($type, %msg) 1610=item $player->ext_msg ($type, @msg)
1480 1611
1481Sends an ext event to the client. 1612Sends an ext event to the client.
1482 1613
1483=cut 1614=cut
1484 1615
1485sub ext_event($$%) { 1616sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1617 my ($self, $type, @msg) = @_;
1487 1618
1488 $self->ns->ext_event ($type, %msg); 1619 $self->ns->ext_msg ($type, @msg);
1489} 1620}
1490 1621
1491=head3 cf::region 1622=head3 cf::region
1492 1623
1493=over 4 1624=over 4
1709 1840
1710sub load_header_from($) { 1841sub load_header_from($) {
1711 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1712 1843
1713 utf8::encode $path; 1844 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1719 1853
1720 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1721 1855
1722 1 1856 1
1723} 1857}
1777sub find { 1911sub find {
1778 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1779 1913
1780 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1781 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1783 1918
1784 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1786 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1787 or return; 1924 or return;
1788 1925
1789 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1790 1927
1792 or return; 1929 or return;
1793 1930
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1797 $map->reset; 1936 $map->reset;
1798 undef $guard;
1799 return find $path; 1937 return find $path;
1800 } 1938 }
1801 1939
1802 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1803 } 1941 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1813 1951
1814 my $path = $self->{path}; 1952 my $path = $self->{path};
1815 1953
1816 { 1954 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1818 1956
1957 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 1959
1821 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1822 1961
1823 $self->alloc; 1962 $self->alloc;
1824 1963
1825 $self->pre_load; 1964 $self->pre_load;
1826 Coro::cede; 1965 cf::cede_to_tick;
1827 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1829 or return; 1970 or return;
1830 1971
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1833 1974
1834 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 1976 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 1979 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1839 } 1983 }
1840 } 1984 }
1841 1985
1842 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1843 # now do the right thing for maps 1989 # now do the right thing for maps
1844 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1992 unless $self->difficulty;
1847 Coro::cede; 1993 cf::cede_to_tick;
1848 1994
1849 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1996 $self->decay_objects;
1851 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1852 $self->update_buttons; 1998 $self->update_buttons;
1853 Coro::cede; 1999 cf::cede_to_tick;
1854 $self->set_darkness_map; 2000 $self->set_darkness_map;
1855 Coro::cede; 2001 cf::cede_to_tick;
1856 $self->activate; 2002 $self->activate;
1857 } 2003 }
2004
2005 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME);
1858 2007
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2008 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 2009 }
1861 2010
1862 $self->post_load; 2011 $self->post_load;
1873 2022
1874 $self 2023 $self
1875} 2024}
1876 2025
1877# find and load all maps in the 3x3 area around a map 2026# find and load all maps in the 3x3 area around a map
1878sub load_diag { 2027sub load_neighbours {
1879 my ($map) = @_; 2028 my ($map) = @_;
1880 2029
1881 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1882 2031
1883 for (0 .. 3) { 2032 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1885 or next; 2034 or next;
1886 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1887 or next; 2036 or next;
1888 $neigh->load; 2037 $neigh->load;
1889 2038
2039 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2042 }
1893 2043
1894 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1896 or next; 2047 or next;
1897 $neigh->load; 2048 $neigh->load;
1898 } 2049 }
1899} 2050}
1900 2051
1905} 2056}
1906 2057
1907sub do_load_sync { 2058sub do_load_sync {
1908 my ($map) = @_; 2059 my ($map) = @_;
1909 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1910 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1911} 2065}
1912 2066
1913our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1915 2069
1916sub find_async { 2070sub find_async {
1917 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1918 2072
1919 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1920 2074
1921 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2077 }
1924 2078
1925 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1926 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1927 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2086 if (my $map = find $k) {
1930 $map->load; 2087 $map->load if $v;
1931 } 2088 }
1932 2089
1933 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1934 } 2091 }
1935 } 2092 }
1936 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1937 }; 2094 };
1938 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
1941} 2098}
1942 2099
1943sub save { 2100sub save {
1944 my ($self) = @_; 2101 my ($self) = @_;
1945 2102
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2104
1948 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1949 2106
1950 return unless $self->dirty; 2107 return unless $self->dirty;
1951 2108
1957 return if $self->{deny_save}; 2114 return if $self->{deny_save};
1958 2115
1959 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
1960 2117
1961 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
1963 }; 2121 };
1964 2122
1965 if ($uniq) { 2123 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1974 my ($self) = @_; 2132 my ($self) = @_;
1975 2133
1976 # save first because save cedes 2134 # save first because save cedes
1977 $self->save; 2135 $self->save;
1978 2136
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2138
1981 return if $self->players; 2139 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2141 return if $self->{deny_save};
1984 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2147 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2148}
1988 2149
1989sub reset_at { 2150sub reset_at {
1990 my ($self) = @_; 2151 my ($self) = @_;
1991 2152
2023 if $uniq; 2184 if $uniq;
2024 } 2185 }
2025 2186
2026 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2027 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2191 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2192
2032 $self->unlink_save; 2193 $self->unlink_save;
2033 $self->destroy; 2194 $self->destroy;
2034} 2195}
2035 2196
2036my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
2037 2198
2038sub nuke { 2199sub nuke {
2039 my ($self) = @_; 2200 my ($self) = @_;
2040 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2041 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2042 2206
2043 $self->unlink_save; 2207 $self->unlink_save;
2044 2208
2045 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2214
2051 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2052 2217
2053 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2054} 2219}
2055 2220
2056=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
2132 2297
2133sub inv_recursive { 2298sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2135} 2300}
2136 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2137package cf; 2330package cf;
2138 2331
2139=back 2332=back
2140 2333
2141=head3 cf::object::player 2334=head3 cf::object::player
2163 2356
2164 } else { 2357 } else {
2165 my $pl = $self->contr; 2358 my $pl = $self->contr;
2166 2359
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2360 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2361 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2363
2176 } else { 2364 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2365 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2366 $self->message ($msg, $flags);
2179 } 2367 }
2180 } 2368 }
2369}
2370
2371=item $object->send_msg ($channel, $msg, $color, [extra...])
2372
2373=cut
2374
2375sub cf::object::send_msg {
2376 my $pl = shift->contr
2377 or return;
2378 $pl->send_msg (@_);
2181} 2379}
2182 2380
2183=item $player_object->may ("access") 2381=item $player_object->may ("access")
2184 2382
2185Returns wether the given player is authorized to access resource "access" 2383Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
2267 2465
2268 $map->load; 2466 $map->load;
2269 $map->load_diag; 2467 $map->load_neighbours;
2270 2468
2271 return unless $self->contr->active; 2469 return unless $self->contr->active;
2272 $self->activate_recursive; 2470 $self->activate_recursive;
2273 2471
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2493
2296 $self->enter_link; 2494 $self->enter_link;
2297 2495
2298 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2299 my $map = eval { 2518 my $map = eval {
2300 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2301 2520
2302 if ($map) { 2521 if ($map) {
2303 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2305 } else { 2524 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2526 }
2308 2527
2309 $map 2528 $map
2310 }; 2529 };
2311 2530
2401 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2404 2623
2405 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2406 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2628 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2409 2630
2410 1; 2631 1;
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2666the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2447 2668
2448=cut 2669=cut
2449 2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/lookat" => {
2685 id => "infobox",
2686 title => "Look",
2687 reply => undef,
2688 tooltip => "What you saw there",
2689 },
2690);
2691
2450sub cf::client::send_msg { 2692sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2693 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2694
2453 $msg = $self->pl->expand_cfpod ($msg); 2695 $msg = $self->pl->expand_cfpod ($msg);
2454 2696
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2697 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2698
2699 # check predefined channels, for the benefit of C
2700 if ($CHANNEL{$channel}) {
2701 $channel = $CHANNEL{$channel};
2702
2703 $self->ext_msg (channel_info => $channel)
2704 if $self->can_msg;
2705
2706 $channel = $channel->{id};
2707
2457 if (ref $channel) { 2708 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2709 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2710 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2711 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2712 $self->ext_msg (channel_info => $channel)
2713 if $self->can_msg;
2462 } 2714 }
2463 2715
2464 $channel = $channel->{id}; 2716 $channel = $channel->{id};
2465 } 2717 }
2466 2718
2467 return unless @extra || length $msg; 2719 return unless @extra || length $msg;
2468 2720
2469 if ($self->can_msg) { 2721 if ($self->can_msg) {
2722 # default colour, mask it out
2723 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2724 if $color & cf::NDI_DEF;
2725
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2726 $self->send_packet ("msg " . $self->{json_coder}->encode (
2727 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2728 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2729 if ($color >= 0) {
2730 # replace some tags by gcfclient-compatible ones
2731 for ($msg) {
2732 1 while
2733 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2734 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2735 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2736 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2737 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2738 }
2739
2740 $color &= cf::NDI_COLOR_MASK;
2741
2742 utf8::encode $msg;
2743
2483 if (0 && $msg =~ /\[/) { 2744 if (0 && $msg =~ /\[/) {
2745 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2746 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2747 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2748 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2749 $self->send_packet ("drawinfo $color $msg")
2488 } 2750 }
2489 } 2751 }
2490 } 2752 }
2491} 2753}
2492 2754
2493=item $client->ext_event ($type, %msg) 2755=item $client->ext_msg ($type, @msg)
2494 2756
2495Sends an ext event to the client. 2757Sends an ext event to the client.
2496 2758
2497=cut 2759=cut
2498 2760
2499sub cf::client::ext_event($$%) { 2761sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2762 my ($self, $type, @msg) = @_;
2501 2763
2502 return unless $self->extcmd; 2764 if ($self->extcmd == 2) {
2503 2765 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2766 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2767 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2768 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2769 }
2770}
2771
2772=item $client->ext_reply ($msgid, @msg)
2773
2774Sends an ext reply to the client.
2775
2776=cut
2777
2778sub cf::client::ext_reply($$@) {
2779 my ($self, $id, @msg) = @_;
2780
2781 if ($self->extcmd == 2) {
2782 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2783 } elsif ($self->extcmd == 1) {
2784 #TODO: version 1, remove
2785 unshift @msg, msgtype => "reply", msgid => $id;
2786 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2787 }
2506} 2788}
2507 2789
2508=item $success = $client->query ($flags, "text", \&cb) 2790=item $success = $client->query ($flags, "text", \&cb)
2509 2791
2510Queues a query to the client, calling the given callback with 2792Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2847 my ($ns, $buf) = @_;
2566 2848
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2849 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2850
2569 if (ref $msg) { 2851 if (ref $msg) {
2852 my ($type, $reply, @payload) =
2853 "ARRAY" eq ref $msg
2854 ? @$msg
2855 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2856
2857 my @reply;
2858
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2859 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2860 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2861 }
2862
2863 $ns->ext_reply ($reply, @reply)
2864 if $reply;
2865
2576 } else { 2866 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2867 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2868 }
2579 2869
2580 cf::override; 2870 cf::override;
2627our $safe = new Safe "safe"; 2917our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2918our $safe_hole = new Safe::Hole;
2629 2919
2630$SIG{FPE} = 'IGNORE'; 2920$SIG{FPE} = 'IGNORE';
2631 2921
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2922$safe->permit_only (Opcode::opset qw(
2923 :base_core :base_mem :base_orig :base_math
2924 grepstart grepwhile mapstart mapwhile
2925 sort time
2926));
2633 2927
2634# here we export the classes and methods available to script code 2928# here we export the classes and methods available to script code
2635 2929
2636=pod 2930=pod
2637 2931
2638The following functions and methods are available within a safe environment: 2932The following functions and methods are available within a safe environment:
2639 2933
2640 cf::object 2934 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2935 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 2936 insert remove name archname title slaying race decrease_ob_nr
2643 2937
2644 cf::object::player 2938 cf::object::player
2645 player 2939 player
2646 2940
2647 cf::player 2941 cf::player
2652 2946
2653=cut 2947=cut
2654 2948
2655for ( 2949for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2950 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2951 insert remove inv name archname title slaying race
2657 insert remove)], 2952 decrease_ob_nr destroy)],
2658 ["cf::object::player" => qw(player)], 2953 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2954 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2955 ["cf::map" => qw(trigger)],
2661) { 2956) {
2662 no strict 'refs'; 2957 no strict 'refs';
2738# the server's init and main functions 3033# the server's init and main functions
2739 3034
2740sub load_facedata($) { 3035sub load_facedata($) {
2741 my ($path) = @_; 3036 my ($path) = @_;
2742 3037
3038 # HACK to clear player env face cache, we need some signal framework
3039 # for this (global event?)
3040 %ext::player_env::MUSIC_FACE_CACHE = ();
3041
3042 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3043
2743 warn "loading facedata from $path\n"; 3044 warn "loading facedata from $path\n";
2744 3045
2745 my $facedata; 3046 my $facedata;
2746 0 < aio_load $path, $facedata 3047 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3048 or die "$path: $!";
2748 3049
2749 $facedata = Coro::Storable::thaw $facedata; 3050 $facedata = Coro::Storable::thaw $facedata;
2750 3051
2751 $facedata->{version} == 2 3052 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3053 or cf::cleanup "$path: version mismatch, cannot proceed.";
3054
3055 # patch in the exptable
3056 $facedata->{resource}{"res/exp_table"} = {
3057 type => FT_RSRC,
3058 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3059 };
3060 cf::cede_to_tick;
2753 3061
2754 { 3062 {
2755 my $faces = $facedata->{faceinfo}; 3063 my $faces = $facedata->{faceinfo};
2756 3064
2757 while (my ($face, $info) = each %$faces) { 3065 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3066 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 3067 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3068 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3071
2764 cf::cede_to_tick; 3072 cf::cede_to_tick;
2765 } 3073 }
2766 3074
2767 while (my ($face, $info) = each %$faces) { 3075 while (my ($face, $info) = each %$faces) {
2792 3100
2793 { 3101 {
2794 # TODO: for gcfclient pleasure, we should give resources 3102 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3103 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3104 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3105
3106 my $soundconf = delete $res->{"res/sound.conf"};
2798 3107
2799 while (my ($name, $info) = each %$res) { 3108 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3109 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data;
2807 3111
2808 if ($name =~ /\.jpg$/) { 3112 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3113 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3114
3115 my $meta = $enc->encode ({
3116 name => $name,
3117 %{ $info->{meta} || {} },
3118 });
3119
3120 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3121 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3122 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3123 }
2818 3124
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126 cf::face::set_type $idx, $info->{type};
3127
2819 cf::cede_to_tick; 3128 cf::cede_to_tick;
2820 } 3129 }
3130
3131 if ($soundconf) {
3132 $soundconf = $enc->decode (delete $soundconf->{data});
3133
3134 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135 my $sound = $soundconf->{compat}[$_]
3136 or next;
3137
3138 my $face = cf::face::find "sound/$sound->[1]";
3139 cf::sound::set $sound->[0] => $face;
3140 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3141 }
3142
3143 while (my ($k, $v) = each %{$soundconf->{event}}) {
3144 my $face = cf::face::find "sound/$v";
3145 cf::sound::set $k => $face;
3146 }
3147 }
2821 } 3148 }
2822 3149
2823 1 3150 1
2824} 3151}
2825 3152
3153register_exticmd fx_want => sub {
3154 my ($ns, $want) = @_;
3155
3156 while (my ($k, $v) = each %$want) {
3157 $ns->fx_want ($k, $v);
3158 }
3159};
3160
2826sub reload_regions { 3161sub reload_regions {
3162 # HACK to clear player env face cache, we need some signal framework
3163 # for this (global event?)
3164 %ext::player_env::MUSIC_FACE_CACHE = ();
3165
2827 load_resource_file "$MAPDIR/regions" 3166 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3167 or die "unable to load regions file\n";
2829 3168
2830 for (cf::region::list) { 3169 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3170 $_->{match} = qr/$_->{match}/
2867 3206
2868sub init { 3207sub init {
2869 reload_resources; 3208 reload_resources;
2870} 3209}
2871 3210
2872sub cfg_load { 3211sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3212 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3213 or return;
2875 3214
2876 local $/; 3215 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3216 *CFG = YAML::Syck::Load <$fh>;
2893sub main { 3232sub main {
2894 # we must not ever block the main coroutine 3233 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3234 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3236 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER";
2898 Event::one_event; 3238 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3239 })->prio (Coro::PRIO_MAX);
2900 }; 3240 };
2901 3241
2902 cfg_load; 3242 reload_config;
2903 db_init; 3243 db_init;
2904 load_extensions; 3244 load_extensions;
2905 3245
2906 $TICK_WATCHER->start; 3246 $TICK_WATCHER->start;
2907 Event::loop; 3247 Event::loop;
2974 # and maps saved/destroyed asynchronously. 3314 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3315 warn "begin emergency player save\n";
2976 for my $login (keys %cf::PLAYER) { 3316 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3317 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3318 $pl->valid or next;
3319 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3320 $pl->save;
2980 } 3321 }
2981 warn "end emergency player save\n"; 3322 warn "end emergency player save\n";
2982 3323
2983 warn "begin emergency map save\n"; 3324 warn "begin emergency map save\n";
3031 3372
3032 warn "flushing outstanding aio requests"; 3373 warn "flushing outstanding aio requests";
3033 for (;;) { 3374 for (;;) {
3034 BDB::flush; 3375 BDB::flush;
3035 IO::AIO::flush; 3376 IO::AIO::flush;
3036 Coro::cede; 3377 Coro::cede_notself;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3378 last unless IO::AIO::nreqs || BDB::nreqs;
3038 warn "iterate..."; 3379 warn "iterate...";
3039 } 3380 }
3040 3381
3041 ++$RELOAD; 3382 ++$RELOAD;
3100 warn "reloading cf.pm"; 3441 warn "reloading cf.pm";
3101 require cf; 3442 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3443 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3444
3104 warn "loading config and database again"; 3445 warn "loading config and database again";
3105 cf::cfg_load; 3446 cf::reload_config;
3106 3447
3107 warn "loading extensions"; 3448 warn "loading extensions";
3108 cf::load_extensions; 3449 cf::load_extensions;
3109 3450
3110 warn "reattaching attachments to objects/players"; 3451 warn "reattaching attachments to objects/players";
3146register_command "reload" => sub { 3487register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3488 my ($who, $arg) = @_;
3148 3489
3149 if ($who->flag (FLAG_WIZ)) { 3490 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3491 $who->message ("reloading server.");
3492 async {
3493 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3494 reload_perl;
3495 };
3152 } 3496 }
3153}; 3497};
3154 3498
3155unshift @INC, $LIBDIR; 3499unshift @INC, $LIBDIR;
3156 3500
3175 my $signal = new Coro::Signal; 3519 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3520 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3521 $signal->wait;
3178} 3522}
3179 3523
3180 my $min = 1e6;#d#
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer ( 3524$TICK_WATCHER = Event->timer (
3183 reentrant => 0, 3525 reentrant => 0,
3184 parked => 1, 3526 parked => 1,
3185 prio => 0, 3527 prio => 0,
3186 at => $NEXT_TICK || $TICK, 3528 at => $NEXT_TICK || $TICK,
3194 3536
3195 $NOW = $tick_start = Event::time; 3537 $NOW = $tick_start = Event::time;
3196 3538
3197 cf::server_tick; # one server iteration 3539 cf::server_tick; # one server iteration
3198 3540
3199 0 && sync_job {#d#
3200 for(1..10) {
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 };
3221
3222 $RUNTIME += $TICK; 3541 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK; 3542 $NEXT_TICK += $TICK;
3224 3543
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3544 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10; 3545 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool { 3546 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver";
3228 write_runtime 3548 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!"; 3549 or warn "ERROR: unable to write runtime file: $!";
3230 }; 3550 };
3231 } 3551 }
3232 3552
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3554 $sig->send;
3238 } 3555 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3556 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3557 $sig->send;
3250 3567
3251 $LOAD = ($NOW - $tick_start) / $TICK; 3568 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3570
3254 _post_tick; 3571 _post_tick;
3255
3256
3257 }, 3572 },
3258); 3573);
3259 3574
3260{ 3575{
3576 BDB::min_parallel 8;
3261 BDB::max_poll_time $TICK * 0.1; 3577 BDB::max_poll_time $TICK * 0.1;
3262 $BDB_POLL_WATCHER = Event->io ( 3578 $BDB_POLL_WATCHER = Event->io (
3263 reentrant => 0, 3579 reentrant => 0,
3264 fd => BDB::poll_fileno, 3580 fd => BDB::poll_fileno,
3265 poll => 'r', 3581 poll => 'r',
3266 prio => 0, 3582 prio => 0,
3267 data => WF_AUTOCANCEL, 3583 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb, 3584 cb => \&BDB::poll_cb,
3269 ); 3585 );
3270 BDB::min_parallel 8;
3271 3586
3272 BDB::set_sync_prepare { 3587 BDB::set_sync_prepare {
3273 my $status; 3588 my $status;
3274 my $current = $Coro::current; 3589 my $current = $Coro::current;
3275 ( 3590 (
3284 ) 3599 )
3285 }; 3600 };
3286 3601
3287 unless ($DB_ENV) { 3602 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3603 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3605 | BDB::LOG_AUTOREMOVE, 1);
3606 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3607 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3608
3290 cf::sync_job { 3609 cf::sync_job {
3291 eval { 3610 eval {
3292 BDB::db_env_open 3611 BDB::db_env_open
3293 $DB_ENV, 3612 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3614 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3615 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3616 0666;
3298 3617
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3618 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3619 };
3304 3620
3305 cf::cleanup "db_env_open(db): $@" if $@; 3621 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3622 };
3307 } 3623 }
3624
3625 $BDB_DEADLOCK_WATCHER = Event->timer (
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 );
3635 $BDB_CHECKPOINT_WATCHER = Event->timer (
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 );
3645 $BDB_TRICKLE_WATCHER = Event->timer (
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 );
3308} 3655}
3309 3656
3310{ 3657{
3311 IO::AIO::min_parallel 8; 3658 IO::AIO::min_parallel 8;
3312 3659
3315 $AIO_POLL_WATCHER = Event->io ( 3662 $AIO_POLL_WATCHER = Event->io (
3316 reentrant => 0, 3663 reentrant => 0,
3317 data => WF_AUTOCANCEL, 3664 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno, 3665 fd => IO::AIO::poll_fileno,
3319 poll => 'r', 3666 poll => 'r',
3320 prio => 6, 3667 prio => 0,
3321 cb => \&IO::AIO::poll_cb, 3668 cb => \&IO::AIO::poll_cb,
3322 ); 3669 );
3323} 3670}
3324 3671
3325my $_log_backtrace; 3672my $_log_backtrace;
3331 3678
3332 # limit the # of concurrent backtraces 3679 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3680 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3681 ++$_log_backtrace;
3335 async { 3682 async {
3683 $Coro::current->{desc} = "abt $msg";
3684
3336 my @bt = fork_call { 3685 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3686 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3687 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3688 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3689 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines