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.311 by root, Fri Jul 20 16:11:10 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
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
327=item cf::async { BLOCK } 399=item cf::async { BLOCK }
328 400
329Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
… …
355 my $time = Event::time; 427 my $time = Event::time;
356 428
357 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
359 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
360 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 435 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
363 437
364 my $busy = 1; 438 my $busy = 1;
365 my @res; 439 my @res;
366 440
367 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 443 @res = eval { $job->() };
369 warn $@ if $@; 444 warn $@ if $@;
370 undef $busy; 445 undef $busy;
371 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
372 447
373 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
374 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
375 } 454 }
376 455
377 $time = Event::time - $time; 456 $time = Event::time - $time;
378 457
379 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 495Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 496never block itself or use any form of Event handling.
418 497
419=cut 498=cut
420 499
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 500sub fork_call(&@) {
431 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
432 502
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 503 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 504 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 505 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 506
438 if (my $pid = fork) { 507 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 508 reset_signals;
452 local $SIG{__WARN__}; 509 &$cb
453 local $SIG{__DIE__}; 510 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 511
460 eval { 512 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 513}
473 514
474=item $value = cf::db_get $family => $key 515=item $value = cf::db_get $family => $key
475 516
476Returns a single value from the environment database. 517Returns a single value from the environment database.
… …
478=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
479 520
480Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
483=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
484 547
485our $DB; 548our $DB;
486 549
487sub db_init { 550sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 551 cf::sync_job {
492 eval { 552 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 553 };
502} 554}
503 555
504sub db_get($$) { 556sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
506 558
… …
556 if (1) { 608 if (1) {
557 $md5 = 609 $md5 =
558 join "\x00", 610 join "\x00",
559 $processversion, 611 $processversion,
560 map { 612 map {
561 Coro::cede; 613 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 615 } 0.. $#$src;
564 616
565 617
566 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
… …
919=cut 971=cut
920 972
921############################################################################# 973#############################################################################
922# object support 974# object support
923 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#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
1017
924sub reattach { 1018sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1020 my ($obj) = @_;
927 1021
928 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
… …
974sub object_freezer_save { 1068sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
976 1070
977 sync_job { 1071 sync_job {
978 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
981 1076
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1081 close $fh;
987 1082
988 if (@$objs) { 1083 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1089 close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
996 } 1091 }
… …
1004 } 1099 }
1005 } else { 1100 } else {
1006 aio_unlink $filename; 1101 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1008 } 1103 }
1009 } 1104 };
1010} 1105}
1011 1106
1012sub object_freezer_as_string { 1107sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1014 1109
… …
1026 or return; 1121 or return;
1027 1122
1028 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1125 or return;
1031 $av = eval { (Storable::thaw $av)->{objs} };
1032 }
1033 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);
1034 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
1036 return ($data, $av); 1136 ($data, $av)
1037} 1137}
1038 1138
1039=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
1040 1140
1041=over 4 1141=over 4
… …
1114 my ($pl, $buf) = @_; 1214 my ($pl, $buf) = @_;
1115 1215
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1216 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1217
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1226 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1227 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
1124 } else { 1233 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1235 }
1127 1236
1128 cf::override; 1237 cf::override;
… …
1218 1327
1219=head3 cf::player 1328=head3 cf::player
1220 1329
1221=over 4 1330=over 4
1222 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
1223=item cf::player::find $login 1346=item cf::player::find $login
1224 1347
1225Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1226 1349
1227=cut 1350=cut
… …
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1389
1267 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1268 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;
1269 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1270 } 1398 }
1271 } 1399 }
1272} 1400}
1273 1401
… …
1283 1411
1284 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1286 1414
1287 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1288 Coro::cede; 1416 cf::cede_to_tick;
1289} 1417}
1290 1418
1291sub new($) { 1419sub new($) {
1292 my ($login) = @_; 1420 my ($login) = @_;
1293 1421
… …
1297 $self->{deny_save} = 1; 1425 $self->{deny_save} = 1;
1298 1426
1299 $cf::PLAYER{$login} = $self; 1427 $cf::PLAYER{$login} = $self;
1300 1428
1301 $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 (@_);
1302} 1440}
1303 1441
1304=item $pl->quit_character 1442=item $pl->quit_character
1305 1443
1306Nukes the player without looking back. If logged in, the connection will 1444Nukes the player without looking back. If logged in, the connection will
… …
1361 or return []; 1499 or return [];
1362 1500
1363 my @logins; 1501 my @logins;
1364 1502
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1369 1512
1370 utf8::decode $login; 1513 utf8::decode $login;
1371 push @logins, $login; 1514 push @logins, $login;
1372 } 1515 }
1373 1516
… …
1411sub expand_cfpod { 1554sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1555 ((my $self), (local $_)) = @_;
1413 1556
1414 # escape & and < 1557 # escape & and <
1415 s/&/&amp;/g; 1558 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1559 s/(?<![BIUGHT])</&lt;/g;
1417 1560
1418 # 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
1419 1562
1420 1 while 1563 1 while
1421 # replace B<>, I<>, U<> etc. 1564 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1565 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1569 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1570 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1571 $self->gender ? $2 : $1
1428 }ge 1572 }ge
1429 # replace H<hint text> 1573 # replace H<hint text>
… …
1450sub hintmode { 1594sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1596 $_[0]{hintmode}
1453} 1597}
1454 1598
1455=item $player->ext_reply ($msgid, %msg) 1599=item $player->ext_reply ($msgid, @msg)
1456 1600
1457Sends an ext reply to the player. 1601Sends an ext reply to the player.
1458 1602
1459=cut 1603=cut
1460 1604
1461sub ext_reply($$%) { 1605sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1606 my ($self, $id, @msg) = @_;
1463 1607
1464 $msg{msgid} = $id; 1608 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1609}
1467 1610
1468=item $player->ext_event ($type, %msg) 1611=item $player->ext_msg ($type, @msg)
1469 1612
1470Sends an ext event to the client. 1613Sends an ext event to the client.
1471 1614
1472=cut 1615=cut
1473 1616
1474sub ext_event($$%) { 1617sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1618 my ($self, $type, @msg) = @_;
1476 1619
1477 $self->ns->ext_event ($type, %msg); 1620 $self->ns->ext_msg ($type, @msg);
1478} 1621}
1479 1622
1480=head3 cf::region 1623=head3 cf::region
1481 1624
1482=over 4 1625=over 4
… …
1698 1841
1699sub load_header_from($) { 1842sub load_header_from($) {
1700 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1701 1844
1702 utf8::encode $path; 1845 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 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;
1708 1854
1709 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1710 1856
1711 1 1857 1
1712} 1858}
… …
1766sub find { 1912sub find {
1767 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1768 1914
1769 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1770 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1772 1919
1773 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1774 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
1775 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1776 or return; 1925 or return;
1777 1926
1778 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1779 1928
… …
1781 or return; 1930 or return;
1782 1931
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1786 $map->reset; 1937 $map->reset;
1787 undef $guard;
1788 return find $path; 1938 return find $path;
1789 } 1939 }
1790 1940
1791 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1792 } 1942 }
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1802 1952
1803 my $path = $self->{path}; 1953 my $path = $self->{path};
1804 1954
1805 { 1955 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1807 1957
1958 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 1960
1810 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1811 1962
1812 $self->alloc; 1963 $self->alloc;
1813 1964
1814 $self->pre_load; 1965 $self->pre_load;
1815 Coro::cede; 1966 cf::cede_to_tick;
1816 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1818 or return; 1971 or return;
1819 1972
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1822 1975
1823 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 1977 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 1980 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1828 } 1984 }
1829 } 1985 }
1830 1986
1831 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1832 # now do the right thing for maps 1990 # now do the right thing for maps
1833 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1993 unless $self->difficulty;
1836 Coro::cede; 1994 cf::cede_to_tick;
1837 1995
1838 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1997 $self->decay_objects;
1840 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1841 $self->update_buttons; 1999 $self->update_buttons;
1842 Coro::cede; 2000 cf::cede_to_tick;
1843 $self->set_darkness_map; 2001 $self->set_darkness_map;
1844 Coro::cede; 2002 cf::cede_to_tick;
1845 $self->activate; 2003 $self->activate;
1846 } 2004 }
2005
2006 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME);
1847 2008
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2009 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 2010 }
1850 2011
1851 $self->post_load; 2012 $self->post_load;
… …
1862 2023
1863 $self 2024 $self
1864} 2025}
1865 2026
1866# 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
1867sub load_diag { 2028sub load_neighbours {
1868 my ($map) = @_; 2029 my ($map) = @_;
1869 2030
1870 my @diag; # diagonal neighbours 2031 my @neigh; # diagonal neighbours
1871 2032
1872 for (0 .. 3) { 2033 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2034 my $neigh = $map->tile_path ($_)
1874 or next; 2035 or next;
1875 $neigh = find $neigh, $map 2036 $neigh = find $neigh, $map
1876 or next; 2037 or next;
1877 $neigh->load; 2038 $neigh->load;
1878 2039
2040 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2041 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2042 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2043 }
1882 2044
1883 for (@diag) { 2045 for (grep defined $_->[0], @neigh) {
2046 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2047 my $neigh = find $path, $origin
1885 or next; 2048 or next;
1886 $neigh->load; 2049 $neigh->load;
1887 } 2050 }
1888} 2051}
1889 2052
… …
1894} 2057}
1895 2058
1896sub do_load_sync { 2059sub do_load_sync {
1897 my ($map) = @_; 2060 my ($map) = @_;
1898 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1899 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1900} 2066}
1901 2067
1902our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1904 2070
1905sub find_async { 2071sub find_async {
1906 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1907 2073
1908 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1909 2075
1910 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2078 }
1913 2079
1914 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1915 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1916 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2087 if (my $map = find $k) {
1919 $map->load; 2088 $map->load if $v;
1920 } 2089 }
1921 2090
1922 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1923 } 2092 }
1924 } 2093 }
1925 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1926 }; 2095 };
1927 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
… …
1930} 2099}
1931 2100
1932sub save { 2101sub save {
1933 my ($self) = @_; 2102 my ($self) = @_;
1934 2103
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2105
1937 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1938 2107
1939 return unless $self->dirty; 2108 return unless $self->dirty;
1940 2109
… …
1946 return if $self->{deny_save}; 2115 return if $self->{deny_save};
1947 2116
1948 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
1949 2118
1950 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
1952 }; 2122 };
1953 2123
1954 if ($uniq) { 2124 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1963 my ($self) = @_; 2133 my ($self) = @_;
1964 2134
1965 # save first because save cedes 2135 # save first because save cedes
1966 $self->save; 2136 $self->save;
1967 2137
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2139
1970 return if $self->players; 2140 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2142 return if $self->{deny_save};
1973 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2148 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2149}
1977 2150
1978sub reset_at { 2151sub reset_at {
1979 my ($self) = @_; 2152 my ($self) = @_;
1980 2153
… …
2012 if $uniq; 2185 if $uniq;
2013 } 2186 }
2014 2187
2015 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2016 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2192 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2193
2021 $self->unlink_save; 2194 $self->unlink_save;
2022 $self->destroy; 2195 $self->destroy;
2023} 2196}
2024 2197
2025my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
2026 2199
2027sub nuke { 2200sub nuke {
2028 my ($self) = @_; 2201 my ($self) = @_;
2029 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
2030 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
2031 2207
2032 $self->unlink_save; 2208 $self->unlink_save;
2033 2209
2034 bless $self, "cf::map"; 2210 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2215
2040 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
2041 2218
2042 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
2043} 2220}
2044 2221
2045=item $maps = cf::map::tmp_maps 2222=item $maps = cf::map::tmp_maps
… …
2121 2298
2122sub inv_recursive { 2299sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2124} 2301}
2125 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
2126package cf; 2331package cf;
2127 2332
2128=back 2333=back
2129 2334
2130=head3 cf::object::player 2335=head3 cf::object::player
… …
2152 2357
2153 } else { 2358 } else {
2154 my $pl = $self->contr; 2359 my $pl = $self->contr;
2155 2360
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2361 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2362 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2363 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2364
2165 } else { 2365 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2366 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2367 $self->message ($msg, $flags);
2168 } 2368 }
2169 } 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 (@_);
2170} 2380}
2171 2381
2172=item $player_object->may ("access") 2382=item $player_object->may ("access")
2173 2383
2174Returns wether the given player is authorized to access resource "access" 2384Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2463 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2464 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2465 if $x <=0 && $y <= 0;
2256 2466
2257 $map->load; 2467 $map->load;
2258 $map->load_diag; 2468 $map->load_neighbours;
2259 2469
2260 return unless $self->contr->active; 2470 return unless $self->contr->active;
2261 $self->activate_recursive; 2471 $self->activate_recursive;
2262 2472
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2494
2285 $self->enter_link; 2495 $self->enter_link;
2286 2496
2287 (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
2288 my $map = eval { 2519 my $map = eval {
2289 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2290 2521
2291 if ($map) { 2522 if ($map) {
2292 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2294 } else { 2525 } else {
2295 $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);
2296 } 2527 }
2297 2528
2298 $map 2529 $map
2299 }; 2530 };
2300 2531
… …
2390 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2393 2624
2394 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2395 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2629 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2398 2631
2399 1; 2632 1;
… …
2434the 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
2435the message unless the client supports the msg packet. 2668the message unless the client supports the msg packet.
2436 2669
2437=cut 2670=cut
2438 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
2439sub cf::client::send_msg { 2693sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2695
2442 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2443 2697
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 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
2448 if (ref $channel) { 2709 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2453 } 2715 }
2454 2716
2455 $channel = $channel->{id}; 2717 $channel = $channel->{id};
2456 } 2718 }
2457 2719
2720 return unless @extra || length $msg;
2721
2458 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
2459 $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]));
2460 } else { 2729 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 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
2472 if (0 && $msg =~ /\[/) { 2745 if (0 && $msg =~ /\[/) {
2746 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2747 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2748 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2749 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2750 $self->send_packet ("drawinfo $color $msg")
2477 } 2751 }
2478 } 2752 }
2479 } 2753 }
2480} 2754}
2481 2755
2482=item $client->ext_event ($type, %msg) 2756=item $client->ext_msg ($type, @msg)
2483 2757
2484Sends an ext event to the client. 2758Sends an ext event to the client.
2485 2759
2486=cut 2760=cut
2487 2761
2488sub cf::client::ext_event($$%) { 2762sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2763 my ($self, $type, @msg) = @_;
2490 2764
2491 return unless $self->extcmd; 2765 if ($self->extcmd == 2) {
2492 2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2767 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2768 push @msg, msgtype => "event_$type";
2494 $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 }
2495} 2789}
2496 2790
2497=item $success = $client->query ($flags, "text", \&cb) 2791=item $success = $client->query ($flags, "text", \&cb)
2498 2792
2499Queues a query to the client, calling the given callback with 2793Queues a query to the client, calling the given callback with
… …
2554 my ($ns, $buf) = @_; 2848 my ($ns, $buf) = @_;
2555 2849
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2850 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2851
2558 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
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2860 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2861 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2862 }
2863
2864 $ns->ext_reply ($reply, @reply)
2865 if $reply;
2866
2565 } else { 2867 } else {
2566 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";
2567 } 2869 }
2568 2870
2569 cf::override; 2871 cf::override;
… …
2616our $safe = new Safe "safe"; 2918our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2919our $safe_hole = new Safe::Hole;
2618 2920
2619$SIG{FPE} = 'IGNORE'; 2921$SIG{FPE} = 'IGNORE';
2620 2922
2621$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));
2622 2928
2623# here we export the classes and methods available to script code 2929# here we export the classes and methods available to script code
2624 2930
2625=pod 2931=pod
2626 2932
2627The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2628 2934
2629 cf::object 2935 cf::object
2630 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
2631 insert remove 2937 insert remove name archname title slaying race decrease_ob_nr
2632 2938
2633 cf::object::player 2939 cf::object::player
2634 player 2940 player
2635 2941
2636 cf::player 2942 cf::player
… …
2641 2947
2642=cut 2948=cut
2643 2949
2644for ( 2950for (
2645 ["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
2646 insert remove)], 2953 decrease_ob_nr destroy)],
2647 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2650) { 2957) {
2651 no strict 'refs'; 2958 no strict 'refs';
… …
2727# the server's init and main functions 3034# the server's init and main functions
2728 3035
2729sub load_facedata($) { 3036sub load_facedata($) {
2730 my ($path) = @_; 3037 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2733 3046
2734 my $facedata; 3047 my $facedata;
2735 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3049 or die "$path: $!";
2737 3050
2738 $facedata = Coro::Storable::thaw $facedata; 3051 $facedata = Coro::Storable::thaw $facedata;
2739 3052
2740 $facedata->{version} == 2 3053 $facedata->{version} == 2
2741 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;
2742 3062
2743 { 3063 {
2744 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
2745 3065
2746 while (my ($face, $info) = each %$faces) { 3066 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3067 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 3068 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3069 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3072
2753 cf::cede_to_tick; 3073 cf::cede_to_tick;
2754 } 3074 }
2755 3075
2756 while (my ($face, $info) = each %$faces) { 3076 while (my ($face, $info) = each %$faces) {
… …
2781 3101
2782 { 3102 {
2783 # TODO: for gcfclient pleasure, we should give resources 3103 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3104 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3105 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 3106
3107 my $soundconf = delete $res->{"res/sound.conf"};
2787 3108
2788 while (my ($name, $info) = each %$res) { 3109 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3110 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data;
2796 3112
2797 if ($name =~ /\.jpg$/) { 3113 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3114 # prepend meta info
2799 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};
2800 } else { 3122 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3123 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3124 }
2807 3125
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
2808 cf::cede_to_tick; 3129 cf::cede_to_tick;
2809 } 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 }
2810 } 3149 }
2811 3150
2812 1 3151 1
2813} 3152}
2814 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
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
2818 3169
2819 for (cf::region::list) { 3170 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3171 $_->{match} = qr/$_->{match}/
… …
2856 3207
2857sub init { 3208sub init {
2858 reload_resources; 3209 reload_resources;
2859} 3210}
2860 3211
2861sub cfg_load { 3212sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3214 or return;
2864 3215
2865 local $/; 3216 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
… …
2882sub main { 3233sub main {
2883 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
2885 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#
2886 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
2887 Event::one_event; 3239 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
2889 }; 3241 };
2890 3242
2891 cfg_load; 3243 reload_config;
2892 db_init; 3244 db_init;
2893 load_extensions; 3245 load_extensions;
2894 3246
2895 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
2896 Event::loop; 3248 Event::loop;
… …
2963 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3321 $pl->save;
2969 } 3322 }
2970 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
2971 3324
2972 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3020 3373
3021 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3022 for (;;) { 3375 for (;;) {
3023 BDB::flush; 3376 BDB::flush;
3024 IO::AIO::flush; 3377 IO::AIO::flush;
3025 Coro::cede; 3378 Coro::cede_notself;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate..."; 3380 warn "iterate...";
3028 } 3381 }
3029 3382
3030 ++$RELOAD; 3383 ++$RELOAD;
… …
3089 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
3090 require cf; 3443 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3445
3093 warn "loading config and database again"; 3446 warn "loading config and database again";
3094 cf::cfg_load; 3447 cf::reload_config;
3095 3448
3096 warn "loading extensions"; 3449 warn "loading extensions";
3097 cf::load_extensions; 3450 cf::load_extensions;
3098 3451
3099 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
… …
3135register_command "reload" => sub { 3488register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3137 3490
3138 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3495 reload_perl;
3496 };
3141 } 3497 }
3142}; 3498};
3143 3499
3144unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3145 3501
… …
3164 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3522 $signal->wait;
3167} 3523}
3168 3524
3169 my $min = 1e6;#d#
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3172 reentrant => 0, 3526 reentrant => 0,
3173 parked => 1, 3527 parked => 1,
3174 prio => 0, 3528 prio => 0,
3175 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3183 3537
3184 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3185 3539
3186 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3187 3541
3188 0 && sync_job {#d#
3189 for(1..10) {
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 };
3210
3211 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3213 3544
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3217 write_runtime 3549 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3219 }; 3551 };
3220 } 3552 }
3221 3553
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3555 $sig->send;
3227 } 3556 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3558 $sig->send;
… …
3239 3568
3240 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3571
3243 _post_tick; 3572 _post_tick;
3244
3245
3246 }, 3573 },
3247); 3574);
3248 3575
3249{ 3576{
3577 BDB::min_parallel 8;
3250 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3251 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3252 reentrant => 0, 3580 reentrant => 0,
3253 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3254 poll => 'r', 3582 poll => 'r',
3255 prio => 0, 3583 prio => 0,
3256 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3258 ); 3586 );
3259 BDB::min_parallel 8;
3260 3587
3261 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3262 my $status; 3589 my $status;
3263 my $current = $Coro::current; 3590 my $current = $Coro::current;
3264 ( 3591 (
… …
3273 ) 3600 )
3274 }; 3601 };
3275 3602
3276 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3277 $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);
3278 3609
3279 cf::sync_job { 3610 cf::sync_job {
3280 eval { 3611 eval {
3281 BDB::db_env_open 3612 BDB::db_env_open
3282 $DB_ENV, 3613 $DB_ENV,
… …
3284 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
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3617 0666;
3287 3618
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3620 };
3293 3621
3294 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3623 };
3296 } 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 );
3297} 3656}
3298 3657
3299{ 3658{
3300 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3301 3660
… …
3304 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3305 reentrant => 0, 3664 reentrant => 0,
3306 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3308 poll => 'r', 3667 poll => 'r',
3309 prio => 6, 3668 prio => 0,
3310 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3311 ); 3670 );
3312} 3671}
3313 3672
3314my $_log_backtrace; 3673my $_log_backtrace;
… …
3320 3679
3321 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3682 ++$_log_backtrace;
3324 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3325 my @bt = fork_call { 3686 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 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 |"
3329 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines