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.387 by root, Mon Oct 15 23:49:10 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::blocking_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;
1092 $av = eval { (Storable::thaw $av)->{objs} };
1093 }
1094 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
1097 return ($data, $av); 1136 ($data, $av)
1098} 1137}
1099 1138
1100=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
1101 1140
1102=over 4 1141=over 4
1175 my ($pl, $buf) = @_; 1214 my ($pl, $buf) = @_;
1176 1215
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1216 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1217
1179 if (ref $msg) { 1218 if (ref $msg) {
1219 my ($type, $reply, @payload) =
1220 "ARRAY" eq ref $msg
1221 ? @$msg
1222 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1223
1224 my @reply;
1225
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1226 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1227 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
1185 } else { 1233 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1235 }
1188 1236
1189 cf::override; 1237 cf::override;
1279 1327
1280=head3 cf::player 1328=head3 cf::player
1281 1329
1282=over 4 1330=over 4
1283 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1284=item cf::player::find $login 1346=item cf::player::find $login
1285 1347
1286Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1287 1349
1288=cut 1350=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1389
1328 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1331 } 1398 }
1332 } 1399 }
1333} 1400}
1334 1401
1344 1411
1345 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1347 1414
1348 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1349 Coro::cede; 1416 cf::cede_to_tick;
1350} 1417}
1351 1418
1352sub new($) { 1419sub new($) {
1353 my ($login) = @_; 1420 my ($login) = @_;
1354 1421
1358 $self->{deny_save} = 1; 1425 $self->{deny_save} = 1;
1359 1426
1360 $cf::PLAYER{$login} = $self; 1427 $cf::PLAYER{$login} = $self;
1361 1428
1362 $self 1429 $self
1430}
1431
1432=item $player->send_msg ($channel, $msg, $color, [extra...])
1433
1434=cut
1435
1436sub send_msg {
1437 my $ns = shift->ns
1438 or return;
1439 $ns->send_msg (@_);
1363} 1440}
1364 1441
1365=item $pl->quit_character 1442=item $pl->quit_character
1366 1443
1367Nukes the player without looking back. If logged in, the connection will 1444Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1499 or return [];
1423 1500
1424 my @logins; 1501 my @logins;
1425 1502
1426 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1430 1512
1431 utf8::decode $login; 1513 utf8::decode $login;
1432 push @logins, $login; 1514 push @logins, $login;
1433 } 1515 }
1434 1516
1472sub expand_cfpod { 1554sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1555 ((my $self), (local $_)) = @_;
1474 1556
1475 # escape & and < 1557 # escape & and <
1476 s/&/&amp;/g; 1558 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1559 s/(?<![BIUGHT])</&lt;/g;
1478 1560
1479 # this is buggy, it needs to properly take care of nested <'s 1561 # this is buggy, it needs to properly take care of nested <'s
1480 1562
1481 1 while 1563 1 while
1482 # replace B<>, I<>, U<> etc. 1564 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1565 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1569 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1570 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1571 $self->gender ? $2 : $1
1489 }ge 1572 }ge
1490 # replace H<hint text> 1573 # replace H<hint text>
1511sub hintmode { 1594sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1596 $_[0]{hintmode}
1514} 1597}
1515 1598
1516=item $player->ext_reply ($msgid, %msg) 1599=item $player->ext_reply ($msgid, @msg)
1517 1600
1518Sends an ext reply to the player. 1601Sends an ext reply to the player.
1519 1602
1520=cut 1603=cut
1521 1604
1522sub ext_reply($$%) { 1605sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1606 my ($self, $id, @msg) = @_;
1524 1607
1525 $msg{msgid} = $id; 1608 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1609}
1528 1610
1529=item $player->ext_event ($type, %msg) 1611=item $player->ext_msg ($type, @msg)
1530 1612
1531Sends an ext event to the client. 1613Sends an ext event to the client.
1532 1614
1533=cut 1615=cut
1534 1616
1535sub ext_event($$%) { 1617sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1618 my ($self, $type, @msg) = @_;
1537 1619
1538 $self->ns->ext_event ($type, %msg); 1620 $self->ns->ext_msg ($type, @msg);
1539} 1621}
1540 1622
1541=head3 cf::region 1623=head3 cf::region
1542 1624
1543=over 4 1625=over 4
1759 1841
1760sub load_header_from($) { 1842sub load_header_from($) {
1761 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1762 1844
1763 utf8::encode $path; 1845 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1769 1854
1770 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1771 1856
1772 1 1857 1
1773} 1858}
1827sub find { 1912sub find {
1828 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1829 1914
1830 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1831 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1833 1919
1834 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1836 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1837 or return; 1925 or return;
1838 1926
1839 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1840 1928
1842 or return; 1930 or return;
1843 1931
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1847 $map->reset; 1937 $map->reset;
1848 undef $guard;
1849 return find $path; 1938 return find $path;
1850 } 1939 }
1851 1940
1852 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1853 } 1942 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1863 1952
1864 my $path = $self->{path}; 1953 my $path = $self->{path};
1865 1954
1866 { 1955 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1868 1957
1958 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1960
1871 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1872 1962
1873 $self->alloc; 1963 $self->alloc;
1874 1964
1875 $self->pre_load; 1965 $self->pre_load;
1876 Coro::cede; 1966 cf::cede_to_tick;
1877 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1879 or return; 1971 or return;
1880 1972
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1883 1975
1884 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1977 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1980 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1889 } 1984 }
1890 } 1985 }
1891 1986
1892 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1893 # now do the right thing for maps 1990 # now do the right thing for maps
1894 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1993 unless $self->difficulty;
1897 Coro::cede; 1994 cf::cede_to_tick;
1898 1995
1899 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1997 $self->decay_objects;
1901 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1902 $self->update_buttons; 1999 $self->update_buttons;
1903 Coro::cede; 2000 cf::cede_to_tick;
1904 $self->set_darkness_map; 2001 $self->set_darkness_map;
1905 Coro::cede; 2002 cf::cede_to_tick;
1906 $self->activate; 2003 $self->activate;
1907 } 2004 }
2005
2006 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME);
1908 2008
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2009 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 2010 }
1911 2011
1912 $self->post_load; 2012 $self->post_load;
1923 2023
1924 $self 2024 $self
1925} 2025}
1926 2026
1927# find and load all maps in the 3x3 area around a map 2027# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2028sub load_neighbours {
1929 my ($map) = @_; 2029 my ($map) = @_;
1930 2030
1931 my @diag; # diagonal neighbours 2031 my @neigh; # diagonal neighbours
1932 2032
1933 for (0 .. 3) { 2033 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2034 my $neigh = $map->tile_path ($_)
1935 or next; 2035 or next;
1936 $neigh = find $neigh, $map 2036 $neigh = find $neigh, $map
1937 or next; 2037 or next;
1938 $neigh->load; 2038 $neigh->load;
1939 2039
2040 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2041 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2042 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2043 }
1943 2044
1944 for (@diag) { 2045 for (grep defined $_->[0], @neigh) {
2046 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2047 my $neigh = find $path, $origin
1946 or next; 2048 or next;
1947 $neigh->load; 2049 $neigh->load;
1948 } 2050 }
1949} 2051}
1950 2052
1955} 2057}
1956 2058
1957sub do_load_sync { 2059sub do_load_sync {
1958 my ($map) = @_; 2060 my ($map) = @_;
1959 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1960 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1961} 2066}
1962 2067
1963our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1965 2070
1966sub find_async { 2071sub find_async {
1967 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1968 2073
1969 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1970 2075
1971 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2078 }
1974 2079
1975 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1976 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1977 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2087 if (my $map = find $k) {
1980 $map->load; 2088 $map->load if $v;
1981 } 2089 }
1982 2090
1983 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1984 } 2092 }
1985 } 2093 }
1986 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1987 }; 2095 };
1988 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
1991} 2099}
1992 2100
1993sub save { 2101sub save {
1994 my ($self) = @_; 2102 my ($self) = @_;
1995 2103
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2105
1998 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1999 2107
2000 return unless $self->dirty; 2108 return unless $self->dirty;
2001 2109
2007 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2008 2116
2009 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2010 2118
2011 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2013 }; 2122 };
2014 2123
2015 if ($uniq) { 2124 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2024 my ($self) = @_; 2133 my ($self) = @_;
2025 2134
2026 # save first because save cedes 2135 # save first because save cedes
2027 $self->save; 2136 $self->save;
2028 2137
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2139
2031 return if $self->players; 2140 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2142 return if $self->{deny_save};
2034 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2148 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2149}
2038 2150
2039sub reset_at { 2151sub reset_at {
2040 my ($self) = @_; 2152 my ($self) = @_;
2041 2153
2073 if $uniq; 2185 if $uniq;
2074 } 2186 }
2075 2187
2076 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2077 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2192 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2193
2082 $self->unlink_save; 2194 $self->unlink_save;
2083 $self->destroy; 2195 $self->destroy;
2084} 2196}
2085 2197
2086my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
2087 2199
2088sub nuke { 2200sub nuke {
2089 my ($self) = @_; 2201 my ($self) = @_;
2090 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
2091 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
2092 2207
2093 $self->unlink_save; 2208 $self->unlink_save;
2094 2209
2095 bless $self, "cf::map"; 2210 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2215
2101 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
2102 2218
2103 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
2104} 2220}
2105 2221
2106=item $maps = cf::map::tmp_maps 2222=item $maps = cf::map::tmp_maps
2182 2298
2183sub inv_recursive { 2299sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2185} 2301}
2186 2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
2329}
2330
2187package cf; 2331package cf;
2188 2332
2189=back 2333=back
2190 2334
2191=head3 cf::object::player 2335=head3 cf::object::player
2213 2357
2214 } else { 2358 } else {
2215 my $pl = $self->contr; 2359 my $pl = $self->contr;
2216 2360
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2361 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2362 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2363 $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 2364
2226 } else { 2365 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2366 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2367 $self->message ($msg, $flags);
2229 } 2368 }
2230 } 2369 }
2370}
2371
2372=item $object->send_msg ($channel, $msg, $color, [extra...])
2373
2374=cut
2375
2376sub cf::object::send_msg {
2377 my $pl = shift->contr
2378 or return;
2379 $pl->send_msg (@_);
2231} 2380}
2232 2381
2233=item $player_object->may ("access") 2382=item $player_object->may ("access")
2234 2383
2235Returns wether the given player is authorized to access resource "access" 2384Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2463 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2464 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2465 if $x <=0 && $y <= 0;
2317 2466
2318 $map->load; 2467 $map->load;
2319 $map->load_diag; 2468 $map->load_neighbours;
2320 2469
2321 return unless $self->contr->active; 2470 return unless $self->contr->active;
2322 $self->activate_recursive; 2471 $self->activate_recursive;
2323 2472
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2494
2346 $self->enter_link; 2495 $self->enter_link;
2347 2496
2348 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2349 my $map = eval { 2519 my $map = eval {
2350 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2351 2521
2352 if ($map) { 2522 if ($map) {
2353 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2355 } else { 2525 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2527 }
2358 2528
2359 $map 2529 $map
2360 }; 2530 };
2361 2531
2451 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2454 2624
2455 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2456 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2629 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2459 2631
2460 1; 2632 1;
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2667the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2668the message unless the client supports the msg packet.
2497 2669
2498=cut 2670=cut
2499 2671
2672our %CHANNEL = (
2673 "c/identify" => {
2674 id => "infobox",
2675 title => "Identify",
2676 reply => undef,
2677 tooltip => "Items recently identified",
2678 },
2679 "c/examine" => {
2680 id => "infobox",
2681 title => "Examine",
2682 reply => undef,
2683 tooltip => "Signs and other items you examined",
2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2691);
2692
2500sub cf::client::send_msg { 2693sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2695
2503 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2504 2697
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2699
2700 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2507 if (ref $channel) { 2709 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2512 } 2715 }
2513 2716
2514 $channel = $channel->{id}; 2717 $channel = $channel->{id};
2515 } 2718 }
2516 2719
2517 return unless @extra || length $msg; 2720 return unless @extra || length $msg;
2518 2721
2519 if ($self->can_msg) { 2722 if ($self->can_msg) {
2723 # default colour, mask it out
2724 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2725 if $color & cf::NDI_DEF;
2726
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2727 $self->send_packet ("msg " . $self->{json_coder}->encode (
2728 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2729 } 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) { 2730 if ($color >= 0) {
2731 # replace some tags by gcfclient-compatible ones
2732 for ($msg) {
2733 1 while
2734 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2735 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2736 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2737 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2738 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2739 }
2740
2741 $color &= cf::NDI_COLOR_MASK;
2742
2743 utf8::encode $msg;
2744
2533 if (0 && $msg =~ /\[/) { 2745 if (0 && $msg =~ /\[/) {
2746 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2747 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2748 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2749 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2750 $self->send_packet ("drawinfo $color $msg")
2538 } 2751 }
2539 } 2752 }
2540 } 2753 }
2541} 2754}
2542 2755
2543=item $client->ext_event ($type, %msg) 2756=item $client->ext_msg ($type, @msg)
2544 2757
2545Sends an ext event to the client. 2758Sends an ext event to the client.
2546 2759
2547=cut 2760=cut
2548 2761
2549sub cf::client::ext_event($$%) { 2762sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2763 my ($self, $type, @msg) = @_;
2551 2764
2552 return unless $self->extcmd; 2765 if ($self->extcmd == 2) {
2553 2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2767 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2768 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2770 }
2771}
2772
2773=item $client->ext_reply ($msgid, @msg)
2774
2775Sends an ext reply to the client.
2776
2777=cut
2778
2779sub cf::client::ext_reply($$@) {
2780 my ($self, $id, @msg) = @_;
2781
2782 if ($self->extcmd == 2) {
2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2784 } elsif ($self->extcmd == 1) {
2785 #TODO: version 1, remove
2786 unshift @msg, msgtype => "reply", msgid => $id;
2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2788 }
2556} 2789}
2557 2790
2558=item $success = $client->query ($flags, "text", \&cb) 2791=item $success = $client->query ($flags, "text", \&cb)
2559 2792
2560Queues a query to the client, calling the given callback with 2793Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2848 my ($ns, $buf) = @_;
2616 2849
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2850 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2851
2619 if (ref $msg) { 2852 if (ref $msg) {
2853 my ($type, $reply, @payload) =
2854 "ARRAY" eq ref $msg
2855 ? @$msg
2856 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2857
2858 my @reply;
2859
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2860 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2861 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2862 }
2863
2864 $ns->ext_reply ($reply, @reply)
2865 if $reply;
2866
2626 } else { 2867 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2868 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2869 }
2629 2870
2630 cf::override; 2871 cf::override;
2677our $safe = new Safe "safe"; 2918our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2919our $safe_hole = new Safe::Hole;
2679 2920
2680$SIG{FPE} = 'IGNORE'; 2921$SIG{FPE} = 'IGNORE';
2681 2922
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2923$safe->permit_only (Opcode::opset qw(
2924 :base_core :base_mem :base_orig :base_math
2925 grepstart grepwhile mapstart mapwhile
2926 sort time
2927));
2683 2928
2684# here we export the classes and methods available to script code 2929# here we export the classes and methods available to script code
2685 2930
2686=pod 2931=pod
2687 2932
2688The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2689 2934
2690 cf::object 2935 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 2937 insert remove name archname title slaying race decrease_ob_nr
2693 2938
2694 cf::object::player 2939 cf::object::player
2695 player 2940 player
2696 2941
2697 cf::player 2942 cf::player
2702 2947
2703=cut 2948=cut
2704 2949
2705for ( 2950for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2952 insert remove inv name archname title slaying race
2707 insert remove)], 2953 decrease_ob_nr destroy)],
2708 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2711) { 2957) {
2712 no strict 'refs'; 2958 no strict 'refs';
2788# the server's init and main functions 3034# the server's init and main functions
2789 3035
2790sub load_facedata($) { 3036sub load_facedata($) {
2791 my ($path) = @_; 3037 my ($path) = @_;
2792 3038
3039 # HACK to clear player env face cache, we need some signal framework
3040 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = ();
3042
3043 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3044
2793 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2794 3046
2795 my $facedata; 3047 my $facedata;
2796 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3049 or die "$path: $!";
2798 3050
2799 $facedata = Coro::Storable::thaw $facedata; 3051 $facedata = Coro::Storable::thaw $facedata;
2800 3052
2801 $facedata->{version} == 2 3053 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3054 or cf::cleanup "$path: version mismatch, cannot proceed.";
3055
3056 # patch in the exptable
3057 $facedata->{resource}{"res/exp_table"} = {
3058 type => FT_RSRC,
3059 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3060 };
3061 cf::cede_to_tick;
2803 3062
2804 { 3063 {
2805 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
2806 3065
2807 while (my ($face, $info) = each %$faces) { 3066 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3067 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3068 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3069 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3072
2814 cf::cede_to_tick; 3073 cf::cede_to_tick;
2815 } 3074 }
2816 3075
2817 while (my ($face, $info) = each %$faces) { 3076 while (my ($face, $info) = each %$faces) {
2842 3101
2843 { 3102 {
2844 # TODO: for gcfclient pleasure, we should give resources 3103 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3104 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3105 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3106
3107 my $soundconf = delete $res->{"res/sound.conf"};
2848 3108
2849 while (my ($name, $info) = each %$res) { 3109 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; 3110 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data;
2857 3112
2858 if ($name =~ /\.jpg$/) { 3113 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3114 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3115
3116 my $meta = $enc->encode ({
3117 name => $name,
3118 %{ $info->{meta} || {} },
3119 });
3120
3121 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3122 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3123 $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 } 3124 }
2868 3125
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
2869 cf::cede_to_tick; 3129 cf::cede_to_tick;
2870 } 3130 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
2871 } 3149 }
2872 3150
2873 1 3151 1
2874} 3152}
2875 3153
3154register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_;
3156
3157 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v);
3159 }
3160};
3161
2876sub reload_regions { 3162sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
2877 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
2879 3169
2880 for (cf::region::list) { 3170 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3171 $_->{match} = qr/$_->{match}/
2917 3207
2918sub init { 3208sub init {
2919 reload_resources; 3209 reload_resources;
2920} 3210}
2921 3211
2922sub cfg_load { 3212sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3214 or return;
2925 3215
2926 local $/; 3216 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
2943sub main { 3233sub main {
2944 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
2948 Event::one_event; 3239 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
2950 }; 3241 };
2951 3242
2952 cfg_load; 3243 reload_config;
2953 db_init; 3244 db_init;
2954 load_extensions; 3245 load_extensions;
2955 3246
2956 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
2957 Event::loop; 3248 Event::loop;
3024 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3321 $pl->save;
3030 } 3322 }
3031 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3032 3324
3033 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
3081 3373
3082 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3083 for (;;) { 3375 for (;;) {
3084 BDB::flush; 3376 BDB::flush;
3085 IO::AIO::flush; 3377 IO::AIO::flush;
3086 Coro::cede; 3378 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3380 warn "iterate...";
3089 } 3381 }
3090 3382
3091 ++$RELOAD; 3383 ++$RELOAD;
3150 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
3151 require cf; 3443 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3445
3154 warn "loading config and database again"; 3446 warn "loading config and database again";
3155 cf::cfg_load; 3447 cf::reload_config;
3156 3448
3157 warn "loading extensions"; 3449 warn "loading extensions";
3158 cf::load_extensions; 3450 cf::load_extensions;
3159 3451
3160 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
3196register_command "reload" => sub { 3488register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3198 3490
3199 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3495 reload_perl;
3496 };
3202 } 3497 }
3203}; 3498};
3204 3499
3205unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3206 3501
3225 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3522 $signal->wait;
3228} 3523}
3229 3524
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3526 reentrant => 0,
3234 parked => 1, 3527 parked => 1,
3235 prio => 0, 3528 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
3244 3537
3245 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3246 3539
3247 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3248 3541
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; 3542 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3274 3544
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3278 write_runtime 3549 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3551 };
3281 } 3552 }
3282 3553
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3555 $sig->send;
3288 } 3556 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3558 $sig->send;
3300 3568
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3571
3304 _post_tick; 3572 _post_tick;
3305
3306
3307 }, 3573 },
3308); 3574);
3309 3575
3310{ 3576{
3577 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3580 reentrant => 0,
3314 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3315 poll => 'r', 3582 poll => 'r',
3316 prio => 0, 3583 prio => 0,
3317 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3319 ); 3586 );
3320 BDB::min_parallel 8;
3321 3587
3322 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3323 my $status; 3589 my $status;
3324 my $current = $Coro::current; 3590 my $current = $Coro::current;
3325 ( 3591 (
3334 ) 3600 )
3335 }; 3601 };
3336 3602
3337 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3609
3340 cf::sync_job { 3610 cf::sync_job {
3341 eval { 3611 eval {
3342 BDB::db_env_open 3612 BDB::db_env_open
3343 $DB_ENV, 3613 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3617 0666;
3348 3618
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 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 }; 3620 };
3354 3621
3355 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3623 };
3357 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3358} 3656}
3359 3657
3360{ 3658{
3361 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3362 3660
3365 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3366 reentrant => 0, 3664 reentrant => 0,
3367 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3369 poll => 'r', 3667 poll => 'r',
3370 prio => 6, 3668 prio => 0,
3371 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3372 ); 3670 );
3373} 3671}
3374 3672
3375my $_log_backtrace; 3673my $_log_backtrace;
3381 3679
3382 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3682 ++$_log_backtrace;
3385 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3386 my @bt = fork_call { 3686 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines