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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
… …
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
… …
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
… …
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
… …
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
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::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;
1126
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1032 } 1129 }
1033 1130
1131 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1036 return ($data, $av); 1135 ($data, $av)
1037} 1136}
1038 1137
1039=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1040 1139
1041=over 4 1140=over 4
… …
1114 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
1115 1214
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1216
1118 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1124 } else { 1232 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1234 }
1127 1235
1128 cf::override; 1236 cf::override;
… …
1218 1326
1219=head3 cf::player 1327=head3 cf::player
1220 1328
1221=over 4 1329=over 4
1222 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1223=item cf::player::find $login 1345=item cf::player::find $login
1224 1346
1225Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1226 1348
1227=cut 1349=cut
… …
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1388
1267 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1270 } 1397 }
1271 } 1398 }
1272} 1399}
1273 1400
… …
1283 1410
1284 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1286 1413
1287 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1288 Coro::cede; 1415 cf::cede_to_tick;
1289} 1416}
1290 1417
1291sub new($) { 1418sub new($) {
1292 my ($login) = @_; 1419 my ($login) = @_;
1293 1420
… …
1297 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1298 1425
1299 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1300 1427
1301 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1302} 1439}
1303 1440
1304=item $pl->quit_character 1441=item $pl->quit_character
1305 1442
1306Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
… …
1361 or return []; 1498 or return [];
1362 1499
1363 my @logins; 1500 my @logins;
1364 1501
1365 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1369 1511
1370 utf8::decode $login; 1512 utf8::decode $login;
1371 push @logins, $login; 1513 push @logins, $login;
1372 } 1514 }
1373 1515
… …
1411sub expand_cfpod { 1553sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1413 1555
1414 # escape & and < 1556 # escape & and <
1415 s/&/&amp;/g; 1557 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1417 1559
1418 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1419 1561
1420 1 while 1562 1 while
1421 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1568 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1428 }ge 1571 }ge
1429 # replace H<hint text> 1572 # replace H<hint text>
… …
1450sub hintmode { 1593sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1595 $_[0]{hintmode}
1453} 1596}
1454 1597
1455=item $player->ext_reply ($msgid, %msg) 1598=item $player->ext_reply ($msgid, @msg)
1456 1599
1457Sends an ext reply to the player. 1600Sends an ext reply to the player.
1458 1601
1459=cut 1602=cut
1460 1603
1461sub ext_reply($$%) { 1604sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1605 my ($self, $id, @msg) = @_;
1463 1606
1464 $msg{msgid} = $id; 1607 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1608}
1467 1609
1468=item $player->ext_event ($type, %msg) 1610=item $player->ext_msg ($type, @msg)
1469 1611
1470Sends an ext event to the client. 1612Sends an ext event to the client.
1471 1613
1472=cut 1614=cut
1473 1615
1474sub ext_event($$%) { 1616sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1617 my ($self, $type, @msg) = @_;
1476 1618
1477 $self->ns->ext_event ($type, %msg); 1619 $self->ns->ext_msg ($type, @msg);
1478} 1620}
1479 1621
1480=head3 cf::region 1622=head3 cf::region
1481 1623
1482=over 4 1624=over 4
… …
1698 1840
1699sub load_header_from($) { 1841sub load_header_from($) {
1700 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1701 1843
1702 utf8::encode $path; 1844 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1708 1853
1709 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1710 1855
1711 1 1856 1
1712} 1857}
… …
1766sub find { 1911sub find {
1767 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1768 1913
1769 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1770 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1772 1918
1773 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1775 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1776 or return; 1924 or return;
1777 1925
1778 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1779 1927
… …
1781 or return; 1929 or return;
1782 1930
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1786 $map->reset; 1936 $map->reset;
1787 undef $guard;
1788 return find $path; 1937 return find $path;
1789 } 1938 }
1790 1939
1791 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1792 } 1941 }
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1802 1951
1803 my $path = $self->{path}; 1952 my $path = $self->{path};
1804 1953
1805 { 1954 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1807 1956
1957 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 1959
1810 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1811 1961
1812 $self->alloc; 1962 $self->alloc;
1813 1963
1814 $self->pre_load; 1964 $self->pre_load;
1815 Coro::cede; 1965 cf::cede_to_tick;
1816 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1818 or return; 1970 or return;
1819 1971
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1822 1974
1823 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 1976 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 1979 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1828 } 1983 }
1829 } 1984 }
1830 1985
1831 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1832 # now do the right thing for maps 1989 # now do the right thing for maps
1833 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1992 unless $self->difficulty;
1836 Coro::cede; 1993 cf::cede_to_tick;
1837 1994
1838 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1996 $self->decay_objects;
1840 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1841 $self->update_buttons; 1998 $self->update_buttons;
1842 Coro::cede; 1999 cf::cede_to_tick;
1843 $self->set_darkness_map; 2000 $self->set_darkness_map;
1844 Coro::cede; 2001 cf::cede_to_tick;
1845 $self->activate; 2002 $self->activate;
1846 } 2003 }
2004
2005 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME);
1847 2007
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2008 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 2009 }
1850 2010
1851 $self->post_load; 2011 $self->post_load;
… …
1862 2022
1863 $self 2023 $self
1864} 2024}
1865 2025
1866# find and load all maps in the 3x3 area around a map 2026# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2027sub load_neighbours {
1868 my ($map) = @_; 2028 my ($map) = @_;
1869 2029
1870 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1871 2031
1872 for (0 .. 3) { 2032 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1874 or next; 2034 or next;
1875 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1876 or next; 2036 or next;
1877 $neigh->load; 2037 $neigh->load;
1878 2038
2039 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2042 }
1882 2043
1883 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1885 or next; 2047 or next;
1886 $neigh->load; 2048 $neigh->load;
1887 } 2049 }
1888} 2050}
1889 2051
… …
1894} 2056}
1895 2057
1896sub do_load_sync { 2058sub do_load_sync {
1897 my ($map) = @_; 2059 my ($map) = @_;
1898 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1899 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1900} 2065}
1901 2066
1902our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1904 2069
1905sub find_async { 2070sub find_async {
1906 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1907 2072
1908 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1909 2074
1910 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 2077 }
1913 2078
1914 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1915 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1916 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2086 if (my $map = find $k) {
1919 $map->load; 2087 $map->load if $v;
1920 } 2088 }
1921 2089
1922 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1923 } 2091 }
1924 } 2092 }
1925 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1926 }; 2094 };
1927 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
… …
1930} 2098}
1931 2099
1932sub save { 2100sub save {
1933 my ($self) = @_; 2101 my ($self) = @_;
1934 2102
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2104
1937 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1938 2106
1939 return unless $self->dirty; 2107 return unless $self->dirty;
1940 2108
… …
1946 return if $self->{deny_save}; 2114 return if $self->{deny_save};
1947 2115
1948 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
1949 2117
1950 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
1952 }; 2121 };
1953 2122
1954 if ($uniq) { 2123 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1963 my ($self) = @_; 2132 my ($self) = @_;
1964 2133
1965 # save first because save cedes 2134 # save first because save cedes
1966 $self->save; 2135 $self->save;
1967 2136
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2138
1970 return if $self->players; 2139 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2141 return if $self->{deny_save};
1973 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2147 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2148}
1977 2149
1978sub reset_at { 2150sub reset_at {
1979 my ($self) = @_; 2151 my ($self) = @_;
1980 2152
… …
2012 if $uniq; 2184 if $uniq;
2013 } 2185 }
2014 2186
2015 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2016 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2191 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2192
2021 $self->unlink_save; 2193 $self->unlink_save;
2022 $self->destroy; 2194 $self->destroy;
2023} 2195}
2024 2196
2025my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
2026 2198
2027sub nuke { 2199sub nuke {
2028 my ($self) = @_; 2200 my ($self) = @_;
2029 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2030 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2031 2206
2032 $self->unlink_save; 2207 $self->unlink_save;
2033 2208
2034 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2214
2040 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2041 2217
2042 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2043} 2219}
2044 2220
2045=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
… …
2121 2297
2122sub inv_recursive { 2298sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2124} 2300}
2125 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2126package cf; 2330package cf;
2127 2331
2128=back 2332=back
2129 2333
2130=head3 cf::object::player 2334=head3 cf::object::player
… …
2152 2356
2153 } else { 2357 } else {
2154 my $pl = $self->contr; 2358 my $pl = $self->contr;
2155 2359
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2360 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2361 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2362 $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 2363
2165 } else { 2364 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2365 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2366 $self->message ($msg, $flags);
2168 } 2367 }
2169 } 2368 }
2369}
2370
2371=item $object->send_msg ($channel, $msg, $color, [extra...])
2372
2373=cut
2374
2375sub cf::object::send_msg {
2376 my $pl = shift->contr
2377 or return;
2378 $pl->send_msg (@_);
2170} 2379}
2171 2380
2172=item $player_object->may ("access") 2381=item $player_object->may ("access")
2173 2382
2174Returns wether the given player is authorized to access resource "access" 2383Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
2256 2465
2257 $map->load; 2466 $map->load;
2258 $map->load_diag; 2467 $map->load_neighbours;
2259 2468
2260 return unless $self->contr->active; 2469 return unless $self->contr->active;
2261 $self->activate_recursive; 2470 $self->activate_recursive;
2262 2471
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2493
2285 $self->enter_link; 2494 $self->enter_link;
2286 2495
2287 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2288 my $map = eval { 2518 my $map = eval {
2289 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2290 2520
2291 if ($map) { 2521 if ($map) {
2292 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2294 } else { 2524 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2526 }
2297 2527
2298 $map 2528 $map
2299 }; 2529 };
2300 2530
… …
2390 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2393 2623
2394 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2395 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2628 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2398 2630
2399 1; 2631 1;
… …
2425 2657
2426 utf8::encode $text; 2658 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428} 2660}
2429 2661
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2662=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2663
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2664Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of 2665client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2666the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2436 2668
2437=cut 2669=cut
2438 2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2696);
2697
2439sub cf::client::send_msg { 2698sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2699 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2700
2442 $msg = $self->pl->expand_cfpod ($msg); 2701 $msg = $self->pl->expand_cfpod ($msg);
2443 2702
2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704
2705 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2714 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel)
2719 if $self->can_msg;
2720 }
2721
2722 $channel = $channel->{id};
2723 }
2724
2444 return unless @extra || length $msg; 2725 return unless @extra || length $msg;
2445 2726
2446 if ($self->can_msg) { 2727 if ($self->can_msg) {
2728 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF;
2731
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2732 $self->send_packet ("msg " . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2448 } else { 2734 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 if ($color >= 0) { 2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745
2746 $color &= cf::NDI_COLOR_MASK;
2747
2748 utf8::encode $msg;
2749
2460 if (0 && $msg =~ /\[/) { 2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2462 } else { 2753 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg") 2755 $self->send_packet ("drawinfo $color $msg")
2465 } 2756 }
2466 } 2757 }
2467 } 2758 }
2468} 2759}
2469 2760
2470=item $client->ext_event ($type, %msg) 2761=item $client->ext_msg ($type, @msg)
2471 2762
2472Sends an ext event to the client. 2763Sends an ext event to the client.
2473 2764
2474=cut 2765=cut
2475 2766
2476sub cf::client::ext_event($$%) { 2767sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2768 my ($self, $type, @msg) = @_;
2478 2769
2479 return unless $self->extcmd; 2770 if ($self->extcmd == 2) {
2480 2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2773 push @msg, msgtype => "event_$type";
2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 }
2776}
2777
2778=item $client->ext_reply ($msgid, @msg)
2779
2780Sends an ext reply to the client.
2781
2782=cut
2783
2784sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_;
2786
2787 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 }
2483} 2794}
2484 2795
2485=item $success = $client->query ($flags, "text", \&cb) 2796=item $success = $client->query ($flags, "text", \&cb)
2486 2797
2487Queues a query to the client, calling the given callback with 2798Queues a query to the client, calling the given callback with
… …
2542 my ($ns, $buf) = @_; 2853 my ($ns, $buf) = @_;
2543 2854
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2855 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2856
2546 if (ref $msg) { 2857 if (ref $msg) {
2858 my ($type, $reply, @payload) =
2859 "ARRAY" eq ref $msg
2860 ? @$msg
2861 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2862
2863 my @reply;
2864
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2865 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 2866 @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 } 2867 }
2868
2869 $ns->ext_reply ($reply, @reply)
2870 if $reply;
2871
2553 } else { 2872 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 } 2874 }
2556 2875
2557 cf::override; 2876 cf::override;
… …
2604our $safe = new Safe "safe"; 2923our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 2924our $safe_hole = new Safe::Hole;
2606 2925
2607$SIG{FPE} = 'IGNORE'; 2926$SIG{FPE} = 'IGNORE';
2608 2927
2609$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2928$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math
2930 grepstart grepwhile mapstart mapwhile
2931 sort time
2932));
2610 2933
2611# here we export the classes and methods available to script code 2934# here we export the classes and methods available to script code
2612 2935
2613=pod 2936=pod
2614 2937
2615The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2616 2939
2617 cf::object 2940 cf::object
2618 contr pay_amount pay_player map x y force_find force_add 2941 contr pay_amount pay_player map x y force_find force_add destroy
2619 insert remove 2942 insert remove name archname title slaying race decrease_ob_nr
2620 2943
2621 cf::object::player 2944 cf::object::player
2622 player 2945 player
2623 2946
2624 cf::player 2947 cf::player
… …
2629 2952
2630=cut 2953=cut
2631 2954
2632for ( 2955for (
2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race
2634 insert remove)], 2958 decrease_ob_nr destroy)],
2635 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2637 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2638) { 2962) {
2639 no strict 'refs'; 2963 no strict 'refs';
… …
2715# the server's init and main functions 3039# the server's init and main functions
2716 3040
2717sub load_facedata($) { 3041sub load_facedata($) {
2718 my ($path) = @_; 3042 my ($path) = @_;
2719 3043
3044 # HACK to clear player env face cache, we need some signal framework
3045 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = ();
3047
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049
2720 warn "loading facedata from $path\n"; 3050 warn "loading facedata from $path\n";
2721 3051
2722 my $facedata; 3052 my $facedata;
2723 0 < aio_load $path, $facedata 3053 0 < aio_load $path, $facedata
2724 or die "$path: $!"; 3054 or die "$path: $!";
2725 3055
2726 $facedata = Coro::Storable::thaw $facedata; 3056 $facedata = Coro::Storable::thaw $facedata;
2727 3057
2728 $facedata->{version} == 2 3058 $facedata->{version} == 2
2729 or cf::cleanup "$path: version mismatch, cannot proceed."; 3059 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060
3061 # patch in the exptable
3062 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3065 };
3066 cf::cede_to_tick;
2730 3067
2731 { 3068 {
2732 my $faces = $facedata->{faceinfo}; 3069 my $faces = $facedata->{faceinfo};
2733 3070
2734 while (my ($face, $info) = each %$faces) { 3071 while (my ($face, $info) = each %$faces) {
2735 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3072 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2736 cf::face::set_visibility $idx, $info->{visibility}; 3073 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap}; 3074 cf::face::set_magicmap $idx, $info->{magicmap};
2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740 3077
2741 cf::cede_to_tick; 3078 cf::cede_to_tick;
2742 } 3079 }
2743 3080
2744 while (my ($face, $info) = each %$faces) { 3081 while (my ($face, $info) = each %$faces) {
… …
2769 3106
2770 { 3107 {
2771 # TODO: for gcfclient pleasure, we should give resources 3108 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 3109 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 3110 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical; 3111
3112 my $soundconf = delete $res->{"res/sound.conf"};
2775 3113
2776 while (my ($name, $info) = each %$res) { 3114 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3115 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
2784 3117
2785 if ($name =~ /\.jpg$/) { 3118 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3119 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
2788 } else { 3127 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 3128 $data = $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 } 3129 }
2795 3130
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
2796 cf::cede_to_tick; 3134 cf::cede_to_tick;
2797 } 3135 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
2798 } 3154 }
2799 3155
2800 1 3156 1
2801} 3157}
2802 3158
3159register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_;
3161
3162 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v);
3164 }
3165};
3166
2803sub reload_regions { 3167sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = ();
3171
2804 load_resource_file "$MAPDIR/regions" 3172 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 3173 or die "unable to load regions file\n";
2806 3174
2807 for (cf::region::list) { 3175 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/ 3176 $_->{match} = qr/$_->{match}/
… …
2844 3212
2845sub init { 3213sub init {
2846 reload_resources; 3214 reload_resources;
2847} 3215}
2848 3216
2849sub cfg_load { 3217sub reload_config {
2850 open my $fh, "<:utf8", "$CONFDIR/config" 3218 open my $fh, "<:utf8", "$CONFDIR/config"
2851 or return; 3219 or return;
2852 3220
2853 local $/; 3221 local $/;
2854 *CFG = YAML::Syck::Load <$fh>; 3222 *CFG = YAML::Syck::Load <$fh>;
… …
2870sub main { 3238sub main {
2871 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
2872 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
2873 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2874 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
2875 Event::one_event; 3244 Event::one_event;
2876 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
2877 }; 3246 };
2878 3247
2879 cfg_load; 3248 reload_config;
2880 db_init; 3249 db_init;
2881 load_extensions; 3250 load_extensions;
2882 3251
2883 $TICK_WATCHER->start; 3252 $TICK_WATCHER->start;
2884 Event::loop; 3253 Event::loop;
… …
2951 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
2952 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
2953 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
2954 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
2955 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2956 $pl->save; 3326 $pl->save;
2957 } 3327 }
2958 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
2959 3329
2960 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
… …
3008 3378
3009 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
3010 for (;;) { 3380 for (;;) {
3011 BDB::flush; 3381 BDB::flush;
3012 IO::AIO::flush; 3382 IO::AIO::flush;
3013 Coro::cede; 3383 Coro::cede_notself;
3014 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
3015 warn "iterate..."; 3385 warn "iterate...";
3016 } 3386 }
3017 3387
3018 ++$RELOAD; 3388 ++$RELOAD;
… …
3077 warn "reloading cf.pm"; 3447 warn "reloading cf.pm";
3078 require cf; 3448 require cf;
3079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080 3450
3081 warn "loading config and database again"; 3451 warn "loading config and database again";
3082 cf::cfg_load; 3452 cf::reload_config;
3083 3453
3084 warn "loading extensions"; 3454 warn "loading extensions";
3085 cf::load_extensions; 3455 cf::load_extensions;
3086 3456
3087 warn "reattaching attachments to objects/players"; 3457 warn "reattaching attachments to objects/players";
… …
3123register_command "reload" => sub { 3493register_command "reload" => sub {
3124 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
3125 3495
3126 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
3127 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
3128 async { reload_perl }; 3500 reload_perl;
3501 };
3129 } 3502 }
3130}; 3503};
3131 3504
3132unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
3133 3506
… …
3152 my $signal = new Coro::Signal; 3525 my $signal = new Coro::Signal;
3153 push @WAIT_FOR_TICK_BEGIN, $signal; 3526 push @WAIT_FOR_TICK_BEGIN, $signal;
3154 $signal->wait; 3527 $signal->wait;
3155} 3528}
3156 3529
3157 my $min = 1e6;#d#
3158 my $avg = 10;
3159$TICK_WATCHER = Event->timer ( 3530$TICK_WATCHER = Event->timer (
3160 reentrant => 0, 3531 reentrant => 0,
3161 parked => 1, 3532 parked => 1,
3162 prio => 0, 3533 prio => 0,
3163 at => $NEXT_TICK || $TICK, 3534 at => $NEXT_TICK || $TICK,
… …
3171 3542
3172 $NOW = $tick_start = Event::time; 3543 $NOW = $tick_start = Event::time;
3173 3544
3174 cf::server_tick; # one server iteration 3545 cf::server_tick; # one server iteration
3175 3546
3176 0 && sync_job {#d#
3177 for(1..10) {
3178 my $t = Event::time;
3179 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3180 or die;
3181
3182 $map->width (50);
3183 $map->height (50);
3184 $map->alloc;
3185 $map->_load_objects ("/tmp/x.map", 1);
3186 my $t = Event::time - $t;
3187
3188 #next unless $t < 0.0013;#d#
3189 if ($t < $min) {
3190 $min = $t;
3191 }
3192 $avg = $avg * 0.99 + $t * 0.01;
3193 }
3194 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3195 exit 0;
3196 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3197 };
3198
3199 $RUNTIME += $TICK; 3547 $RUNTIME += $TICK;
3200 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
3201 3549
3202 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3203 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
3204 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
3205 write_runtime 3554 write_runtime
3206 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
3207 }; 3556 };
3208 } 3557 }
3209 3558
3210# my $AFTER = Event::time;
3211# warn $AFTER - $NOW;#d#
3212
3213 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3214 $sig->send; 3560 $sig->send;
3215 } 3561 }
3216 while (my $sig = shift @WAIT_FOR_TICK) { 3562 while (my $sig = shift @WAIT_FOR_TICK) {
3217 $sig->send; 3563 $sig->send;
… …
3227 3573
3228 $LOAD = ($NOW - $tick_start) / $TICK; 3574 $LOAD = ($NOW - $tick_start) / $TICK;
3229 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3230 3576
3231 _post_tick; 3577 _post_tick;
3232
3233
3234 }, 3578 },
3235); 3579);
3236 3580
3237{ 3581{
3582 BDB::min_parallel 8;
3238 BDB::max_poll_time $TICK * 0.1; 3583 BDB::max_poll_time $TICK * 0.1;
3239 $BDB_POLL_WATCHER = Event->io ( 3584 $BDB_POLL_WATCHER = Event->io (
3240 reentrant => 0, 3585 reentrant => 0,
3241 fd => BDB::poll_fileno, 3586 fd => BDB::poll_fileno,
3242 poll => 'r', 3587 poll => 'r',
3243 prio => 0, 3588 prio => 0,
3244 data => WF_AUTOCANCEL, 3589 data => WF_AUTOCANCEL,
3245 cb => \&BDB::poll_cb, 3590 cb => \&BDB::poll_cb,
3246 ); 3591 );
3247 BDB::min_parallel 8;
3248 3592
3249 BDB::set_sync_prepare { 3593 BDB::set_sync_prepare {
3250 my $status; 3594 my $status;
3251 my $current = $Coro::current; 3595 my $current = $Coro::current;
3252 ( 3596 (
… …
3261 ) 3605 )
3262 }; 3606 };
3263 3607
3264 unless ($DB_ENV) { 3608 unless ($DB_ENV) {
3265 $DB_ENV = BDB::db_env_create; 3609 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1);
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3266 3614
3267 cf::sync_job { 3615 cf::sync_job {
3268 eval { 3616 eval {
3269 BDB::db_env_open 3617 BDB::db_env_open
3270 $DB_ENV, 3618 $DB_ENV,
… …
3272 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3620 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3273 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3621 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3274 0666; 3622 0666;
3275 3623
3276 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3624 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3277
3278 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3279 $DB_ENV->set_lk_detect;
3280 }; 3625 };
3281 3626
3282 cf::cleanup "db_env_open(db): $@" if $@; 3627 cf::cleanup "db_env_open(db): $@" if $@;
3283 }; 3628 };
3284 } 3629 }
3630
3631 $BDB_DEADLOCK_WATCHER = Event->timer (
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 );
3641 $BDB_CHECKPOINT_WATCHER = Event->timer (
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 );
3651 $BDB_TRICKLE_WATCHER = Event->timer (
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 );
3285} 3661}
3286 3662
3287{ 3663{
3288 IO::AIO::min_parallel 8; 3664 IO::AIO::min_parallel 8;
3289 3665
… …
3292 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3293 reentrant => 0, 3669 reentrant => 0,
3294 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3295 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3296 poll => 'r', 3672 poll => 'r',
3297 prio => 6, 3673 prio => 0,
3298 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3299 ); 3675 );
3300} 3676}
3301 3677
3302my $_log_backtrace; 3678my $_log_backtrace;
… …
3308 3684
3309 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3310 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3311 ++$_log_backtrace; 3687 ++$_log_backtrace;
3312 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3313 my @bt = fork_call { 3691 my @bt = fork_call {
3314 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3315 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3316 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3694 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3317 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

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