ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
327=item cf::get_slot $time[, $priority] 341=item cf::get_slot $time[, $priority[, $name]]
328 342
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 343Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 344This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 345of cpu time till the next tick. The slot is only valid till the next cede.
332 346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
333Useful for short background jobs. 350Useful for short background jobs.
334 351
335=cut 352=cut
336 353
337our @SLOT_QUEUE; 354our @SLOT_QUEUE;
338our $SLOT_QUEUE; 355our $SLOT_QUEUE;
339 356
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
342 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
343 362
344 while () { 363 while () {
345 next_job: 364 next_job:
346 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
354 } 373 }
355 } 374 }
356 } 375 }
357 376
358 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
359 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
360 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 380 $signal->wait;
362 } else { 381 } else {
363 Coro::schedule; 382 Coro::schedule;
364 } 383 }
365 } 384 }
366}; 385};
367 386
368sub get_slot($;$) { 387sub get_slot($;$$) {
369 my ($time, $pri) = @_; 388 my ($time, $pri, $name) = @_;
370 389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 395 $SLOT_QUEUE->ready;
374 $sig->wait; 396 $sig->wait;
375} 397}
376 398
405 my $time = Event::time; 427 my $time = Event::time;
406 428
407 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
409 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
410 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
411 # (but this is cancel-safe) 435 # (but this is cancel-safe)
412 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
413 437
414 my $busy = 1; 438 my $busy = 1;
415 my @res; 439 my @res;
416 440
417 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 443 @res = eval { $job->() };
419 warn $@ if $@; 444 warn $@ if $@;
420 undef $busy; 445 undef $busy;
421 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
422 447
423 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
424 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
425 } 454 }
426 455
427 $time = Event::time - $time; 456 $time = Event::time - $time;
428 457
429 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
466Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
468 497
469=cut 498=cut
470 499
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 500sub fork_call(&@) {
481 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
482 502
483# 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,
484# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 506
488 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 508 reset_signals;
502 local $SIG{__WARN__}; 509 &$cb
503 local $SIG{__DIE__}; 510 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 511
510 eval { 512 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 513}
523 514
524=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
525 516
526Returns a single value from the environment database. 517Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
529 520
530Stores 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
531data 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).
532 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
533=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}
534 547
535our $DB; 548our $DB;
536 549
537sub db_init { 550sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 551 cf::sync_job {
542 eval { 552 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 553 };
552} 554}
553 555
554sub db_get($$) { 556sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
556 558
606 if (1) { 608 if (1) {
607 $md5 = 609 $md5 =
608 join "\x00", 610 join "\x00",
609 $processversion, 611 $processversion,
610 map { 612 map {
611 Coro::cede; 613 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 615 } 0.. $#$src;
614 616
615 617
616 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
968 970
969=cut 971=cut
970 972
971############################################################################# 973#############################################################################
972# object support 974# object support
973#
974 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#
975sub _can_merge { 1009sub _can_merge {
976 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
977 1011
978 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1013
982 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
983} 1016}
984 1017
985sub reattach { 1018sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1020 my ($obj) = @_;
1035sub object_freezer_save { 1068sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1037 1070
1038 sync_job { 1071 sync_job {
1039 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1042 1076
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1081 close $fh;
1048 1082
1049 if (@$objs) { 1083 if (@$objs) {
1050 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) {
1051 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1089 close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1091 }
1065 } 1099 }
1066 } else { 1100 } else {
1067 aio_unlink $filename; 1101 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1069 } 1103 }
1070 } 1104 };
1071} 1105}
1072 1106
1073sub object_freezer_as_string { 1107sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1075 1109
1087 or return; 1121 or return;
1088 1122
1089 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1125 or return;
1126
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1093 } 1129 }
1094 1130
1131 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1097 return ($data, $av); 1135 ($data, $av)
1098} 1136}
1099 1137
1100=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1101 1139
1102=over 4 1140=over 4
1175 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1176 1214
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1216
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1185 } else { 1232 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1234 }
1188 1235
1189 cf::override; 1236 cf::override;
1279 1326
1280=head3 cf::player 1327=head3 cf::player
1281 1328
1282=over 4 1329=over 4
1283 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
1284=item cf::player::find $login 1345=item cf::player::find $login
1285 1346
1286Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1287 1348
1288=cut 1349=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1388
1328 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1331 } 1397 }
1332 } 1398 }
1333} 1399}
1334 1400
1344 1410
1345 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1347 1413
1348 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1349 Coro::cede; 1415 cf::cede_to_tick;
1350} 1416}
1351 1417
1352sub new($) { 1418sub new($) {
1353 my ($login) = @_; 1419 my ($login) = @_;
1354 1420
1358 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1359 1425
1360 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1361 1427
1362 $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 (@_);
1363} 1439}
1364 1440
1365=item $pl->quit_character 1441=item $pl->quit_character
1366 1442
1367Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1498 or return [];
1423 1499
1424 my @logins; 1500 my @logins;
1425 1501
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1430 1511
1431 utf8::decode $login; 1512 utf8::decode $login;
1432 push @logins, $login; 1513 push @logins, $login;
1433 } 1514 }
1434 1515
1472sub expand_cfpod { 1553sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1474 1555
1475 # escape & and < 1556 # escape & and <
1476 s/&/&amp;/g; 1557 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1478 1559
1479 # 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
1480 1561
1481 1 while 1562 1 while
1482 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1568 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1489 }ge 1571 }ge
1490 # replace H<hint text> 1572 # replace H<hint text>
1511sub hintmode { 1593sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1595 $_[0]{hintmode}
1514} 1596}
1515 1597
1516=item $player->ext_reply ($msgid, %msg) 1598=item $player->ext_reply ($msgid, @msg)
1517 1599
1518Sends an ext reply to the player. 1600Sends an ext reply to the player.
1519 1601
1520=cut 1602=cut
1521 1603
1522sub ext_reply($$%) { 1604sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1605 my ($self, $id, @msg) = @_;
1524 1606
1525 $msg{msgid} = $id; 1607 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1608}
1528 1609
1529=item $player->ext_event ($type, %msg) 1610=item $player->ext_msg ($type, @msg)
1530 1611
1531Sends an ext event to the client. 1612Sends an ext event to the client.
1532 1613
1533=cut 1614=cut
1534 1615
1535sub ext_event($$%) { 1616sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1617 my ($self, $type, @msg) = @_;
1537 1618
1538 $self->ns->ext_event ($type, %msg); 1619 $self->ns->ext_msg ($type, @msg);
1539} 1620}
1540 1621
1541=head3 cf::region 1622=head3 cf::region
1542 1623
1543=over 4 1624=over 4
1759 1840
1760sub load_header_from($) { 1841sub load_header_from($) {
1761 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1762 1843
1763 utf8::encode $path; 1844 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 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;
1769 1853
1770 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1771 1855
1772 1 1856 1
1773} 1857}
1827sub find { 1911sub find {
1828 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1829 1913
1830 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1831 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1833 1918
1834 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1835 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
1836 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1837 or return; 1924 or return;
1838 1925
1839 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1840 1927
1842 or return; 1929 or return;
1843 1930
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1847 $map->reset; 1936 $map->reset;
1848 undef $guard;
1849 return find $path; 1937 return find $path;
1850 } 1938 }
1851 1939
1852 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1853 } 1941 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1863 1951
1864 my $path = $self->{path}; 1952 my $path = $self->{path};
1865 1953
1866 { 1954 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1868 1956
1957 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1959
1871 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1872 1961
1873 $self->alloc; 1962 $self->alloc;
1874 1963
1875 $self->pre_load; 1964 $self->pre_load;
1876 Coro::cede; 1965 cf::cede_to_tick;
1877 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1879 or return; 1970 or return;
1880 1971
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1883 1974
1884 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1976 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1979 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1889 } 1983 }
1890 } 1984 }
1891 1985
1892 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1893 # now do the right thing for maps 1989 # now do the right thing for maps
1894 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1992 unless $self->difficulty;
1897 Coro::cede; 1993 cf::cede_to_tick;
1898 1994
1899 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1996 $self->decay_objects;
1901 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1902 $self->update_buttons; 1998 $self->update_buttons;
1903 Coro::cede; 1999 cf::cede_to_tick;
1904 $self->set_darkness_map; 2000 $self->set_darkness_map;
1905 Coro::cede; 2001 cf::cede_to_tick;
1906 $self->activate; 2002 $self->activate;
1907 } 2003 }
2004
2005 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME);
1908 2007
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2008 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 2009 }
1911 2010
1912 $self->post_load; 2011 $self->post_load;
1923 2022
1924 $self 2023 $self
1925} 2024}
1926 2025
1927# 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
1928sub load_diag { 2027sub load_neighbours {
1929 my ($map) = @_; 2028 my ($map) = @_;
1930 2029
1931 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1932 2031
1933 for (0 .. 3) { 2032 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1935 or next; 2034 or next;
1936 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1937 or next; 2036 or next;
1938 $neigh->load; 2037 $neigh->load;
1939 2038
2039 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2042 }
1943 2043
1944 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1946 or next; 2047 or next;
1947 $neigh->load; 2048 $neigh->load;
1948 } 2049 }
1949} 2050}
1950 2051
1955} 2056}
1956 2057
1957sub do_load_sync { 2058sub do_load_sync {
1958 my ($map) = @_; 2059 my ($map) = @_;
1959 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1960 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1961} 2065}
1962 2066
1963our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1965 2069
1966sub find_async { 2070sub find_async {
1967 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1968 2072
1969 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1970 2074
1971 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2077 }
1974 2078
1975 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1976 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1977 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2086 if (my $map = find $k) {
1980 $map->load; 2087 $map->load if $v;
1981 } 2088 }
1982 2089
1983 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1984 } 2091 }
1985 } 2092 }
1986 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1987 }; 2094 };
1988 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
1991} 2098}
1992 2099
1993sub save { 2100sub save {
1994 my ($self) = @_; 2101 my ($self) = @_;
1995 2102
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2104
1998 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1999 2106
2000 return unless $self->dirty; 2107 return unless $self->dirty;
2001 2108
2007 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2008 2115
2009 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2010 2117
2011 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2013 }; 2121 };
2014 2122
2015 if ($uniq) { 2123 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2132 my ($self) = @_;
2025 2133
2026 # save first because save cedes 2134 # save first because save cedes
2027 $self->save; 2135 $self->save;
2028 2136
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2138
2031 return if $self->players; 2139 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2141 return if $self->{deny_save};
2034 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2147 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2148}
2038 2149
2039sub reset_at { 2150sub reset_at {
2040 my ($self) = @_; 2151 my ($self) = @_;
2041 2152
2073 if $uniq; 2184 if $uniq;
2074 } 2185 }
2075 2186
2076 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2077 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2191 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2192
2082 $self->unlink_save; 2193 $self->unlink_save;
2083 $self->destroy; 2194 $self->destroy;
2084} 2195}
2085 2196
2086my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
2087 2198
2088sub nuke { 2199sub nuke {
2089 my ($self) = @_; 2200 my ($self) = @_;
2090 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2091 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2092 2206
2093 $self->unlink_save; 2207 $self->unlink_save;
2094 2208
2095 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2214
2101 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2102 2217
2103 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2104} 2219}
2105 2220
2106=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
2182 2297
2183sub inv_recursive { 2298sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2185} 2300}
2186 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
2187package cf; 2330package cf;
2188 2331
2189=back 2332=back
2190 2333
2191=head3 cf::object::player 2334=head3 cf::object::player
2213 2356
2214 } else { 2357 } else {
2215 my $pl = $self->contr; 2358 my $pl = $self->contr;
2216 2359
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2360 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2361 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2363
2226 } else { 2364 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2365 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2366 $self->message ($msg, $flags);
2229 } 2367 }
2230 } 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 (@_);
2231} 2379}
2232 2380
2233=item $player_object->may ("access") 2381=item $player_object->may ("access")
2234 2382
2235Returns wether the given player is authorized to access resource "access" 2383Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
2317 2465
2318 $map->load; 2466 $map->load;
2319 $map->load_diag; 2467 $map->load_neighbours;
2320 2468
2321 return unless $self->contr->active; 2469 return unless $self->contr->active;
2322 $self->activate_recursive; 2470 $self->activate_recursive;
2323 2471
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2493
2346 $self->enter_link; 2494 $self->enter_link;
2347 2495
2348 (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
2349 my $map = eval { 2518 my $map = eval {
2350 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2351 2520
2352 if ($map) { 2521 if ($map) {
2353 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2355 } else { 2524 } else {
2356 $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);
2357 } 2526 }
2358 2527
2359 $map 2528 $map
2360 }; 2529 };
2361 2530
2451 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2454 2623
2455 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2456 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2628 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2459 2630
2460 1; 2631 1;
2495the 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
2496the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2497 2668
2498=cut 2669=cut
2499 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/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2696);
2697
2500sub cf::client::send_msg { 2698sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2699 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2700
2503 $msg = $self->pl->expand_cfpod ($msg); 2701 $msg = $self->pl->expand_cfpod ($msg);
2504 2702
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2704
2705 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2507 if (ref $channel) { 2714 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2715 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2716 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2717 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2718 $self->ext_msg (channel_info => $channel)
2719 if $self->can_msg;
2512 } 2720 }
2513 2721
2514 $channel = $channel->{id}; 2722 $channel = $channel->{id};
2515 } 2723 }
2516 2724
2517 return unless @extra || length $msg; 2725 return unless @extra || length $msg;
2518 2726
2519 if ($self->can_msg) { 2727 if ($self->can_msg) {
2728 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF;
2731
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2732 $self->send_packet ("msg " . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2734 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745
2746 $color &= cf::NDI_COLOR_MASK;
2747
2748 utf8::encode $msg;
2749
2533 if (0 && $msg =~ /\[/) { 2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2753 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2755 $self->send_packet ("drawinfo $color $msg")
2538 } 2756 }
2539 } 2757 }
2540 } 2758 }
2541} 2759}
2542 2760
2543=item $client->ext_event ($type, %msg) 2761=item $client->ext_msg ($type, @msg)
2544 2762
2545Sends an ext event to the client. 2763Sends an ext event to the client.
2546 2764
2547=cut 2765=cut
2548 2766
2549sub cf::client::ext_event($$%) { 2767sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2768 my ($self, $type, @msg) = @_;
2551 2769
2552 return unless $self->extcmd; 2770 if ($self->extcmd == 2) {
2553 2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2773 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 }
2776}
2777
2778=item $client->ext_reply ($msgid, @msg)
2779
2780Sends an ext reply to the client.
2781
2782=cut
2783
2784sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_;
2786
2787 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 }
2556} 2794}
2557 2795
2558=item $success = $client->query ($flags, "text", \&cb) 2796=item $success = $client->query ($flags, "text", \&cb)
2559 2797
2560Queues a query to the client, calling the given callback with 2798Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2853 my ($ns, $buf) = @_;
2616 2854
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2855 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2856
2619 if (ref $msg) { 2857 if (ref $msg) {
2858 my ($type, $reply, @payload) =
2859 "ARRAY" eq ref $msg
2860 ? @$msg
2861 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2862
2863 my @reply;
2864
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2865 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2866 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2867 }
2868
2869 $ns->ext_reply ($reply, @reply)
2870 if $reply;
2871
2626 } else { 2872 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2874 }
2629 2875
2630 cf::override; 2876 cf::override;
2677our $safe = new Safe "safe"; 2923our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2924our $safe_hole = new Safe::Hole;
2679 2925
2680$SIG{FPE} = 'IGNORE'; 2926$SIG{FPE} = 'IGNORE';
2681 2927
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2928$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math
2930 grepstart grepwhile mapstart mapwhile
2931 sort time
2932));
2683 2933
2684# here we export the classes and methods available to script code 2934# here we export the classes and methods available to script code
2685 2935
2686=pod 2936=pod
2687 2937
2688The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2689 2939
2690 cf::object 2940 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2941 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 2942 insert remove name archname title slaying race decrease_ob_nr
2693 2943
2694 cf::object::player 2944 cf::object::player
2695 player 2945 player
2696 2946
2697 cf::player 2947 cf::player
2702 2952
2703=cut 2953=cut
2704 2954
2705for ( 2955for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race
2707 insert remove)], 2958 decrease_ob_nr destroy)],
2708 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2711) { 2962) {
2712 no strict 'refs'; 2963 no strict 'refs';
2788# the server's init and main functions 3039# the server's init and main functions
2789 3040
2790sub load_facedata($) { 3041sub load_facedata($) {
2791 my ($path) = @_; 3042 my ($path) = @_;
2792 3043
3044 # HACK to clear player env face cache, we need some signal framework
3045 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = ();
3047
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049
2793 warn "loading facedata from $path\n"; 3050 warn "loading facedata from $path\n";
2794 3051
2795 my $facedata; 3052 my $facedata;
2796 0 < aio_load $path, $facedata 3053 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3054 or die "$path: $!";
2798 3055
2799 $facedata = Coro::Storable::thaw $facedata; 3056 $facedata = Coro::Storable::thaw $facedata;
2800 3057
2801 $facedata->{version} == 2 3058 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3059 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060
3061 # patch in the exptable
3062 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3065 };
3066 cf::cede_to_tick;
2803 3067
2804 { 3068 {
2805 my $faces = $facedata->{faceinfo}; 3069 my $faces = $facedata->{faceinfo};
2806 3070
2807 while (my ($face, $info) = each %$faces) { 3071 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3072 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3073 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3074 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3077
2814 cf::cede_to_tick; 3078 cf::cede_to_tick;
2815 } 3079 }
2816 3080
2817 while (my ($face, $info) = each %$faces) { 3081 while (my ($face, $info) = each %$faces) {
2842 3106
2843 { 3107 {
2844 # TODO: for gcfclient pleasure, we should give resources 3108 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3109 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3110 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3111
3112 my $soundconf = delete $res->{"res/sound.conf"};
2848 3113
2849 while (my ($name, $info) = each %$res) { 3114 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3115 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
2857 3117
2858 if ($name =~ /\.jpg$/) { 3118 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3119 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3127 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3128 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3129 }
2868 3130
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
2869 cf::cede_to_tick; 3134 cf::cede_to_tick;
2870 } 3135 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
2871 } 3154 }
2872 3155
2873 1 3156 1
2874} 3157}
2875 3158
3159register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_;
3161
3162 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v);
3164 }
3165};
3166
2876sub reload_regions { 3167sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = ();
3171
2877 load_resource_file "$MAPDIR/regions" 3172 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3173 or die "unable to load regions file\n";
2879 3174
2880 for (cf::region::list) { 3175 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3176 $_->{match} = qr/$_->{match}/
2917 3212
2918sub init { 3213sub init {
2919 reload_resources; 3214 reload_resources;
2920} 3215}
2921 3216
2922sub cfg_load { 3217sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3218 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3219 or return;
2925 3220
2926 local $/; 3221 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3222 *CFG = YAML::Syck::Load <$fh>;
2943sub main { 3238sub main {
2944 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
2948 Event::one_event; 3244 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
2950 }; 3246 };
2951 3247
2952 cfg_load; 3248 reload_config;
2953 db_init; 3249 db_init;
2954 load_extensions; 3250 load_extensions;
2955 3251
2956 $TICK_WATCHER->start; 3252 $TICK_WATCHER->start;
2957 Event::loop; 3253 Event::loop;
3024 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3326 $pl->save;
3030 } 3327 }
3031 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
3032 3329
3033 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
3081 3378
3082 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
3083 for (;;) { 3380 for (;;) {
3084 BDB::flush; 3381 BDB::flush;
3085 IO::AIO::flush; 3382 IO::AIO::flush;
3086 Coro::cede; 3383 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3385 warn "iterate...";
3089 } 3386 }
3090 3387
3091 ++$RELOAD; 3388 ++$RELOAD;
3150 warn "reloading cf.pm"; 3447 warn "reloading cf.pm";
3151 require cf; 3448 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3450
3154 warn "loading config and database again"; 3451 warn "loading config and database again";
3155 cf::cfg_load; 3452 cf::reload_config;
3156 3453
3157 warn "loading extensions"; 3454 warn "loading extensions";
3158 cf::load_extensions; 3455 cf::load_extensions;
3159 3456
3160 warn "reattaching attachments to objects/players"; 3457 warn "reattaching attachments to objects/players";
3196register_command "reload" => sub { 3493register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
3198 3495
3199 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3500 reload_perl;
3501 };
3202 } 3502 }
3203}; 3503};
3204 3504
3205unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
3206 3506
3225 my $signal = new Coro::Signal; 3525 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3526 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3527 $signal->wait;
3228} 3528}
3229 3529
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3530$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3531 reentrant => 0,
3234 parked => 1, 3532 parked => 1,
3235 prio => 0, 3533 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3534 at => $NEXT_TICK || $TICK,
3244 3542
3245 $NOW = $tick_start = Event::time; 3543 $NOW = $tick_start = Event::time;
3246 3544
3247 cf::server_tick; # one server iteration 3545 cf::server_tick; # one server iteration
3248 3546
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
3271
3272 $RUNTIME += $TICK; 3547 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
3274 3549
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
3278 write_runtime 3554 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3556 };
3281 } 3557 }
3282 3558
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3560 $sig->send;
3288 } 3561 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3562 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3563 $sig->send;
3300 3573
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3574 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3576
3304 _post_tick; 3577 _post_tick;
3305
3306
3307 }, 3578 },
3308); 3579);
3309 3580
3310{ 3581{
3582 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3583 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3584 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3585 reentrant => 0,
3314 fd => BDB::poll_fileno, 3586 fd => BDB::poll_fileno,
3315 poll => 'r', 3587 poll => 'r',
3316 prio => 0, 3588 prio => 0,
3317 data => WF_AUTOCANCEL, 3589 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3590 cb => \&BDB::poll_cb,
3319 ); 3591 );
3320 BDB::min_parallel 8;
3321 3592
3322 BDB::set_sync_prepare { 3593 BDB::set_sync_prepare {
3323 my $status; 3594 my $status;
3324 my $current = $Coro::current; 3595 my $current = $Coro::current;
3325 ( 3596 (
3334 ) 3605 )
3335 }; 3606 };
3336 3607
3337 unless ($DB_ENV) { 3608 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3609 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1);
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3614
3340 cf::sync_job { 3615 cf::sync_job {
3341 eval { 3616 eval {
3342 BDB::db_env_open 3617 BDB::db_env_open
3343 $DB_ENV, 3618 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3620 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3621 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3622 0666;
3348 3623
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3624 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3625 };
3354 3626
3355 cf::cleanup "db_env_open(db): $@" if $@; 3627 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3628 };
3357 } 3629 }
3630
3631 $BDB_DEADLOCK_WATCHER = Event->timer (
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 );
3641 $BDB_CHECKPOINT_WATCHER = Event->timer (
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 );
3651 $BDB_TRICKLE_WATCHER = Event->timer (
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 );
3358} 3661}
3359 3662
3360{ 3663{
3361 IO::AIO::min_parallel 8; 3664 IO::AIO::min_parallel 8;
3362 3665
3365 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3366 reentrant => 0, 3669 reentrant => 0,
3367 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3369 poll => 'r', 3672 poll => 'r',
3370 prio => 6, 3673 prio => 0,
3371 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3372 ); 3675 );
3373} 3676}
3374 3677
3375my $_log_backtrace; 3678my $_log_backtrace;
3381 3684
3382 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3687 ++$_log_backtrace;
3385 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3386 my @bt = fork_call { 3691 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3694 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines