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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
167 171
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
172=back 182=back
173 183
174=cut 184=cut
175 185
176BEGIN { 186BEGIN {
180 $msg .= "\n" 190 $msg .= "\n"
181 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
182 192
183 $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;
184 194
185 utf8::encode $msg;
186 LOG llevError, $msg; 195 LOG llevError, $msg;
187 }; 196 };
188} 197}
189 198
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
268returned. 277returned.
269 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
270Lock 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
271uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
272 284
273=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
274 286
275Return 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.
276 288
277=cut 289=cut
278 290
279our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
280 293
281sub lock_wait($) { 294sub lock_wait($) {
282 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#
283 301
284 # wait for lock, if any 302 # wait for lock, if any
285 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 305 Coro::schedule;
293 311
294 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
295 lock_wait $key; 313 lock_wait $key;
296 314
297 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
298 317
299 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
302 } 322 }
303} 323}
304 324
316 }; 336 };
317 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
318 $guard 338 $guard
319} 339}
320 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
321=item cf::async { BLOCK } 399=item cf::async { BLOCK }
322 400
323Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
324C<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
325thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
349 my $time = Event::time; 427 my $time = Event::time;
350 428
351 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
353 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
354 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
355 # (but this is cancel-safe) 435 # (but this is cancel-safe)
356 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
357 437
358 my $busy = 1; 438 my $busy = 1;
359 my @res; 439 my @res;
360 440
361 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 443 @res = eval { $job->() };
363 warn $@ if $@; 444 warn $@ if $@;
364 undef $busy; 445 undef $busy;
365 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
366 447
410Coro::Storable. May, of course, block. Note that the executed sub may 491Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 492never block itself or use any form of Event handling.
412 493
413=cut 494=cut
414 495
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
424sub fork_call(&@) { 496sub fork_call(&@) {
425 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
426 498
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 502
432 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 504 reset_signals;
446 local $SIG{__WARN__}; 505 &$cb
447 local $SIG{__DIE__}; 506 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 507
454 eval { 508 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 509}
467 510
468=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
469 512
470Returns a single value from the environment database. 513Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
473 516
474Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
477=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
478 543
479our $DB; 544our $DB;
480 545
481sub db_init { 546sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 547 cf::sync_job {
486 eval { 548 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 549 };
496} 550}
497 551
498sub db_get($$) { 552sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
500 554
550 if (1) { 604 if (1) {
551 $md5 = 605 $md5 =
552 join "\x00", 606 join "\x00",
553 $processversion, 607 $processversion,
554 map { 608 map {
555 Coro::cede; 609 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 611 } 0.. $#$src;
558 612
559 613
560 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
866 "; 920 ";
867 die if $@; 921 die if $@;
868} 922}
869 923
870our $override; 924our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 925our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 926
873sub override { 927sub override {
874 $override = 1; 928 $override = 1;
875 @invoke_results = (); 929 @INVOKE_RESULTS = (@_);
876} 930}
877 931
878sub do_invoke { 932sub do_invoke {
879 my $event = shift; 933 my $event = shift;
880 my $callbacks = shift; 934 my $callbacks = shift;
881 935
882 @invoke_results = (); 936 @INVOKE_RESULTS = ();
883 937
884 local $override; 938 local $override;
885 939
886 for (@$callbacks) { 940 for (@$callbacks) {
887 eval { &{$_->[1]} }; 941 eval { &{$_->[1]} };
904 958
905Generate an object-specific event with the given arguments. 959Generate an object-specific event with the given arguments.
906 960
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 961This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 962removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 963results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 964
911=back 965=back
912 966
913=cut 967=cut
914 968
915############################################################################# 969#############################################################################
916# object support 970# object support
971
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
1005sub _can_merge {
1006 my ($ob1, $ob2) = @_;
1007
1008 ++$SLOW_MERGES;#d#
1009
1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
1012}
917 1013
918sub reattach { 1014sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1016 my ($obj) = @_;
921 1017
968sub object_freezer_save { 1064sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
970 1066
971 sync_job { 1067 sync_job {
972 if (length $$rdata) { 1068 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
975 1072
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1074 chmod SAVE_MODE, $fh;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1076 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1077 close $fh;
981 1078
982 if (@$objs) { 1079 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1085 close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
990 } 1087 }
998 } 1095 }
999 } else { 1096 } else {
1000 aio_unlink $filename; 1097 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
1002 } 1099 }
1003 } 1100 };
1004} 1101}
1005 1102
1006sub object_freezer_as_string { 1103sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
1008 1105
1020 or return; 1117 or return;
1021 1118
1022 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1121 or return;
1025 $av = eval { (Storable::thaw $av)->{objs} };
1026 }
1027 1122
1123 my $st = eval { Coro::Storable::thaw $av }
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1126 }
1127
1128 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
1131
1030 return ($data, $av); 1132 ($data, $av)
1031} 1133}
1032 1134
1033=head2 COMMAND CALLBACKS 1135=head2 COMMAND CALLBACKS
1034 1136
1035=over 4 1137=over 4
1108 my ($pl, $buf) = @_; 1210 my ($pl, $buf) = @_;
1109 1211
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1212 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1213
1112 if (ref $msg) { 1214 if (ref $msg) {
1215 my ($type, $reply, @payload) =
1216 "ARRAY" eq ref $msg
1217 ? @$msg
1218 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1219
1220 my @reply;
1221
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1222 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1223 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1224 }
1225
1226 $pl->ext_reply ($reply, @reply)
1227 if $reply;
1228
1118 } else { 1229 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1230 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1231 }
1121 1232
1122 cf::override; 1233 cf::override;
1212 1323
1213=head3 cf::player 1324=head3 cf::player
1214 1325
1215=over 4 1326=over 4
1216 1327
1328=item cf::player::num_playing
1329
1330Returns the official number of playing players, as per the Crossfire metaserver rules.
1331
1332=cut
1333
1334sub num_playing {
1335 scalar grep
1336 $_->ob->map
1337 && !$_->hidden
1338 && !$_->ob->flag (cf::FLAG_WIZ),
1339 cf::player::list
1340}
1341
1217=item cf::player::find $login 1342=item cf::player::find $login
1218 1343
1219Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1220 1345
1221=cut 1346=cut
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1381 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1382 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1383 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1385
1261 my $pl = load_pl path $login 1386 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1387 or return;
1388
1389 my $pl = cf::player::load_pl $f
1390 or return;
1391 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
1264 } 1394 }
1265 } 1395 }
1266} 1396}
1267 1397
1277 1407
1278 aio_mkdir playerdir $pl, 0770; 1408 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1409 $pl->{last_save} = $cf::RUNTIME;
1280 1410
1281 $pl->save_pl ($path); 1411 $pl->save_pl ($path);
1282 Coro::cede; 1412 cf::cede_to_tick;
1283} 1413}
1284 1414
1285sub new($) { 1415sub new($) {
1286 my ($login) = @_; 1416 my ($login) = @_;
1287 1417
1291 $self->{deny_save} = 1; 1421 $self->{deny_save} = 1;
1292 1422
1293 $cf::PLAYER{$login} = $self; 1423 $cf::PLAYER{$login} = $self;
1294 1424
1295 $self 1425 $self
1426}
1427
1428=item $player->send_msg ($channel, $msg, $color, [extra...])
1429
1430=cut
1431
1432sub send_msg {
1433 my $ns = shift->ns
1434 or return;
1435 $ns->send_msg (@_);
1296} 1436}
1297 1437
1298=item $pl->quit_character 1438=item $pl->quit_character
1299 1439
1300Nukes the player without looking back. If logged in, the connection will 1440Nukes the player without looking back. If logged in, the connection will
1355 or return []; 1495 or return [];
1356 1496
1357 my @logins; 1497 my @logins;
1358 1498
1359 for my $login (@$dirs) { 1499 for my $login (@$dirs) {
1500 my $path = path $login;
1501
1502 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1505 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1506 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 }
1363 1508
1364 utf8::decode $login; 1509 utf8::decode $login;
1365 push @logins, $login; 1510 push @logins, $login;
1366 } 1511 }
1367 1512
1405sub expand_cfpod { 1550sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1551 ((my $self), (local $_)) = @_;
1407 1552
1408 # escape & and < 1553 # escape & and <
1409 s/&/&amp;/g; 1554 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g; 1555 s/(?<![BIUGHT])</&lt;/g;
1411 1556
1412 # this is buggy, it needs to properly take care of nested <'s 1557 # this is buggy, it needs to properly take care of nested <'s
1413 1558
1414 1 while 1559 1 while
1415 # replace B<>, I<>, U<> etc. 1560 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1561 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1419 # replace G<male|female> tags 1565 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1566 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1 1567 $self->gender ? $2 : $1
1422 }ge 1568 }ge
1423 # replace H<hint text> 1569 # replace H<hint text>
1444sub hintmode { 1590sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1592 $_[0]{hintmode}
1447} 1593}
1448 1594
1449=item $player->ext_reply ($msgid, %msg) 1595=item $player->ext_reply ($msgid, @msg)
1450 1596
1451Sends an ext reply to the player. 1597Sends an ext reply to the player.
1452 1598
1453=cut 1599=cut
1454 1600
1455sub ext_reply($$%) { 1601sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1602 my ($self, $id, @msg) = @_;
1457 1603
1458 $msg{msgid} = $id; 1604 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1605}
1461 1606
1462=item $player->ext_event ($type, %msg) 1607=item $player->ext_msg ($type, @msg)
1463 1608
1464Sends an ext event to the client. 1609Sends an ext event to the client.
1465 1610
1466=cut 1611=cut
1467 1612
1468sub ext_event($$%) { 1613sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1614 my ($self, $type, @msg) = @_;
1470 1615
1471 $self->ns->ext_event ($type, %msg); 1616 $self->ns->ext_msg ($type, @msg);
1472} 1617}
1473 1618
1474=head3 cf::region 1619=head3 cf::region
1475 1620
1476=over 4 1621=over 4
1692 1837
1693sub load_header_from($) { 1838sub load_header_from($) {
1694 my ($self, $path) = @_; 1839 my ($self, $path) = @_;
1695 1840
1696 utf8::encode $path; 1841 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1842 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1843 or return;
1844
1845 $self->_load_header ($f)
1846 or return;
1847
1848 local $MAP_LOADING{$self->{path}} = $self;
1849 $f->resolve_delayed_derefs;
1702 1850
1703 $self->{load_path} = $path; 1851 $self->{load_path} = $path;
1704 1852
1705 1 1853 1
1706} 1854}
1760sub find { 1908sub find {
1761 my ($path, $origin) = @_; 1909 my ($path, $origin) = @_;
1762 1910
1763 $path = normalise $path, $origin && $origin->path; 1911 $path = normalise $path, $origin && $origin->path;
1764 1912
1913 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1914 cf::lock_wait "map_find:$path";
1766 1915
1767 $cf::MAP{$path} || do { 1916 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path"; 1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1769 my $map = new_from_path cf::map $path 1920 my $map = new_from_path cf::map $path
1770 or return; 1921 or return;
1771 1922
1772 $map->{last_save} = $cf::RUNTIME; 1923 $map->{last_save} = $cf::RUNTIME;
1773 1924
1775 or return; 1926 or return;
1776 1927
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1929 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1930 #$cf::WAIT_FOR_TICK->wait;
1931 undef $guard1;
1932 undef $guard2;
1780 $map->reset; 1933 $map->reset;
1781 undef $guard;
1782 return find $path; 1934 return find $path;
1783 } 1935 }
1784 1936
1785 $cf::MAP{$path} = $map 1937 $cf::MAP{$path} = $map
1786 } 1938 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 1947 local $self->{deny_reset} = 1; # loading can take a long time
1796 1948
1797 my $path = $self->{path}; 1949 my $path = $self->{path};
1798 1950
1799 { 1951 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 1952 my $guard = cf::lock_acquire "map_data:$path";
1801 1953
1954 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1955 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 1956
1804 $self->in_memory (cf::MAP_LOADING); 1957 $self->in_memory (cf::MAP_LOADING);
1805 1958
1806 $self->alloc; 1959 $self->alloc;
1807 1960
1808 $self->pre_load; 1961 $self->pre_load;
1809 Coro::cede; 1962 cf::cede_to_tick;
1810 1963
1964 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 1966 $self->_load_objects ($f)
1812 or return; 1967 or return;
1813 1968
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 1970 if delete $self->{load_original};
1816 1971
1817 if (my $uniq = $self->uniq_path) { 1972 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 1973 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 1974 unless (aio_stat $uniq) {
1975 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 1976 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 1977 $self->_load_objects ($f);
1978 $f->resolve_delayed_derefs;
1979 }
1822 } 1980 }
1823 } 1981 }
1824 1982
1825 Coro::cede; 1983 $f->resolve_delayed_derefs;
1984
1985 cf::cede_to_tick;
1826 # now do the right thing for maps 1986 # now do the right thing for maps
1827 $self->link_multipart_objects; 1987 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 1988 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 1989 unless $self->difficulty;
1830 Coro::cede; 1990 cf::cede_to_tick;
1831 1991
1832 unless ($self->{deny_activate}) { 1992 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 1993 $self->decay_objects;
1834 $self->fix_auto_apply; 1994 $self->fix_auto_apply;
1835 $self->update_buttons; 1995 $self->update_buttons;
1836 Coro::cede; 1996 cf::cede_to_tick;
1837 $self->set_darkness_map; 1997 $self->set_darkness_map;
1838 Coro::cede; 1998 cf::cede_to_tick;
1839 $self->activate; 1999 $self->activate;
1840 } 2000 }
2001
2002 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME);
1841 2004
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2005 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 2006 }
1844 2007
1845 $self->post_load; 2008 $self->post_load;
1856 2019
1857 $self 2020 $self
1858} 2021}
1859 2022
1860# find and load all maps in the 3x3 area around a map 2023# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2024sub load_neighbours {
1862 my ($map) = @_; 2025 my ($map) = @_;
1863 2026
1864 my @diag; # diagonal neighbours 2027 my @neigh; # diagonal neighbours
1865 2028
1866 for (0 .. 3) { 2029 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2030 my $neigh = $map->tile_path ($_)
1868 or next; 2031 or next;
1869 $neigh = find $neigh, $map 2032 $neigh = find $neigh, $map
1870 or next; 2033 or next;
1871 $neigh->load; 2034 $neigh->load;
1872 2035
2036 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2037 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2038 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2039 }
1876 2040
1877 for (@diag) { 2041 for (grep defined $_->[0], @neigh) {
2042 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2043 my $neigh = find $path, $origin
1879 or next; 2044 or next;
1880 $neigh->load; 2045 $neigh->load;
1881 } 2046 }
1882} 2047}
1883 2048
1888} 2053}
1889 2054
1890sub do_load_sync { 2055sub do_load_sync {
1891 my ($map) = @_; 2056 my ($map) = @_;
1892 2057
2058 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2059 if $Coro::current == $Coro::main;
2060
1893 cf::sync_job { $map->load }; 2061 cf::sync_job { $map->load };
1894} 2062}
1895 2063
1896our %MAP_PREFETCH; 2064our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2065our $MAP_PREFETCHER = undef;
1898 2066
1899sub find_async { 2067sub find_async {
1900 my ($path, $origin) = @_; 2068 my ($path, $origin, $load) = @_;
1901 2069
1902 $path = normalise $path, $origin && $origin->{path}; 2070 $path = normalise $path, $origin && $origin->{path};
1903 2071
1904 if (my $map = $cf::MAP{$path}) { 2072 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 2074 }
1907 2075
1908 undef $MAP_PREFETCH{$path}; 2076 $MAP_PREFETCH{$path} |= $load;
2077
1909 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
1910 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2083 if (my $map = find $k) {
1913 $map->load; 2084 $map->load if $v;
1914 } 2085 }
1915 2086
1916 delete $MAP_PREFETCH{$path}; 2087 delete $MAP_PREFETCH{$k};
1917 } 2088 }
1918 } 2089 }
1919 undef $MAP_PREFETCHER; 2090 undef $MAP_PREFETCHER;
1920 }; 2091 };
1921 $MAP_PREFETCHER->prio (6); 2092 $MAP_PREFETCHER->prio (6);
1924} 2095}
1925 2096
1926sub save { 2097sub save {
1927 my ($self) = @_; 2098 my ($self) = @_;
1928 2099
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2101
1931 $self->{last_save} = $cf::RUNTIME; 2102 $self->{last_save} = $cf::RUNTIME;
1932 2103
1933 return unless $self->dirty; 2104 return unless $self->dirty;
1934 2105
1940 return if $self->{deny_save}; 2111 return if $self->{deny_save};
1941 2112
1942 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
1943 2114
1944 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
1946 }; 2118 };
1947 2119
1948 if ($uniq) { 2120 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1957 my ($self) = @_; 2129 my ($self) = @_;
1958 2130
1959 # save first because save cedes 2131 # save first because save cedes
1960 $self->save; 2132 $self->save;
1961 2133
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2135
1964 return if $self->players; 2136 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2138 return if $self->{deny_save};
1967 2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2144 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2145}
1971 2146
1972sub reset_at { 2147sub reset_at {
1973 my ($self) = @_; 2148 my ($self) = @_;
1974 2149
2006 if $uniq; 2181 if $uniq;
2007 } 2182 }
2008 2183
2009 delete $cf::MAP{$self->path}; 2184 delete $cf::MAP{$self->path};
2010 2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2188 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2189
2015 $self->unlink_save; 2190 $self->unlink_save;
2016 $self->destroy; 2191 $self->destroy;
2017} 2192}
2018 2193
2019my $nuke_counter = "aaaa"; 2194my $nuke_counter = "aaaa";
2020 2195
2021sub nuke { 2196sub nuke {
2022 my ($self) = @_; 2197 my ($self) = @_;
2023 2198
2199 {
2200 my $lock = cf::lock_acquire "map_data:$self->{path}";
2201
2024 delete $cf::MAP{$self->path}; 2202 delete $cf::MAP{$self->path};
2025 2203
2026 $self->unlink_save; 2204 $self->unlink_save;
2027 2205
2028 bless $self, "cf::map"; 2206 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2207 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2208 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2209 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2211
2034 $cf::MAP{$self->path} = $self; 2212 $cf::MAP{$self->path} = $self;
2213 }
2035 2214
2036 $self->reset; # polite request, might not happen 2215 $self->reset; # polite request, might not happen
2037} 2216}
2038 2217
2039=item $maps = cf::map::tmp_maps 2218=item $maps = cf::map::tmp_maps
2115 2294
2116sub inv_recursive { 2295sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2296 inv_recursive_ inv $_[0]
2118} 2297}
2119 2298
2299=item $ref = $ob->ref
2300
2301creates and returns a persistent reference to an objetc that can be stored as a string.
2302
2303=item $ob = cf::object::deref ($refstring)
2304
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block.
2307
2308=cut
2309
2310sub deref {
2311 my ($ref) = @_;
2312
2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2314 my ($uuid, $name) = ($1, $2);
2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2316 or return;
2317 $pl->ob->uuid eq $uuid
2318 or return;
2319
2320 $pl->ob
2321 } else {
2322 warn "$ref: cannot resolve object reference\n";
2323 undef
2324 }
2325}
2326
2120package cf; 2327package cf;
2121 2328
2122=back 2329=back
2123 2330
2124=head3 cf::object::player 2331=head3 cf::object::player
2146 2353
2147 } else { 2354 } else {
2148 my $pl = $self->contr; 2355 my $pl = $self->contr;
2149 2356
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2357 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2358 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2360
2159 } else { 2361 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2362 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2363 $self->message ($msg, $flags);
2162 } 2364 }
2163 } 2365 }
2366}
2367
2368=item $object->send_msg ($channel, $msg, $color, [extra...])
2369
2370=cut
2371
2372sub cf::object::send_msg {
2373 my $pl = shift->contr
2374 or return;
2375 $pl->send_msg (@_);
2164} 2376}
2165 2377
2166=item $player_object->may ("access") 2378=item $player_object->may ("access")
2167 2379
2168Returns wether the given player is authorized to access resource "access" 2380Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2459 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2460 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2461 if $x <=0 && $y <= 0;
2250 2462
2251 $map->load; 2463 $map->load;
2252 $map->load_diag; 2464 $map->load_neighbours;
2253 2465
2254 return unless $self->contr->active; 2466 return unless $self->contr->active;
2255 $self->activate_recursive; 2467 $self->activate_recursive;
2256 2468
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2490
2279 $self->enter_link; 2491 $self->enter_link;
2280 2492
2281 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2496 # *tag paths override both path and x|y
2497 if ($path =~ /^\*(.*)$/) {
2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2499 my $ob = $obs[rand @obs];
2500
2501 # see if we actually can go there
2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2508
2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2512 }
2513 }
2514
2282 my $map = eval { 2515 my $map = eval {
2283 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2284 2517
2285 if ($map) { 2518 if ($map) {
2286 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2288 } else { 2521 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2523 }
2291 2524
2292 $map 2525 $map
2293 }; 2526 };
2294 2527
2384 # if exit is damned, update players death & WoR home-position 2617 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp) 2618 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED); 2619 if $exit->flag (FLAG_DAMNED);
2387 2620
2388 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2389 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2390 unless (eval { 2625 unless (eval {
2391 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2392 2627
2393 1; 2628 1;
2419 2654
2420 utf8::encode $text; 2655 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2656 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2657}
2423 2658
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2659=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2660
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2661Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2662client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 2663the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 2664the message unless the client supports the msg packet.
2430 2665
2431=cut 2666=cut
2432 2667
2668our %CHANNEL = (
2669 "c/identify" => {
2670 id => "infobox",
2671 title => "Identify",
2672 reply => undef,
2673 tooltip => "Items recently identified",
2674 },
2675 "c/examine" => {
2676 id => "infobox",
2677 title => "Examine",
2678 reply => undef,
2679 tooltip => "Signs and other items you examined",
2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2687);
2688
2433sub cf::client::send_msg { 2689sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2690 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2691
2436 $msg = $self->pl->expand_cfpod ($msg); 2692 $msg = $self->pl->expand_cfpod ($msg);
2437 2693
2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695
2696 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2705 } elsif (ref $channel) {
2706 # send meta info to client, if not yet sent
2707 unless (exists $self->{channel}{$channel->{id}}) {
2708 $self->{channel}{$channel->{id}} = $channel;
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711 }
2712
2713 $channel = $channel->{id};
2714 }
2715
2438 return unless @extra || length $msg; 2716 return unless @extra || length $msg;
2439 2717
2440 if ($self->can_msg) { 2718 if ($self->can_msg) {
2719 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF;
2722
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2723 $self->send_packet ("msg " . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2725 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 if ($color >= 0) { 2726 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones
2728 for ($msg) {
2729 1 while
2730 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2731 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2732 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2733 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2734 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2735 }
2736
2737 $color &= cf::NDI_COLOR_MASK;
2738
2739 utf8::encode $msg;
2740
2454 if (0 && $msg =~ /\[/) { 2741 if (0 && $msg =~ /\[/) {
2742 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2743 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2744 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2745 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2746 $self->send_packet ("drawinfo $color $msg")
2459 } 2747 }
2460 } 2748 }
2461 } 2749 }
2462} 2750}
2463 2751
2464=item $client->ext_event ($type, %msg) 2752=item $client->ext_msg ($type, @msg)
2465 2753
2466Sends an ext event to the client. 2754Sends an ext event to the client.
2467 2755
2468=cut 2756=cut
2469 2757
2470sub cf::client::ext_event($$%) { 2758sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2759 my ($self, $type, @msg) = @_;
2472 2760
2473 return unless $self->extcmd; 2761 if ($self->extcmd == 2) {
2474 2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2763 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2764 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2765 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2766 }
2767}
2768
2769=item $client->ext_reply ($msgid, @msg)
2770
2771Sends an ext reply to the client.
2772
2773=cut
2774
2775sub cf::client::ext_reply($$@) {
2776 my ($self, $id, @msg) = @_;
2777
2778 if ($self->extcmd == 2) {
2779 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2780 } elsif ($self->extcmd == 1) {
2781 #TODO: version 1, remove
2782 unshift @msg, msgtype => "reply", msgid => $id;
2783 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2784 }
2477} 2785}
2478 2786
2479=item $success = $client->query ($flags, "text", \&cb) 2787=item $success = $client->query ($flags, "text", \&cb)
2480 2788
2481Queues a query to the client, calling the given callback with 2789Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 2844 my ($ns, $buf) = @_;
2537 2845
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2846 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 2847
2540 if (ref $msg) { 2848 if (ref $msg) {
2849 my ($type, $reply, @payload) =
2850 "ARRAY" eq ref $msg
2851 ? @$msg
2852 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2853
2854 my @reply;
2855
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2856 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 2857 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 2858 }
2859
2860 $ns->ext_reply ($reply, @reply)
2861 if $reply;
2862
2547 } else { 2863 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2864 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 2865 }
2550 2866
2551 cf::override; 2867 cf::override;
2598our $safe = new Safe "safe"; 2914our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 2915our $safe_hole = new Safe::Hole;
2600 2916
2601$SIG{FPE} = 'IGNORE'; 2917$SIG{FPE} = 'IGNORE';
2602 2918
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2919$safe->permit_only (Opcode::opset qw(
2920 :base_core :base_mem :base_orig :base_math
2921 grepstart grepwhile mapstart mapwhile
2922 sort time
2923));
2604 2924
2605# here we export the classes and methods available to script code 2925# here we export the classes and methods available to script code
2606 2926
2607=pod 2927=pod
2608 2928
2609The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2610 2930
2611 cf::object 2931 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 2932 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 2933 insert remove name archname title slaying race decrease_ob_nr
2614 2934
2615 cf::object::player 2935 cf::object::player
2616 player 2936 player
2617 2937
2618 cf::player 2938 cf::player
2623 2943
2624=cut 2944=cut
2625 2945
2626for ( 2946for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race
2628 insert remove)], 2949 decrease_ob_nr destroy)],
2629 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2632) { 2953) {
2633 no strict 'refs'; 2954 no strict 'refs';
2709# the server's init and main functions 3030# the server's init and main functions
2710 3031
2711sub load_facedata($) { 3032sub load_facedata($) {
2712 my ($path) = @_; 3033 my ($path) = @_;
2713 3034
3035 # HACK to clear player env face cache, we need some signal framework
3036 # for this (global event?)
3037 %ext::player_env::MUSIC_FACE_CACHE = ();
3038
3039 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3040
2714 warn "loading facedata from $path\n"; 3041 warn "loading facedata from $path\n";
2715 3042
2716 my $facedata; 3043 my $facedata;
2717 0 < aio_load $path, $facedata 3044 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3045 or die "$path: $!";
2719 3046
2720 $facedata = Coro::Storable::thaw $facedata; 3047 $facedata = Coro::Storable::thaw $facedata;
2721 3048
2722 $facedata->{version} == 2 3049 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3050 or cf::cleanup "$path: version mismatch, cannot proceed.";
3051
3052 # patch in the exptable
3053 $facedata->{resource}{"res/exp_table"} = {
3054 type => FT_RSRC,
3055 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3056 };
3057 cf::cede_to_tick;
2724 3058
2725 { 3059 {
2726 my $faces = $facedata->{faceinfo}; 3060 my $faces = $facedata->{faceinfo};
2727 3061
2728 while (my ($face, $info) = each %$faces) { 3062 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3063 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2730 cf::face::set_visibility $idx, $info->{visibility}; 3064 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3065 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3068
2735 cf::cede_to_tick; 3069 cf::cede_to_tick;
2736 } 3070 }
2737 3071
2738 while (my ($face, $info) = each %$faces) { 3072 while (my ($face, $info) = each %$faces) {
2763 3097
2764 { 3098 {
2765 # TODO: for gcfclient pleasure, we should give resources 3099 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3100 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3101 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical; 3102
3103 my $soundconf = delete $res->{"res/sound.conf"};
2769 3104
2770 while (my ($name, $info) = each %$res) { 3105 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3106 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data;
2778 3108
2779 if ($name =~ /\.jpg$/) { 3109 if ($info->{type} & 1) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3110 # prepend meta info
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3111
3112 my $meta = $enc->encode ({
3113 name => $name,
3114 %{ $info->{meta} || {} },
3115 });
3116
3117 $data = pack "(w/a*)*", $meta, $info->{data};
2782 } else { 3118 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3119 $data = $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3120 }
2789 3121
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
2790 cf::cede_to_tick; 3125 cf::cede_to_tick;
2791 } 3126 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
2792 } 3145 }
2793 3146
2794 1 3147 1
2795} 3148}
2796 3149
3150register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_;
3152
3153 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v);
3155 }
3156};
3157
2797sub reload_regions { 3158sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = ();
3162
2798 load_resource_file "$MAPDIR/regions" 3163 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3164 or die "unable to load regions file\n";
2800 3165
2801 for (cf::region::list) { 3166 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3167 $_->{match} = qr/$_->{match}/
2838 3203
2839sub init { 3204sub init {
2840 reload_resources; 3205 reload_resources;
2841} 3206}
2842 3207
2843sub cfg_load { 3208sub reload_config {
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3209 open my $fh, "<:utf8", "$CONFDIR/config"
2845 or return; 3210 or return;
2846 3211
2847 local $/; 3212 local $/;
2848 *CFG = YAML::Syck::Load <$fh>; 3213 *CFG = YAML::Syck::Load <$fh>;
2864sub main { 3229sub main {
2865 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
2867 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2868 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
2869 Event::one_event; 3235 Event::one_event;
2870 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
2871 }; 3237 };
2872 3238
2873 cfg_load; 3239 reload_config;
2874 db_init; 3240 db_init;
2875 load_extensions; 3241 load_extensions;
2876 3242
2877 $TICK_WATCHER->start; 3243 $TICK_WATCHER->start;
2878 Event::loop; 3244 Event::loop;
2945 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
2947 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3317 $pl->save;
2951 } 3318 }
2952 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
2953 3320
2954 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
3071 warn "reloading cf.pm"; 3438 warn "reloading cf.pm";
3072 require cf; 3439 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3074 3441
3075 warn "loading config and database again"; 3442 warn "loading config and database again";
3076 cf::cfg_load; 3443 cf::reload_config;
3077 3444
3078 warn "loading extensions"; 3445 warn "loading extensions";
3079 cf::load_extensions; 3446 cf::load_extensions;
3080 3447
3081 warn "reattaching attachments to objects/players"; 3448 warn "reattaching attachments to objects/players";
3117register_command "reload" => sub { 3484register_command "reload" => sub {
3118 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
3119 3486
3120 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 3491 reload_perl;
3492 };
3123 } 3493 }
3124}; 3494};
3125 3495
3126unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
3127 3497
3146 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 3518 $signal->wait;
3149} 3519}
3150 3520
3151 my $min = 1e6;#d#
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
3154 reentrant => 0, 3522 reentrant => 0,
3155 parked => 1, 3523 parked => 1,
3156 prio => 0, 3524 prio => 0,
3157 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
3165 3533
3166 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
3167 3535
3168 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
3169 3537
3170 0 && sync_job {#d#
3171 for(1..10) {
3172 my $t = Event::time;
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3174 or die;
3175
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 };
3192
3193 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
3195 3540
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
3199 write_runtime 3545 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
3201 }; 3547 };
3202 } 3548 }
3203 3549
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 3551 $sig->send;
3209 } 3552 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 3554 $sig->send;
3221 3564
3222 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 3567
3225 _post_tick; 3568 _post_tick;
3226
3227
3228 }, 3569 },
3229); 3570);
3230 3571
3231{ 3572{
3573 BDB::min_parallel 8;
3232 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
3233 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
3234 reentrant => 0, 3576 reentrant => 0,
3235 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
3236 poll => 'r', 3578 poll => 'r',
3237 prio => 0, 3579 prio => 0,
3238 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
3240 ); 3582 );
3241 BDB::min_parallel 8;
3242 3583
3243 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
3244 my $status; 3585 my $status;
3245 my $current = $Coro::current; 3586 my $current = $Coro::current;
3246 ( 3587 (
3255 ) 3596 )
3256 }; 3597 };
3257 3598
3258 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3259 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3260 3605
3261 cf::sync_job { 3606 cf::sync_job {
3262 eval { 3607 eval {
3263 BDB::db_env_open 3608 BDB::db_env_open
3264 $DB_ENV, 3609 $DB_ENV,
3266 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 3613 0666;
3269 3614
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 3616 };
3275 3617
3276 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 3619 };
3278 } 3620 }
3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 );
3642 $BDB_TRICKLE_WATCHER = Event->timer (
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 );
3279} 3652}
3280 3653
3281{ 3654{
3282 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
3283 3656
3286 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3287 reentrant => 0, 3660 reentrant => 0,
3288 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3290 poll => 'r', 3663 poll => 'r',
3291 prio => 6, 3664 prio => 0,
3292 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3293 ); 3666 );
3294} 3667}
3295 3668
3296my $_log_backtrace; 3669my $_log_backtrace;
3302 3675
3303 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3305 ++$_log_backtrace; 3678 ++$_log_backtrace;
3306 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3307 my @bt = fork_call { 3682 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3311 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines