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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines