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.257 by root, Sat Apr 21 17:34:24 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use 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.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
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::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML::Syck ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
44 46
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 48
… …
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
… …
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
71 75
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 77our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
79 82
80our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 87our $DB_ENV;
82 88
83our %CFG; 89our %CFG;
84 90
85our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 92our $RUNTIME;
93our $NOW;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101
102our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing
104our $tick_start; # for load detecting purposes
94 105
95binmode STDOUT; 106binmode STDOUT;
96binmode STDERR; 107binmode STDERR;
97 108
98# read virtual server time, if available 109# read virtual server time, if available
… …
139 150
140=item $cf::TICK 151=item $cf::TICK
141 152
142The interval between server ticks, in seconds. 153The interval between server ticks, in seconds.
143 154
155=item $cf::LOADAVG
156
157The current CPU load on the server (alpha-smoothed), as a value between 0
158(none) and 1 (overloaded), indicating how much time is spent on processing
159objects per tick. Healthy values are < 0.5.
160
161=item $cf::LOAD
162
163The raw value load value from the last tick.
164
144=item %cf::CFG 165=item %cf::CFG
145 166
146Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
147from wherever your confdir points to. 168from wherever your confdir points to.
148 169
149=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
150 171
151These 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
152returns 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
153per 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.
154 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
155=back 182=back
156 183
157=cut 184=cut
158 185
159BEGIN { 186BEGIN {
… …
163 $msg .= "\n" 190 $msg .= "\n"
164 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
165 192
166 $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;
167 194
168 utf8::encode $msg;
169 LOG llevError, $msg; 195 LOG llevError, $msg;
170 }; 196 };
171} 197}
172 198
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 206
180# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 208# within the Safe compartment.
182for my $pkg (qw( 209for my $pkg (qw(
183 cf::global cf::attachable 210 cf::global cf::attachable
… …
188)) { 215)) {
189 no strict 'refs'; 216 no strict 'refs';
190 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
191} 218}
192 219
193$Event::DIED = sub { 220$EV::DIED = sub {
194 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
195}; 222};
223
224#############################################################################
196 225
197=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
198 227
199=over 4 228=over 4
200 229
… …
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 249 $d
221 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
222} 251}
223 252
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
227 254
228Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
229 256
230=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
231 258
232Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub encode_json($) { $json_coder->encode ($_[0]) }
266sub decode_json($) { $json_coder->decode ($_[0]) }
233 267
234=item cf::lock_wait $string 268=item cf::lock_wait $string
235 269
236Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
237 271
… …
240Wait 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
241a 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,
242for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
243returned. 277returned.
244 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
245Lock 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
246uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
247 284
248=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
249 286
250Return 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.
251 288
252=cut 289=cut
253 290
254our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
255 293
256sub lock_wait($) { 294sub lock_wait($) {
257 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#
258 301
259 # wait for lock, if any 302 # wait for lock, if any
260 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 305 Coro::schedule;
… …
268 311
269 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
270 lock_wait $key; 313 lock_wait $key;
271 314
272 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
273 317
274 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
277 } 322 }
278} 323}
279 324
… …
291 }; 336 };
292 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
293 $guard 338 $guard
294} 339}
295 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
356=item cf::get_slot $time[, $priority[, $name]]
357
358Allocate $time seconds of blocking CPU time at priority C<$priority>:
359This call blocks and returns only when you have at least C<$time> seconds
360of cpu time till the next tick. The slot is only valid till the next cede.
361
362The optional C<$name> can be used to identify the job to run. It might be
363used for statistical purposes and should identify the same time-class.
364
365Useful for short background jobs.
366
367=cut
368
369our @SLOT_QUEUE;
370our $SLOT_QUEUE;
371
372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
376 my $signal = new Coro::Signal;
377
378 while () {
379 next_job:
380 my $avail = cf::till_tick;
381 if ($avail > 0.01) {
382 for (0 .. $#SLOT_QUEUE) {
383 if ($SLOT_QUEUE[$_][0] < $avail) {
384 my $job = splice @SLOT_QUEUE, $_, 1, ();
385 $job->[2]->send;
386 Coro::cede;
387 goto next_job;
388 }
389 }
390 }
391
392 if (@SLOT_QUEUE) {
393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
394 push @cf::WAIT_FOR_TICK, $signal;
395 $signal->wait;
396 } else {
397 Coro::schedule;
398 }
399 }
400};
401
402sub get_slot($;$$) {
403 my ($time, $pri, $name) = @_;
404
405 $time = $TICK * .6 if $time > $TICK * .6;
406 my $sig = new Coro::Signal;
407
408 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
409 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
410 $SLOT_QUEUE->ready;
411 $sig->wait;
412}
413
296=item cf::async { BLOCK } 414=item cf::async { BLOCK }
297 415
298Currently the same as Coro::async_pool, meaning you cannot use 416Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 417C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 418thing you are allowed to do is call C<prio> on it.
… …
303 421
304BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
305 423
306=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
307 425
308The design of crossfire+ requires that the main coro ($Coro::main) is 426The design of Deliantra requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 427is always able to handle events or runnable, as Deliantra is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
429acceptable.
311 430
312If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 433server will be frozen during this time, so the block should either finish
315fast or be very important. 434fast or be very important.
… …
318 437
319sub sync_job(&) { 438sub sync_job(&) {
320 my ($job) = @_; 439 my ($job) = @_;
321 440
322 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
442 my $time = EV::time;
443
323 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
325 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
326 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 450 # (but this is cancel-safe)
328 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
329 452
330 my $busy = 1; 453 my $busy = 1;
331 my @res; 454 my @res;
332 455
333 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
334 @res = eval { $job->() }; 458 @res = eval { $job->() };
335 warn $@ if $@; 459 warn $@ if $@;
336 undef $busy; 460 undef $busy;
337 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
338 462
339 while ($busy) { 463 while ($busy) {
340 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
341 } 468 }
469 }
470
471 $time = EV::time - $time;
472
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load
342 477
343 wantarray ? @res : $res[0] 478 wantarray ? @res : $res[0]
344 } else { 479 } else {
345 # we are in another coroutine, how wonderful, everything just works 480 # we are in another coroutine, how wonderful, everything just works
346 481
… …
366 $EXT_CORO{$coro+0} = $coro; 501 $EXT_CORO{$coro+0} = $coro;
367 502
368 $coro 503 $coro
369} 504}
370 505
371sub write_runtime { 506=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 507
374 my $runtime = "$LOCALDIR/runtime"; 508Executes the given code block with the given arguments in a seperate
509process, returning the results. Everything must be serialisable with
510Coro::Storable. May, of course, block. Note that the executed sub may
511never block itself or use any form of event handling.
375 512
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 513=cut
377 or return;
378 514
379 my $value = $cf::RUNTIME + 90 + 10; 515sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 516 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 517
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 518 # we seemingly have to make a local copy of the whole thing,
384 and return; 519 # otherwise perl prematurely frees the stuff :/
520 # TODO: investigate and fix (likely this will be rather laborious)
385 521
386 # always fsync - this file is important 522 my @res = Coro::Util::fork_eval {
387 aio_fsync $fh 523 reset_signals;
388 and return; 524 &$cb
525 }, @args;
389 526
390 close $fh 527 wantarray ? @res : $res[-1]
391 or return; 528}
392 529
393 aio_rename "$runtime~", $runtime 530=item $value = cf::db_get $family => $key
394 and return;
395 531
532Returns a single value from the environment database.
533
534=item cf::db_put $family => $key => $value
535
536Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538
539=item $db = cf::db_table "name"
540
541Create and/or open a new database table. The string must not be "db" and must be unique
542within each server.
543
544=cut
545
546sub db_table($) {
547 my ($name) = @_;
548 my $db = BDB::db_create $DB_ENV;
549
550 eval {
551 $db->set_flags (BDB::CHKSUM);
552
553 utf8::encode $name;
554 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
555 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
556 cf::cleanup "db_open(db): $!" if $!;
557 };
558 cf::cleanup "db_open(db): $@" if $@;
559
560 $db
561}
562
563our $DB;
564
565sub db_init {
566 cf::sync_job {
567 $DB ||= db_table "db";
568 };
569}
570
571sub db_get($$) {
572 my $key = "$_[0]/$_[1]";
573
574 cf::sync_job {
575 BDB::db_get $DB, undef, $key, my $data;
576
577 $! ? ()
578 : $data
396 1 579 }
580}
581
582sub db_put($$$) {
583 BDB::dbreq_pri 4;
584 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
585}
586
587=item cf::cache $id => [$paths...], $processversion => $process
588
589Generic caching function that returns the value of the resource $id,
590caching and regenerating as required.
591
592This function can block.
593
594=cut
595
596sub cache {
597 my ($id, $src, $processversion, $process) = @_;
598
599 my $meta =
600 join "\x00",
601 $processversion,
602 map {
603 aio_stat $_
604 and Carp::croak "$_: $!";
605
606 ($_, (stat _)[7,9])
607 } @$src;
608
609 my $dbmeta = db_get cache => "$id/meta";
610 if ($dbmeta ne $meta) {
611 # changed, we may need to process
612
613 my @data;
614 my $md5;
615
616 for (0 .. $#$src) {
617 0 <= aio_load $src->[$_], $data[$_]
618 or Carp::croak "$src->[$_]: $!";
619 }
620
621 # if processing is expensive, check
622 # checksum first
623 if (1) {
624 $md5 =
625 join "\x00",
626 $processversion,
627 map {
628 cf::cede_to_tick;
629 ($src->[$_], Digest::MD5::md5_hex $data[$_])
630 } 0.. $#$src;
631
632
633 my $dbmd5 = db_get cache => "$id/md5";
634 if ($dbmd5 eq $md5) {
635 db_put cache => "$id/meta", $meta;
636
637 return db_get cache => "$id/data";
638 }
639 }
640
641 my $t1 = Time::HiRes::time;
642 my $data = $process->(\@data);
643 my $t2 = Time::HiRes::time;
644
645 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
646
647 db_put cache => "$id/data", $data;
648 db_put cache => "$id/md5" , $md5;
649 db_put cache => "$id/meta", $meta;
650
651 return $data;
652 }
653
654 db_get cache => "$id/data"
397} 655}
398 656
399=item cf::datalog type => key => value, ... 657=item cf::datalog type => key => value, ...
400 658
401Log a datalog packet of the given type with the given key-value pairs. 659Log a datalog packet of the given type with the given key-value pairs.
… …
419attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
421 679
422In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
423C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 682Deliantra).
425 683
426=over 4 684=over 4
427 685
428=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
429 687
… …
592 $registry = $CB_TYPE[$object_type] ||= []; 850 $registry = $CB_TYPE[$object_type] ||= [];
593 851
594 } elsif ($type eq "subtype") { 852 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 853 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 854 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 855 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 856
599 } elsif ($type eq "package") { 857 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 858 my $pkg = shift @arg;
601 859
602 while (my ($name, $id) = each %cb_id) { 860 while (my ($name, $id) = each %cb_id) {
… …
631 _attach $registry, $klass, @attach; 889 _attach $registry, $klass, @attach;
632 } 890 }
633 891
634 $obj->{$name} = \%arg; 892 $obj->{$name} = \%arg;
635 } else { 893 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 894 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 895 }
638 896
639 $obj->{_attachment}{$name} = undef; 897 $obj->{_attachment}{$name} = undef;
640} 898}
641 899
… …
643 if (ref $_[0]) { 901 if (ref $_[0]) {
644 _object_attach @_; 902 _object_attach @_;
645 } else { 903 } else {
646 _attach shift->_attach_registry, @_; 904 _attach shift->_attach_registry, @_;
647 } 905 }
906 _recalc_want;
648}; 907};
649 908
650# all those should be optimised 909# all those should be optimised
651sub cf::attachable::detach { 910sub cf::attachable::detach {
652 my ($obj, $name) = @_; 911 my ($obj, $name) = @_;
… …
655 delete $obj->{_attachment}{$name}; 914 delete $obj->{_attachment}{$name};
656 reattach ($obj); 915 reattach ($obj);
657 } else { 916 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 917 Carp::croak "cannot, currently, detach class attachments";
659 } 918 }
919 _recalc_want;
660}; 920};
661 921
662sub cf::attachable::attached { 922sub cf::attachable::attached {
663 my ($obj, $name) = @_; 923 my ($obj, $name) = @_;
664 924
… …
679 "; 939 ";
680 die if $@; 940 die if $@;
681} 941}
682 942
683our $override; 943our $override;
684our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 944our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
685 945
686sub override { 946sub override {
687 $override = 1; 947 $override = 1;
688 @invoke_results = (); 948 @INVOKE_RESULTS = (@_);
689} 949}
690 950
691sub do_invoke { 951sub do_invoke {
692 my $event = shift; 952 my $event = shift;
693 my $callbacks = shift; 953 my $callbacks = shift;
694 954
695 @invoke_results = (); 955 @INVOKE_RESULTS = ();
696 956
697 local $override; 957 local $override;
698 958
699 for (@$callbacks) { 959 for (@$callbacks) {
700 eval { &{$_->[1]} }; 960 eval { &{$_->[1]} };
… …
709 } 969 }
710 970
711 0 971 0
712} 972}
713 973
714=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
715 975
716=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
717 977
718Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
719 979
720This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 980This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
721removed in future versions), and there is no public API to access override 981removed in future versions), and there is no public API to access override
722results (if you must, access C<@cf::invoke_results> directly). 982results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 983
724=back 984=back
725 985
726=cut 986=cut
727 987
728############################################################################# 988#############################################################################
729# object support 989# object support
990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
1024sub _can_merge {
1025 my ($ob1, $ob2) = @_;
1026
1027 ++$SLOW_MERGES;#d#
1028
1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
1031}
730 1032
731sub reattach { 1033sub reattach {
732 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 1035 my ($obj) = @_;
734 1036
… …
755cf::attachable->attach ( 1057cf::attachable->attach (
756 prio => -1000000, 1058 prio => -1000000,
757 on_instantiate => sub { 1059 on_instantiate => sub {
758 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
759 1061
760 $data = from_json $data; 1062 $data = decode_json $data;
761 1063
762 for (@$data) { 1064 for (@$data) {
763 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
764 1066
765 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
… …
781sub object_freezer_save { 1083sub object_freezer_save {
782 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
783 1085
784 sync_job { 1086 sync_job {
785 if (length $$rdata) { 1087 if (length $$rdata) {
1088 utf8::decode (my $decname = $filename);
786 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
787 $filename, length $$rdata, scalar @$objs; 1090 $decname, length $$rdata, scalar @$objs;
788 1091
789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
790 chmod SAVE_MODE, $fh; 1093 chmod SAVE_MODE, $fh;
791 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
792 aio_fsync $fh if $cf::USE_FSYNC; 1095 aio_fsync $fh if $cf::USE_FSYNC;
793 close $fh; 1096 close $fh;
794 1097
795 if (@$objs) { 1098 if (@$objs) {
796 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
797 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
798 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
799 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
800 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
801 close $fh; 1104 close $fh;
802 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
803 } 1106 }
… …
811 } 1114 }
812 } else { 1115 } else {
813 aio_unlink $filename; 1116 aio_unlink $filename;
814 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
815 } 1118 }
816 } 1119 };
817} 1120}
818 1121
819sub object_freezer_as_string { 1122sub object_freezer_as_string {
820 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
821 1124
… …
833 or return; 1136 or return;
834 1137
835 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
836 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
837 or return; 1140 or return;
1141
838 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
839 } 1144 }
840 1145
1146 utf8::decode (my $decname = $filename);
841 warn sprintf "loading %s (%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1148 $decname, length $data, scalar @{$av || []};
1149
843 return ($data, $av); 1150 ($data, $av)
844} 1151}
1152
1153=head2 COMMAND CALLBACKS
1154
1155=over 4
1156
1157=cut
845 1158
846############################################################################# 1159#############################################################################
847# command handling &c 1160# command handling &c
848 1161
849=item cf::register_command $name => \&callback($ob,$args); 1162=item cf::register_command $name => \&callback($ob,$args);
… …
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1175 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1176}
864 1177
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1178=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1179
867Register a callbackf ro execution when the client sends an extcmd packet. 1180Register a callback for execution when the client sends an (synchronous)
1181extcmd packet. Ext commands will be processed in the order they are
1182received by the server, like other user commands. The first argument is
1183the logged-in player. Ext commands can only be processed after a player
1184has logged in successfully.
868 1185
869If the callback returns something, it is sent back as if reply was being 1186If the callback returns something, it is sent back as if reply was being
870called. 1187called.
871 1188
1189=item cf::register_exticmd $name => \&callback($ns,$packet);
1190
1191Register a callback for execution when the client sends an (asynchronous)
1192exticmd packet. Exti commands are processed by the server as soon as they
1193are received, i.e. out of order w.r.t. other commands. The first argument
1194is a client socket. Exti commands can be received anytime, even before
1195log-in.
1196
1197If the callback returns something, it is sent back as if reply was being
1198called.
1199
872=cut 1200=cut
873 1201
874sub register_extcmd { 1202sub register_extcmd {
875 my ($name, $cb) = @_; 1203 my ($name, $cb) = @_;
876 1204
877 $EXTCMD{$name} = $cb; 1205 $EXTCMD{$name} = $cb;
1206}
1207
1208sub register_exticmd {
1209 my ($name, $cb) = @_;
1210
1211 $EXTICMD{$name} = $cb;
878} 1212}
879 1213
880cf::player->attach ( 1214cf::player->attach (
881 on_command => sub { 1215 on_command => sub {
882 my ($pl, $name, $params) = @_; 1216 my ($pl, $name, $params) = @_;
… …
891 cf::override; 1225 cf::override;
892 }, 1226 },
893 on_extcmd => sub { 1227 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1228 my ($pl, $buf) = @_;
895 1229
896 my $msg = eval { from_json $buf }; 1230 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1231
898 if (ref $msg) { 1232 if (ref $msg) {
1233 my ($type, $reply, @payload) =
1234 "ARRAY" eq ref $msg
1235 ? @$msg
1236 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1237
1238 my @reply;
1239
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1240 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1241 @reply = $cb->($pl, @payload);
901 $pl->ext_reply ($msg->{msgid}, %reply);
902 }
903 } 1242 }
1243
1244 $pl->ext_reply ($reply, @reply)
1245 if $reply;
1246
904 } else { 1247 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1248 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1249 }
907 1250
908 cf::override; 1251 cf::override;
909 }, 1252 },
910); 1253);
911 1254
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1255sub load_extensions {
1256 cf::sync_job {
1257 my %todo;
1258
947 for my $ext (<$LIBDIR/*.ext>) { 1259 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1260 next unless -r $path;
949 eval { 1261
950 load_extension $ext; 1262 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1263 my $base = $1;
1264 my $pkg = $1;
1265 $pkg =~ s/[^[:word:]]/_/g;
1266 $pkg = "ext::$pkg";
1267
1268 open my $fh, "<:utf8", $path
1269 or die "$path: $!";
1270
1271 my $source = do { local $/; <$fh> };
1272
1273 my %ext = (
1274 path => $path,
1275 base => $base,
1276 pkg => $pkg,
1277 );
1278
1279 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281
1282 $ext{source} =
1283 "package $pkg; use strict; use utf8;\n"
1284 . "#line 1 \"$path\"\n{\n"
1285 . $source
1286 . "\n};\n1";
1287
1288 $todo{$base} = \%ext;
1289 }
1290
1291 my %done;
1292 while (%todo) {
1293 my $progress;
1294
1295 while (my ($k, $v) = each %todo) {
1296 for (split /,\s*/, $v->{meta}{depends}) {
1297 goto skip
1298 unless exists $done{$_};
1299 }
1300
1301 warn "... loading '$k' into '$v->{pkg}'\n";
1302
1303 unless (eval $v->{source}) {
1304 my $msg = $@ ? "$v->{path}: $@\n"
1305 : "$v->{base}: extension inactive.\n";
1306
1307 if (exists $v->{meta}{mandatory}) {
1308 warn $msg;
1309 warn "mandatory extension failed to load, exiting.\n";
1310 exit 1;
1311 }
1312
1313 warn $msg;
1314 }
1315
1316 $done{$k} = delete $todo{$k};
1317 push @EXTS, $v->{pkg};
1318 $progress = 1;
951 1 1319 }
952 } or warn "$ext not loaded: $@"; 1320
1321 skip:
1322 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1323 unless $progress;
1324 }
953 } 1325 };
954} 1326}
955 1327
956############################################################################# 1328#############################################################################
957 1329
1330=back
1331
958=head2 CORE EXTENSIONS 1332=head2 CORE EXTENSIONS
959 1333
960Functions and methods that extend core crossfire objects. 1334Functions and methods that extend core crossfire objects.
961 1335
962=cut 1336=cut
… …
966use Coro::AIO; 1340use Coro::AIO;
967 1341
968=head3 cf::player 1342=head3 cf::player
969 1343
970=over 4 1344=over 4
1345
1346=item cf::player::num_playing
1347
1348Returns the official number of playing players, as per the Crossfire metaserver rules.
1349
1350=cut
1351
1352sub num_playing {
1353 scalar grep
1354 $_->ob->map
1355 && !$_->hidden
1356 && !$_->ob->flag (cf::FLAG_WIZ),
1357 cf::player::list
1358}
971 1359
972=item cf::player::find $login 1360=item cf::player::find $login
973 1361
974Returns the given player object, loading it if necessary (might block). 1362Returns the given player object, loading it if necessary (might block).
975 1363
… …
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1399 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1400 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1401 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1015 1403
1016 my $pl = load_pl path $login 1404 my $f = new_from_file cf::object::thawer path $login
1017 or return; 1405 or return;
1406
1407 my $pl = cf::player::load_pl $f
1408 or return;
1409 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs;
1018 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
1019 } 1412 }
1020 } 1413 }
1021} 1414}
1022 1415
… …
1032 1425
1033 aio_mkdir playerdir $pl, 0770; 1426 aio_mkdir playerdir $pl, 0770;
1034 $pl->{last_save} = $cf::RUNTIME; 1427 $pl->{last_save} = $cf::RUNTIME;
1035 1428
1036 $pl->save_pl ($path); 1429 $pl->save_pl ($path);
1037 Coro::cede; 1430 cf::cede_to_tick;
1038} 1431}
1039 1432
1040sub new($) { 1433sub new($) {
1041 my ($login) = @_; 1434 my ($login) = @_;
1042 1435
… …
1046 $self->{deny_save} = 1; 1439 $self->{deny_save} = 1;
1047 1440
1048 $cf::PLAYER{$login} = $self; 1441 $cf::PLAYER{$login} = $self;
1049 1442
1050 $self 1443 $self
1444}
1445
1446=item $player->send_msg ($channel, $msg, $color, [extra...])
1447
1448=cut
1449
1450sub send_msg {
1451 my $ns = shift->ns
1452 or return;
1453 $ns->send_msg (@_);
1051} 1454}
1052 1455
1053=item $pl->quit_character 1456=item $pl->quit_character
1054 1457
1055Nukes the player without looking back. If logged in, the connection will 1458Nukes the player without looking back. If logged in, the connection will
… …
1110 or return []; 1513 or return [];
1111 1514
1112 my @logins; 1515 my @logins;
1113 1516
1114 for my $login (@$dirs) { 1517 for my $login (@$dirs) {
1518 my $path = path $login;
1519
1520 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") {
1115 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1116 aio_read $fh, 0, 512, my $buf, 0 or next; 1523 aio_read $fh, 0, 512, my $buf, 0 or next;
1117 $buf !~ /^password -------------$/m or next; # official not-valid tag 1524 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 }
1118 1526
1119 utf8::decode $login; 1527 utf8::decode $login;
1120 push @logins, $login; 1528 push @logins, $login;
1121 } 1529 }
1122 1530
… …
1149 } 1557 }
1150 1558
1151 \@paths 1559 \@paths
1152} 1560}
1153 1561
1562=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1563
1564Expand crossfire pod fragments into protocol xml.
1565
1566=cut
1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1579sub expand_cfpod {
1580 my ($self, $pod) = @_;
1581
1582 my $xml;
1583
1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1587
1588 $group =~ s/&/&amp;/g;
1589 $group =~ s/</&lt;/g;
1590
1591 $xml .= $group;
1592 } elsif ($pod =~ m%\G
1593 ([BCGHITU])
1594 <
1595 (?:
1596 ([^<>]*) (?{ $group = $^N })
1597 | < $interior >
1598 )
1599 >
1600 %gcsx
1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621 "")
1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1633
1634 for ($xml) {
1635 # create single paragraphs (very hackish)
1636 s/(?<=\S)\n(?=\w)/ /g;
1637
1638 # compress some whitespace
1639 s/\s+\n/\n/g; # ws line-ends
1640 s/\n\n+/\n/g; # double lines
1641 s/^\n+//; # beginning lines
1642 s/\n+$//; # ending lines
1643 }
1644
1645 $xml
1646}
1647
1648no re 'eval';
1649
1650sub hintmode {
1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1652 $_[0]{hintmode}
1653}
1654
1154=item $player->ext_reply ($msgid, %msg) 1655=item $player->ext_reply ($msgid, @msg)
1155 1656
1156Sends an ext reply to the player. 1657Sends an ext reply to the player.
1157 1658
1158=cut 1659=cut
1159 1660
1160sub ext_reply($$%) { 1661sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1662 my ($self, $id, @msg) = @_;
1162 1663
1163 $msg{msgid} = $id; 1664 $self->ns->ext_reply ($id, @msg)
1164
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1665}
1167 1666
1168=item $player->ext_event ($type, %msg) 1667=item $player->ext_msg ($type, @msg)
1169 1668
1170Sends an ext event to the client. 1669Sends an ext event to the client.
1171 1670
1172=cut 1671=cut
1173 1672
1174sub ext_event($$%) { 1673sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1674 my ($self, $type, @msg) = @_;
1176 1675
1177 $self->ns->ext_event ($type, %msg); 1676 $self->ns->ext_msg ($type, @msg);
1178} 1677}
1179 1678
1180=head3 cf::region 1679=head3 cf::region
1181 1680
1182=over 4 1681=over 4
… …
1185 1684
1186package cf::region; 1685package cf::region;
1187 1686
1188=item cf::region::find_by_path $path 1687=item cf::region::find_by_path $path
1189 1688
1190Tries to decuce the probable region for a map knowing only its path. 1689Tries to decuce the likely region for a map knowing only its path.
1191 1690
1192=cut 1691=cut
1193 1692
1194sub find_by_path($) { 1693sub find_by_path($) {
1195 my ($path) = @_; 1694 my ($path) = @_;
1196 1695
1197 my ($match, $specificity); 1696 my ($match, $specificity);
1198 1697
1199 for my $region (list) { 1698 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1699 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1700 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1701 if $region->specificity > $specificity;
1203 } 1702 }
1204 } 1703 }
1205 1704
… …
1269 my ($self, $merge) = @_; 1768 my ($self, $merge) = @_;
1270 1769
1271 # we have to keep some variables in memory intact 1770 # we have to keep some variables in memory intact
1272 local $self->{path}; 1771 local $self->{path};
1273 local $self->{load_path}; 1772 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1773
1277 $self->SUPER::thawer_merge ($merge); 1774 $self->SUPER::thawer_merge ($merge);
1278} 1775}
1279 1776
1280sub normalise { 1777sub normalise {
… …
1327 $self->init; # pass $1 etc. 1824 $self->init; # pass $1 etc.
1328 return $self; 1825 return $self;
1329 } 1826 }
1330 } 1827 }
1331 1828
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1829 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1830 ()
1334} 1831}
1335 1832
1336sub init { 1833sub init {
1337 my ($self) = @_; 1834 my ($self) = @_;
… …
1380 1877
1381 $_->change_map_light ($change) 1878 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1879 for grep $_->outdoor, values %cf::MAP;
1383} 1880}
1384 1881
1882sub decay_objects {
1883 my ($self) = @_;
1884
1885 return if $self->{deny_reset};
1886
1887 $self->do_decay_objects;
1888}
1889
1385sub unlink_save { 1890sub unlink_save {
1386 my ($self) = @_; 1891 my ($self) = @_;
1387 1892
1388 utf8::encode (my $save = $self->save_path); 1893 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1894 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1392 1897
1393sub load_header_from($) { 1898sub load_header_from($) {
1394 my ($self, $path) = @_; 1899 my ($self, $path) = @_;
1395 1900
1396 utf8::encode $path; 1901 utf8::encode $path;
1397 #aio_open $path, O_RDONLY, 0 1902 my $f = new_from_file cf::object::thawer $path
1398 # or return;
1399
1400 $self->_load_header ($path)
1401 or return; 1903 or return;
1904
1905 $self->_load_header ($f)
1906 or return;
1907
1908 local $MAP_LOADING{$self->{path}} = $self;
1909 $f->resolve_delayed_derefs;
1402 1910
1403 $self->{load_path} = $path; 1911 $self->{load_path} = $path;
1404 1912
1405 1 1913 1
1406} 1914}
… …
1445 $self->load_header_orig 1953 $self->load_header_orig
1446 or return; 1954 or return;
1447 $self->prepare_orig; 1955 $self->prepare_orig;
1448 } 1956 }
1449 1957
1958 $self->{deny_reset} = 1
1959 if $self->no_reset;
1960
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1961 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1962 unless $self->default_region;
1452 1963
1453 1 1964 1
1454} 1965}
… …
1457sub find { 1968sub find {
1458 my ($path, $origin) = @_; 1969 my ($path, $origin) = @_;
1459 1970
1460 $path = normalise $path, $origin && $origin->path; 1971 $path = normalise $path, $origin && $origin->path;
1461 1972
1973 cf::lock_wait "map_data:$path";#d#remove
1462 cf::lock_wait "map_find:$path"; 1974 cf::lock_wait "map_find:$path";
1463 1975
1464 $cf::MAP{$path} || do { 1976 $cf::MAP{$path} || do {
1465 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1466 my $map = new_from_path cf::map $path 1980 my $map = new_from_path cf::map $path
1467 or return; 1981 or return;
1468 1982
1469 $map->{last_save} = $cf::RUNTIME; 1983 $map->{last_save} = $cf::RUNTIME;
1470 1984
1471 $map->load_header 1985 $map->load_header
1472 or return; 1986 or return;
1473 1987
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1989 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1990 #$cf::WAIT_FOR_TICK->wait;
1991 undef $guard1;
1992 undef $guard2;
1477 $map->reset; 1993 $map->reset;
1478 undef $guard;
1479 return find $path; 1994 return find $path;
1480 } 1995 }
1481 1996
1482 $cf::MAP{$path} = $map 1997 $cf::MAP{$path} = $map
1483 } 1998 }
… …
1492 local $self->{deny_reset} = 1; # loading can take a long time 2007 local $self->{deny_reset} = 1; # loading can take a long time
1493 2008
1494 my $path = $self->{path}; 2009 my $path = $self->{path};
1495 2010
1496 { 2011 {
1497 my $guard = cf::lock_acquire "map_load:$path"; 2012 my $guard = cf::lock_acquire "map_data:$path";
1498 2013
2014 return unless $self->valid;
1499 return if $self->in_memory != cf::MAP_SWAPPED; 2015 return unless $self->in_memory == cf::MAP_SWAPPED;
1500 2016
1501 $self->in_memory (cf::MAP_LOADING); 2017 $self->in_memory (cf::MAP_LOADING);
1502 2018
1503 $self->alloc; 2019 $self->alloc;
1504 2020
1505 $self->pre_load; 2021 $self->pre_load;
1506 Coro::cede; 2022 cf::cede_to_tick;
1507 2023
2024 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block;
1508 $self->_load_objects ($self->{load_path}, 1) 2026 $self->_load_objects ($f)
1509 or return; 2027 or return;
1510 2028
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original}; 2030 if delete $self->{load_original};
1513 2031
1514 if (my $uniq = $self->uniq_path) { 2032 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq; 2033 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) { 2034 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) {
1517 $self->clear_unique_items; 2036 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0); 2037 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs;
2039 }
1519 } 2040 }
1520 } 2041 }
1521 2042
1522 Coro::cede; 2043 $f->resolve_delayed_derefs;
2044
2045 cf::cede_to_tick;
1523 # now do the right thing for maps 2046 # now do the right thing for maps
1524 $self->link_multipart_objects; 2047 $self->link_multipart_objects;
1525 $self->difficulty ($self->estimate_difficulty) 2048 $self->difficulty ($self->estimate_difficulty)
1526 unless $self->difficulty; 2049 unless $self->difficulty;
1527 Coro::cede; 2050 cf::cede_to_tick;
1528 2051
1529 unless ($self->{deny_activate}) { 2052 unless ($self->{deny_activate}) {
1530 $self->decay_objects; 2053 $self->decay_objects;
1531 $self->fix_auto_apply; 2054 $self->fix_auto_apply;
1532 $self->update_buttons; 2055 $self->update_buttons;
1533 Coro::cede; 2056 cf::cede_to_tick;
1534 $self->set_darkness_map; 2057 $self->set_darkness_map;
1535 Coro::cede; 2058 cf::cede_to_tick;
1536 $self->activate; 2059 $self->activate;
1537 } 2060 }
2061
2062 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME);
1538 2064
1539 $self->in_memory (cf::MAP_IN_MEMORY); 2065 $self->in_memory (cf::MAP_IN_MEMORY);
1540 } 2066 }
1541 2067
1542 $self->post_load; 2068 $self->post_load;
… …
1546 my ($self, $ob) = @_; 2072 my ($self, $ob) = @_;
1547 2073
1548 return find "~" . $ob->name . "/" . $self->{path} 2074 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 2075 if $self->per_player;
1550 2076
2077# return find "?party/" . $ob->name . "/" . $self->{path}
2078# if $self->per_party;
2079
1551 $self 2080 $self
1552} 2081}
1553 2082
1554# find and load all maps in the 3x3 area around a map 2083# find and load all maps in the 3x3 area around a map
1555sub load_diag { 2084sub load_neighbours {
1556 my ($map) = @_; 2085 my ($map) = @_;
1557 2086
1558 my @diag; # diagonal neighbours 2087 my @neigh; # diagonal neighbours
1559 2088
1560 for (0 .. 3) { 2089 for (0 .. 3) {
1561 my $neigh = $map->tile_path ($_) 2090 my $neigh = $map->tile_path ($_)
1562 or next; 2091 or next;
1563 $neigh = find $neigh, $map 2092 $neigh = find $neigh, $map
1564 or next; 2093 or next;
1565 $neigh->load; 2094 $neigh->load;
1566 2095
2096 push @neigh,
1567 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2097 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1568 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2098 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1569 } 2099 }
1570 2100
1571 for (@diag) { 2101 for (grep defined $_->[0], @neigh) {
2102 my ($path, $origin) = @$_;
1572 my $neigh = find @$_ 2103 my $neigh = find $path, $origin
1573 or next; 2104 or next;
1574 $neigh->load; 2105 $neigh->load;
1575 } 2106 }
1576} 2107}
1577 2108
… …
1582} 2113}
1583 2114
1584sub do_load_sync { 2115sub do_load_sync {
1585 my ($map) = @_; 2116 my ($map) = @_;
1586 2117
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main;
2120
1587 cf::sync_job { $map->load }; 2121 cf::sync_job { $map->load };
1588} 2122}
1589 2123
1590our %MAP_PREFETCH; 2124our %MAP_PREFETCH;
1591our $MAP_PREFETCHER = undef; 2125our $MAP_PREFETCHER = undef;
1592 2126
1593sub find_async { 2127sub find_async {
1594 my ($path, $origin) = @_; 2128 my ($path, $origin, $load) = @_;
1595 2129
1596 $path = normalise $path, $origin && $origin->{path}; 2130 $path = normalise $path, $origin && $origin->{path};
1597 2131
1598 if (my $map = $cf::MAP{$path}) { 2132 if (my $map = $cf::MAP{$path}) {
1599 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1600 } 2134 }
1601 2135
1602 undef $MAP_PREFETCH{$path}; 2136 $MAP_PREFETCH{$path} |= $load;
2137
1603 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
1604 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
1606 my $map = find $path 2143 if (my $map = find $k) {
1607 or next;
1608 $map->load; 2144 $map->load if $v;
2145 }
1609 2146
1610 delete $MAP_PREFETCH{$path}; 2147 delete $MAP_PREFETCH{$k};
1611 } 2148 }
1612 } 2149 }
1613 undef $MAP_PREFETCHER; 2150 undef $MAP_PREFETCHER;
1614 }; 2151 };
1615 $MAP_PREFETCHER->prio (6); 2152 $MAP_PREFETCHER->prio (6);
… …
1618} 2155}
1619 2156
1620sub save { 2157sub save {
1621 my ($self) = @_; 2158 my ($self) = @_;
1622 2159
1623 my $lock = cf::lock_acquire "map_data:" . $self->path; 2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
1624 2161
1625 $self->{last_save} = $cf::RUNTIME; 2162 $self->{last_save} = $cf::RUNTIME;
1626 2163
1627 return unless $self->dirty; 2164 return unless $self->dirty;
1628 2165
… …
1634 return if $self->{deny_save}; 2171 return if $self->{deny_save};
1635 2172
1636 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
1637 2174
1638 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
1639 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
1640 }; 2178 };
1641 2179
1642 if ($uniq) { 2180 if ($uniq) {
1643 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1651 my ($self) = @_; 2189 my ($self) = @_;
1652 2190
1653 # save first because save cedes 2191 # save first because save cedes
1654 $self->save; 2192 $self->save;
1655 2193
1656 my $lock = cf::lock_acquire "map_data:" . $self->path; 2194 my $lock = cf::lock_acquire "map_data:$self->{path}";
1657 2195
1658 return if $self->players; 2196 return if $self->players;
1659 return if $self->in_memory != cf::MAP_IN_MEMORY; 2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
1660 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1661 2199
2200 $self->in_memory (cf::MAP_SWAPPED);
2201
2202 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP;
1662 $self->clear; 2204 $self->clear;
1663 $self->in_memory (cf::MAP_SWAPPED);
1664} 2205}
1665 2206
1666sub reset_at { 2207sub reset_at {
1667 my ($self) = @_; 2208 my ($self) = @_;
1668 2209
1669 # TODO: safety, remove and allow resettable per-player maps 2210 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 2211 return 1e99 if $self->{deny_reset};
1672 2212
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2213 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2214 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 2215
… …
1686 my ($self) = @_; 2226 my ($self) = @_;
1687 2227
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2228 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 2229
1690 return if $self->players; 2230 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 2231
1693 warn "resetting map ", $self->path;#d# 2232 warn "resetting map ", $self->path;
1694 2233
1695 $self->in_memory (cf::MAP_SWAPPED); 2234 $self->in_memory (cf::MAP_SWAPPED);
1696 2235
1697 # need to save uniques path 2236 # need to save uniques path
1698 unless ($self->{deny_save}) { 2237 unless ($self->{deny_save}) {
… …
1702 if $uniq; 2241 if $uniq;
1703 } 2242 }
1704 2243
1705 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1706 2245
2246 $self->deactivate;
2247 $_->clear_links_to ($self) for values %cf::MAP;
1707 $self->clear; 2248 $self->clear;
1708
1709 $_->clear_links_to ($self) for values %cf::MAP;
1710 2249
1711 $self->unlink_save; 2250 $self->unlink_save;
1712 $self->destroy; 2251 $self->destroy;
1713} 2252}
1714 2253
1715my $nuke_counter = "aaaa"; 2254my $nuke_counter = "aaaa";
1716 2255
1717sub nuke { 2256sub nuke {
1718 my ($self) = @_; 2257 my ($self) = @_;
1719 2258
2259 {
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
1720 delete $cf::MAP{$self->path}; 2262 delete $cf::MAP{$self->path};
1721 2263
1722 $self->unlink_save; 2264 $self->unlink_save;
1723 2265
1724 bless $self, "cf::map"; 2266 bless $self, "cf::map";
1725 delete $self->{deny_reset}; 2267 delete $self->{deny_reset};
1726 $self->{deny_save} = 1; 2268 $self->{deny_save} = 1;
1727 $self->reset_timeout (1); 2269 $self->reset_timeout (1);
1728 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1729 2271
1730 $cf::MAP{$self->path} = $self; 2272 $cf::MAP{$self->path} = $self;
2273 }
1731 2274
1732 $self->reset; # polite request, might not happen 2275 $self->reset; # polite request, might not happen
2276}
2277
2278=item $maps = cf::map::tmp_maps
2279
2280Returns an arrayref with all map paths of currently instantiated and saved
2281maps. May block.
2282
2283=cut
2284
2285sub tmp_maps() {
2286 [
2287 map {
2288 utf8::decode $_;
2289 /\.map$/
2290 ? normalise $_
2291 : ()
2292 } @{ aio_readdir $TMPDIR or [] }
2293 ]
2294}
2295
2296=item $maps = cf::map::random_maps
2297
2298Returns an arrayref with all map paths of currently instantiated and saved
2299random maps. May block.
2300
2301=cut
2302
2303sub random_maps() {
2304 [
2305 map {
2306 utf8::decode $_;
2307 /\.map$/
2308 ? normalise "?random/$_"
2309 : ()
2310 } @{ aio_readdir $RANDOMDIR or [] }
2311 ]
1733} 2312}
1734 2313
1735=item cf::map::unique_maps 2314=item cf::map::unique_maps
1736 2315
1737Returns an arrayref of paths of all shared maps that have 2316Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2317instantiated unique items. May block.
1739 2318
1740=cut 2319=cut
1741 2320
1742sub unique_maps() { 2321sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2322 [
1744 or return; 2323 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2324 utf8::decode $_;
1750 next if /\.pst$/; 2325 /\.map$/
1751 next unless /^$PATH_SEP/o; 2326 ? normalise $_
1752 2327 : ()
1753 push @paths, cf::map::normalise $_; 2328 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2329 ]
1755
1756 \@paths
1757} 2330}
1758 2331
1759package cf; 2332package cf;
1760 2333
1761=back 2334=back
… …
1779 map { $_, inv_recursive_ $_->inv } @_ 2352 map { $_, inv_recursive_ $_->inv } @_
1780} 2353}
1781 2354
1782sub inv_recursive { 2355sub inv_recursive {
1783 inv_recursive_ inv $_[0] 2356 inv_recursive_ inv $_[0]
2357}
2358
2359=item $ref = $ob->ref
2360
2361creates and returns a persistent reference to an objetc that can be stored as a string.
2362
2363=item $ob = cf::object::deref ($refstring)
2364
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block.
2367
2368=cut
2369
2370sub deref {
2371 my ($ref) = @_;
2372
2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2374 my ($uuid, $name) = ($1, $2);
2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2376 or return;
2377 $pl->ob->uuid eq $uuid
2378 or return;
2379
2380 $pl->ob
2381 } else {
2382 warn "$ref: cannot resolve object reference\n";
2383 undef
2384 }
1784} 2385}
1785 2386
1786package cf; 2387package cf;
1787 2388
1788=back 2389=back
… …
1807 2408
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2409 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2410
1810 if ($self->{record_replies}) { 2411 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2412 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2413
1812 } else { 2414 } else {
2415 my $pl = $self->contr;
2416
2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2418 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420
2421 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2423 $self->message ($msg, $flags);
2424 }
1815 } 2425 }
2426}
2427
2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2429
2430=cut
2431
2432sub cf::object::send_msg {
2433 my $pl = shift->contr
2434 or return;
2435 $pl->send_msg (@_);
1816} 2436}
1817 2437
1818=item $player_object->may ("access") 2438=item $player_object->may ("access")
1819 2439
1820Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
… …
1862} 2482}
1863 2483
1864sub cf::object::player::enter_link { 2484sub cf::object::player::enter_link {
1865 my ($self) = @_; 2485 my ($self) = @_;
1866 2486
2487 $self->deactivate_recursive;
2488
1867 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2489 return if UNIVERSAL::isa $self->map, "ext::map_link";
1868 2490
1869 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1870 if $self->map; 2492 if $self->map && $self->map->{path} ne "{link}";
1871 2493
1872 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2494 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1873} 2495}
1874 2496
1875sub cf::object::player::leave_link { 2497sub cf::object::player::leave_link {
1876 my ($self, $map, $x, $y) = @_; 2498 my ($self, $map, $x, $y) = @_;
2499
2500 return unless $self->contr->active;
1877 2501
1878 my $link_pos = delete $self->{_link_pos}; 2502 my $link_pos = delete $self->{_link_pos};
1879 2503
1880 unless ($map) { 2504 unless ($map) {
1881 # restore original map position 2505 # restore original map position
… …
1895 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
1896 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
1897 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
1898 2522
1899 $map->load; 2523 $map->load;
1900 $map->load_diag; 2524 $map->load_neighbours;
1901 2525
1902 return unless $self->contr->active; 2526 return unless $self->contr->active;
1903 $self->activate_recursive; 2527 $self->activate_recursive;
1904 2528
1905 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1906 $self->enter_map ($map, $x, $y); 2530 $self->enter_map ($map, $x, $y);
1907} 2531}
1908 2532
1909cf::player->attach ( 2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1910 on_logout => sub {
1911 my ($pl) = @_;
1912 2534
1913 # abort map switching before logout 2535Moves the player to the given map-path and coordinates by first freezing
1914 if ($pl->ob->{_link_pos}) { 2536her, loading and preparing them map, calling the provided $check callback
1915 cf::sync_job { 2537that has to return the map if sucecssful, and then unfreezes the player on
1916 $pl->ob->leave_link 2538the new (success) or old (failed) map position. In either case, $done will
1917 }; 2539be called at the end of this process.
1918 }
1919 },
1920 on_login => sub {
1921 my ($pl) = @_;
1922 2540
1923 # try to abort aborted map switching on player login :)
1924 # should happen only on crashes
1925 if ($pl->ob->{_link_pos}) {
1926 $pl->ob->enter_link;
1927 (async {
1928 $pl->ob->reply (undef,
1929 "There was an internal problem at your last logout, "
1930 . "the server will try to bring you to your intended destination in a second.",
1931 cf::NDI_RED);
1932 # we need this sleep as the login has a concurrent enter_exit running
1933 # and this sleep increases chances of the player not ending up in scorn
1934 Coro::Timer::sleep 1;
1935 $pl->ob->leave_link;
1936 })->prio (2);
1937 }
1938 },
1939);
1940
1941=item $player_object->goto ($path, $x, $y)
1942
1943=cut 2541=cut
2542
2543our $GOTOGEN;
1944 2544
1945sub cf::object::player::goto { 2545sub cf::object::player::goto {
1946 my ($self, $path, $x, $y) = @_; 2546 my ($self, $path, $x, $y, $check, $done) = @_;
2547
2548 # do generation counting so two concurrent goto's will be executed in-order
2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1947 2550
1948 $self->enter_link; 2551 $self->enter_link;
1949 2552
1950 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2556 # *tag paths override both path and x|y
2557 if ($path =~ /^\*(.*)$/) {
2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2559 my $ob = $obs[rand @obs];
2560
2561 # see if we actually can go there
2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2568
2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2572 }
2573 }
2574
1951 my $map = eval { 2575 my $map = eval {
1952 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2577
2578 if ($map) {
1953 $map = $map->customise_for ($self) if $map; 2579 $map = $map->customise_for ($self);
2580 $map = $check->($map) if $check && $map;
2581 } else {
2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 }
2584
1954 $map 2585 $map
2586 };
2587
2588 if ($@) {
2589 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2590 LOG llevError | logBacktrace, Carp::longmess $@;
1955 } or 2591 }
1956 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1957 2592
2593 if ($gen == $self->{_goto_generation}) {
2594 delete $self->{_goto_generation};
1958 $self->leave_link ($map, $x, $y); 2595 $self->leave_link ($map, $x, $y);
2596 }
2597
2598 $done->() if $done;
1959 })->prio (1); 2599 })->prio (1);
1960} 2600}
1961 2601
1962=item $player_object->enter_exit ($exit_object) 2602=item $player_object->enter_exit ($exit_object)
1963 2603
… …
2000 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2001 } 2641 }
2002 2642
2003 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2004 2644
2005 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2006 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2007 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2008 2648
2009 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2010 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
… …
2032 my $hp = $exit->stats->hp; 2672 my $hp = $exit->stats->hp;
2033 my $sp = $exit->stats->sp; 2673 my $sp = $exit->stats->sp;
2034 2674
2035 $self->enter_link; 2675 $self->enter_link;
2036 2676
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2037 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2038 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2039 unless (eval { 2685 unless (eval {
2040 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2041 2687
2042 1; 2688 1;
… …
2068 2714
2069 utf8::encode $text; 2715 utf8::encode $text;
2070 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2716 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2071} 2717}
2072 2718
2719=item $client->send_msg ($channel, $msg, $color, [extra...])
2720
2721Send a drawinfo or msg packet to the client, formatting the msg for the
2722client if neccessary. C<$type> should be a string identifying the type of
2723the message, with C<log> being the default. If C<$color> is negative, suppress
2724the message unless the client supports the msg packet.
2725
2726=cut
2727
2728# non-persistent channels (usually the info channel)
2729our %CHANNEL = (
2730 "c/identify" => {
2731 id => "infobox",
2732 title => "Identify",
2733 reply => undef,
2734 tooltip => "Items recently identified",
2735 },
2736 "c/examine" => {
2737 id => "infobox",
2738 title => "Examine",
2739 reply => undef,
2740 tooltip => "Signs and other items you examined",
2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2778);
2779
2780sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_;
2782
2783 $msg = $self->pl->expand_cfpod ($msg);
2784
2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786
2787 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2796 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel)
2801 if $self->can_msg;
2802 }
2803
2804 $channel = $channel->{id};
2805 }
2806
2807 return unless @extra || length $msg;
2808
2809 if ($self->can_msg) {
2810 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF;
2813
2814 $self->send_packet ("msg " . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2816 } else {
2817 if ($color >= 0) {
2818 # replace some tags by gcfclient-compatible ones
2819 for ($msg) {
2820 1 while
2821 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826 }
2827
2828 $color &= cf::NDI_COLOR_MASK;
2829
2830 utf8::encode $msg;
2831
2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2835 } else {
2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2837 $self->send_packet ("drawinfo $color $msg")
2838 }
2839 }
2840 }
2841}
2842
2073=item $client->ext_event ($type, %msg) 2843=item $client->ext_msg ($type, @msg)
2074 2844
2075Sends an exti event to the client. 2845Sends an ext event to the client.
2076 2846
2077=cut 2847=cut
2078 2848
2079sub cf::client::ext_event($$%) { 2849sub cf::client::ext_msg($$@) {
2080 my ($self, $type, %msg) = @_; 2850 my ($self, $type, @msg) = @_;
2081 2851
2852 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove
2082 $msg{msgtype} = "event_$type"; 2855 push @msg, msgtype => "event_$type";
2083 $self->send_packet ("ext " . cf::to_json \%msg); 2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2858}
2859
2860=item $client->ext_reply ($msgid, @msg)
2861
2862Sends an ext reply to the client.
2863
2864=cut
2865
2866sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_;
2868
2869 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 }
2084} 2876}
2085 2877
2086=item $success = $client->query ($flags, "text", \&cb) 2878=item $success = $client->query ($flags, "text", \&cb)
2087 2879
2088Queues a query to the client, calling the given callback with 2880Queues a query to the client, calling the given callback with
2089the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2881the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2090C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2882C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2091 2883
2092Queries can fail, so check the return code. Or don't, as queries will become 2884Queries can fail, so check the return code. Or don't, as queries will
2093reliable at some point in the future. 2885become reliable at some point in the future.
2094 2886
2095=cut 2887=cut
2096 2888
2097sub cf::client::query { 2889sub cf::client::query {
2098 my ($self, $flags, $text, $cb) = @_; 2890 my ($self, $flags, $text, $cb) = @_;
… …
2106 utf8::encode $text; 2898 utf8::encode $text;
2107 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2899 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2108 2900
2109 $self->send_packet ($self->{query_queue}[0][0]) 2901 $self->send_packet ($self->{query_queue}[0][0])
2110 if @{ $self->{query_queue} } == 1; 2902 if @{ $self->{query_queue} } == 1;
2903
2904 1
2111} 2905}
2112 2906
2113cf::client->attach ( 2907cf::client->attach (
2908 on_connect => sub {
2909 my ($ns) = @_;
2910
2911 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2912 },
2114 on_reply => sub { 2913 on_reply => sub {
2115 my ($ns, $msg) = @_; 2914 my ($ns, $msg) = @_;
2116 2915
2117 # this weird shuffling is so that direct followup queries 2916 # this weird shuffling is so that direct followup queries
2118 # get handled first 2917 # get handled first
… …
2130 } else { 2929 } else {
2131 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2930 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2132 } 2931 }
2133 } 2932 }
2134 }, 2933 },
2934 on_exticmd => sub {
2935 my ($ns, $buf) = @_;
2936
2937 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2938
2939 if (ref $msg) {
2940 my ($type, $reply, @payload) =
2941 "ARRAY" eq ref $msg
2942 ? @$msg
2943 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2944
2945 my @reply;
2946
2947 if (my $cb = $EXTICMD{$type}) {
2948 @reply = $cb->($ns, @payload);
2949 }
2950
2951 $ns->ext_reply ($reply, @reply)
2952 if $reply;
2953
2954 } else {
2955 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2956 }
2957
2958 cf::override;
2959 },
2135); 2960);
2136 2961
2137=item $client->async (\&cb) 2962=item $client->async (\&cb)
2138 2963
2139Create a new coroutine, running the specified callback. The coroutine will 2964Create a new coroutine, running the specified callback. The coroutine will
… …
2180our $safe = new Safe "safe"; 3005our $safe = new Safe "safe";
2181our $safe_hole = new Safe::Hole; 3006our $safe_hole = new Safe::Hole;
2182 3007
2183$SIG{FPE} = 'IGNORE'; 3008$SIG{FPE} = 'IGNORE';
2184 3009
2185$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3010$safe->permit_only (Opcode::opset qw(
3011 :base_core :base_mem :base_orig :base_math
3012 grepstart grepwhile mapstart mapwhile
3013 sort time
3014));
2186 3015
2187# here we export the classes and methods available to script code 3016# here we export the classes and methods available to script code
2188 3017
2189=pod 3018=pod
2190 3019
2191The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2192 3021
2193 cf::object contr pay_amount pay_player map 3022 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr
3025
2194 cf::object::player player 3026 cf::object::player
2195 cf::player peaceful 3027 player
2196 cf::map trigger 3028
3029 cf::player
3030 peaceful
3031
3032 cf::map
3033 trigger
2197 3034
2198=cut 3035=cut
2199 3036
2200for ( 3037for (
2201 ["cf::object" => qw(contr pay_amount pay_player map)], 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race
3040 decrease_ob_nr destroy)],
2202 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2203 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2204 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2205) { 3044) {
2206 no strict 'refs'; 3045 no strict 'refs';
… …
2277=back 3116=back
2278 3117
2279=cut 3118=cut
2280 3119
2281############################################################################# 3120#############################################################################
2282
2283=head2 EXTENSION DATABASE SUPPORT
2284
2285Crossfire maintains a very simple database for extension use. It can
2286currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2287convert to/from binary).
2288
2289The parameter C<$family> should best start with the name of the extension
2290using it, it should be unique.
2291
2292=over 4
2293
2294=item $value = cf::db_get $family => $key
2295
2296Returns a single value from the database.
2297
2298=item cf::db_put $family => $key => $value
2299
2300Stores the given C<$value> in the family.
2301
2302=cut
2303
2304our $DB;
2305
2306sub db_init {
2307 unless ($DB) {
2308 $DB = BDB::db_create $DB_ENV;
2309
2310 cf::sync_job {
2311 eval {
2312 $DB->set_flags (BDB::CHKSUM);
2313
2314 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2315 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2316 cf::cleanup "db_open(db): $!" if $!;
2317 };
2318 cf::cleanup "db_open(db): $@" if $@;
2319 };
2320 }
2321}
2322
2323sub db_get($$) {
2324 my $key = "$_[0]/$_[1]";
2325
2326 cf::sync_job {
2327 BDB::db_get $DB, undef, $key, my $data;
2328
2329 $! ? ()
2330 : $data
2331 }
2332}
2333
2334sub db_put($$$) {
2335 BDB::dbreq_pri 4;
2336 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2337}
2338
2339=item cf::cache $id => [$paths...], $processversion => $process
2340
2341Generic caching function that returns the value of the resource $id,
2342caching and regenerating as required.
2343
2344This function can block.
2345
2346=cut
2347
2348sub cache {
2349 my ($id, $src, $processversion, $process) = @_;
2350
2351 my $meta =
2352 join "\x00",
2353 $processversion,
2354 map {
2355 aio_stat $_
2356 and Carp::croak "$_: $!";
2357
2358 ($_, (stat _)[7,9])
2359 } @$src;
2360
2361 my $dbmeta = db_get cache => "$id/meta";
2362 if ($dbmeta ne $meta) {
2363 # changed, we may need to process
2364
2365 my @data;
2366 my $md5;
2367
2368 for (0 .. $#$src) {
2369 0 <= aio_load $src->[$_], $data[$_]
2370 or Carp::croak "$src->[$_]: $!";
2371 }
2372
2373 # if processing is expensive, check
2374 # checksum first
2375 if (1) {
2376 $md5 =
2377 join "\x00",
2378 $processversion,
2379 map {
2380 Coro::cede;
2381 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2382 } 0.. $#$src;
2383
2384
2385 my $dbmd5 = db_get cache => "$id/md5";
2386 if ($dbmd5 eq $md5) {
2387 db_put cache => "$id/meta", $meta;
2388
2389 return db_get cache => "$id/data";
2390 }
2391 }
2392
2393 my $t1 = Time::HiRes::time;
2394 my $data = $process->(\@data);
2395 my $t2 = Time::HiRes::time;
2396
2397 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2398
2399 db_put cache => "$id/data", $data;
2400 db_put cache => "$id/md5" , $md5;
2401 db_put cache => "$id/meta", $meta;
2402
2403 return $data;
2404 }
2405
2406 db_get cache => "$id/data"
2407}
2408
2409=item fork_call { }, $args
2410
2411Executes the given code block with the given arguments in a seperate
2412process, returning the results. Everything must be serialisable with
2413Coro::Storable. May, of course, block. Note that the executed sub may
2414never block itself or use any form of Event handling.
2415
2416=cut
2417
2418sub fork_call(&@) {
2419 my ($cb, @args) = @_;
2420
2421# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2422# or die "socketpair: $!";
2423 pipe my $fh1, my $fh2
2424 or die "pipe: $!";
2425
2426 if (my $pid = fork) {
2427 close $fh2;
2428
2429 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2430 $res = Coro::Storable::thaw $res;
2431
2432 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2433
2434 die $$res unless "ARRAY" eq ref $res;
2435
2436 return wantarray ? @$res : $res->[-1];
2437 } else {
2438 local $SIG{__WARN__};
2439 eval {
2440 local $SIG{__DIE__};
2441 close $fh1;
2442
2443 my @res = eval { $cb->(@args) };
2444 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2445 };
2446
2447 warn $@ if $@;
2448 _exit 0;
2449 }
2450}
2451
2452
2453
2454#############################################################################
2455# the server's init and main functions 3121# the server's init and main functions
2456 3122
2457sub load_facedata($) { 3123sub load_facedata($) {
2458 my ($path) = @_; 3124 my ($path) = @_;
3125
3126 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = ();
3129
3130 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2459 3131
2460 warn "loading facedata from $path\n"; 3132 warn "loading facedata from $path\n";
2461 3133
2462 my $facedata; 3134 my $facedata;
2463 0 < aio_load $path, $facedata 3135 0 < aio_load $path, $facedata
… …
2466 $facedata = Coro::Storable::thaw $facedata; 3138 $facedata = Coro::Storable::thaw $facedata;
2467 3139
2468 $facedata->{version} == 2 3140 $facedata->{version} == 2
2469 or cf::cleanup "$path: version mismatch, cannot proceed."; 3141 or cf::cleanup "$path: version mismatch, cannot proceed.";
2470 3142
3143 # patch in the exptable
3144 $facedata->{resource}{"res/exp_table"} = {
3145 type => FT_RSRC,
3146 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3147 };
3148 cf::cede_to_tick;
3149
2471 { 3150 {
2472 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
2473 3152
2474 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
2475 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
2476 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap};
2477 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2478 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2479 Coro::cede; 3160
3161 cf::cede_to_tick;
2480 } 3162 }
2481 3163
2482 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
2483 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
2484 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
2485 or next; 3168 or next;
3169
2486 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3171 cf::face::set_smooth $idx, $smooth;
2487 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2488 } else { 3173 } else {
2489 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
2490 } 3175 }
2491 Coro::cede; 3176
3177 cf::cede_to_tick;
2492 } 3178 }
2493 } 3179 }
2494 3180
2495 { 3181 {
2496 my $anims = $facedata->{animinfo}; 3182 my $anims = $facedata->{animinfo};
2497 3183
2498 while (my ($anim, $info) = each %$anims) { 3184 while (my ($anim, $info) = each %$anims) {
2499 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3185 cf::anim::set $anim, $info->{frames}, $info->{facings};
2500 Coro::cede; 3186 cf::cede_to_tick;
2501 } 3187 }
2502 3188
2503 cf::anim::invalidate_all; # d'oh 3189 cf::anim::invalidate_all; # d'oh
2504 } 3190 }
2505 3191
3192 {
3193 # TODO: for gcfclient pleasure, we should give resources
3194 # that gcfclient doesn't grok a >10000 face index.
3195 my $res = $facedata->{resource};
3196
3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
3201
3202 if ($info->{type} & 1) {
3203 # prepend meta info
3204
3205 my $meta = $enc->encode ({
3206 name => $name,
3207 %{ $info->{meta} || {} },
3208 });
3209
3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3217 } else {
3218 $RESOURCE{$name} = $info;
3219 }
3220
3221 cf::cede_to_tick;
3222 }
3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3226
2506 1 3227 1
2507} 3228}
2508 3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3249
3250register_exticmd fx_want => sub {
3251 my ($ns, $want) = @_;
3252
3253 while (my ($k, $v) = each %$want) {
3254 $ns->fx_want ($k, $v);
3255 }
3256};
3257
2509sub reload_regions { 3258sub reload_regions {
3259 # HACK to clear player env face cache, we need some signal framework
3260 # for this (global event?)
3261 %ext::player_env::MUSIC_FACE_CACHE = ();
3262
2510 load_resource_file "$MAPDIR/regions" 3263 load_resource_file "$MAPDIR/regions"
2511 or die "unable to load regions file\n"; 3264 or die "unable to load regions file\n";
3265
3266 for (cf::region::list) {
3267 $_->{match} = qr/$_->{match}/
3268 if exists $_->{match};
3269 }
2512} 3270}
2513 3271
2514sub reload_facedata { 3272sub reload_facedata {
2515 load_facedata "$DATADIR/facedata" 3273 load_facedata "$DATADIR/facedata"
2516 or die "unable to load facedata\n"; 3274 or die "unable to load facedata\n";
2517} 3275}
2518 3276
2519sub reload_archetypes { 3277sub reload_archetypes {
2520 load_resource_file "$DATADIR/archetypes" 3278 load_resource_file "$DATADIR/archetypes"
2521 or die "unable to load archetypes\n"; 3279 or die "unable to load archetypes\n";
3280 #d# NEED to laod twice to resolve forward references
3281 # this really needs to be done in an extra post-pass
3282 # (which needs to be synchronous, so solve it differently)
3283 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n";
2522} 3285}
2523 3286
2524sub reload_treasures { 3287sub reload_treasures {
2525 load_resource_file "$DATADIR/treasures" 3288 load_resource_file "$DATADIR/treasures"
2526 or die "unable to load treasurelists\n"; 3289 or die "unable to load treasurelists\n";
… …
2529sub reload_resources { 3292sub reload_resources {
2530 warn "reloading resource files...\n"; 3293 warn "reloading resource files...\n";
2531 3294
2532 reload_regions; 3295 reload_regions;
2533 reload_facedata; 3296 reload_facedata;
3297 #reload_archetypes;#d#
2534 reload_archetypes; 3298 reload_archetypes;
2535 reload_treasures; 3299 reload_treasures;
2536 3300
2537 warn "finished reloading resource files\n"; 3301 warn "finished reloading resource files\n";
2538} 3302}
2539 3303
2540sub init { 3304sub init {
2541 reload_resources; 3305 reload_resources;
2542} 3306}
2543 3307
2544sub cfg_load { 3308sub reload_config {
2545 open my $fh, "<:utf8", "$CONFDIR/config" 3309 open my $fh, "<:utf8", "$CONFDIR/config"
2546 or return; 3310 or return;
2547 3311
2548 local $/; 3312 local $/;
2549 *CFG = YAML::Syck::Load <$fh>; 3313 *CFG = YAML::Syck::Load <$fh>;
… …
2565sub main { 3329sub main {
2566 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
2567 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
2568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2569 (async { 3333 (async {
2570 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
2571 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
2572 }; 3337 };
2573 3338
2574 cfg_load; 3339 reload_config;
2575 db_init; 3340 db_init;
2576 load_extensions; 3341 load_extensions;
2577 3342
2578 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2579 Event::loop; 3345 EV::loop;
2580} 3346}
2581 3347
2582############################################################################# 3348#############################################################################
2583# initialisation and cleanup 3349# initialisation and cleanup
2584 3350
2585# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
2586BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
2587 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
2588 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2589 reentrant => 0,
2590 data => WF_AUTOCANCEL,
2591 signal => $signal,
2592 prio => 0,
2593 cb => sub {
2594 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
2595 },
2596 ); 3357 };
3358 }
3359}
3360
3361sub write_runtime {
3362 my $runtime = "$LOCALDIR/runtime";
3363
3364 # first touch the runtime file to show we are still running:
3365 # the fsync below can take a very very long time.
3366
3367 IO::AIO::aio_utime $runtime, undef, undef;
3368
3369 my $guard = cf::lock_acquire "write_runtime";
3370
3371 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3372 or return;
3373
3374 my $value = $cf::RUNTIME + 90 + 10;
3375 # 10 is the runtime save interval, for a monotonic clock
3376 # 60 allows for the watchdog to kill the server.
3377
3378 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3379 and return;
3380
3381 # always fsync - this file is important
3382 aio_fsync $fh
3383 and return;
3384
3385 # touch it again to show we are up-to-date
3386 aio_utime $fh, undef, undef;
3387
3388 close $fh
3389 or return;
3390
3391 aio_rename "$runtime~", $runtime
3392 and return;
3393
3394 warn "runtime file written.\n";
3395
2597 } 3396 1
2598} 3397}
2599 3398
2600sub emergency_save() { 3399sub emergency_save() {
2601 my $freeze_guard = cf::freeze_mainloop; 3400 my $freeze_guard = cf::freeze_mainloop;
2602 3401
… …
2608 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
2609 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
2610 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
2611 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
2612 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2613 $pl->save; 3413 $pl->save;
2614 } 3414 }
2615 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
2616 3416
2617 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
… …
2656 warn "syncing database to disk"; 3456 warn "syncing database to disk";
2657 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
2658 3458
2659 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
2660 3460
2661 warn "cancelling all WF_AUTOCANCEL watchers";
2662 for (Event::all_watchers) {
2663 $_->cancel if $_->data & WF_AUTOCANCEL;
2664 }
2665
2666 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
2667 for (;;) { 3462 for (;;) {
2668 BDB::flush; 3463 BDB::flush;
2669 IO::AIO::flush; 3464 IO::AIO::flush;
2670 Coro::cede; 3465 Coro::cede_notself;
2671 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
2672 warn "iterate..."; 3467 warn "iterate...";
2673 } 3468 }
2674 3469
2675 ++$RELOAD; 3470 ++$RELOAD;
… …
2679 %EXT_CORO = (); 3474 %EXT_CORO = ();
2680 3475
2681 warn "removing commands"; 3476 warn "removing commands";
2682 %COMMAND = (); 3477 %COMMAND = ();
2683 3478
2684 warn "removing ext commands"; 3479 warn "removing ext/exti commands";
2685 %EXTCMD = (); 3480 %EXTCMD = ();
3481 %EXTICMD = ();
2686 3482
2687 warn "unloading/nuking all extensions"; 3483 warn "unloading/nuking all extensions";
2688 for my $pkg (@EXTS) { 3484 for my $pkg (@EXTS) {
2689 warn "... unloading $pkg"; 3485 warn "... unloading $pkg";
2690 3486
… …
2733 warn "reloading cf.pm"; 3529 warn "reloading cf.pm";
2734 require cf; 3530 require cf;
2735 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3531 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2736 3532
2737 warn "loading config and database again"; 3533 warn "loading config and database again";
2738 cf::cfg_load; 3534 cf::reload_config;
2739 3535
2740 warn "loading extensions"; 3536 warn "loading extensions";
2741 cf::load_extensions; 3537 cf::load_extensions;
2742 3538
2743 warn "reattaching attachments to objects/players"; 3539 warn "reattaching attachments to objects/players";
… …
2763 3559
2764sub reload_perl() { 3560sub reload_perl() {
2765 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
2766 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
2767 3563
2768 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2769 reentrant => 0,
2770 after => 0,
2771 data => WF_AUTOCANCEL,
2772 cb => sub {
2773 do_reload_perl;
2774 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
2775 }, 3566 do_reload_perl;
2776 ); 3567 };
2777} 3568}
2778 3569
2779register_command "reload" => sub { 3570register_command "reload" => sub {
2780 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
2781 3572
2782 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
2783 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
2784 async { reload_perl }; 3577 reload_perl;
3578 };
2785 } 3579 }
2786}; 3580};
2787 3581
2788unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
2789 3583
… …
2808 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
2809 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
2810 $signal->wait; 3604 $signal->wait;
2811} 3605}
2812 3606
2813$TICK_WATCHER = Event->timer ( 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2814 reentrant => 0,
2815 parked => 1,
2816 prio => 0,
2817 at => $NEXT_TICK || $TICK,
2818 data => WF_AUTOCANCEL,
2819 cb => sub {
2820 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
2821 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2822 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
2823 return; 3611 return;
2824 } 3612 }
2825 3613
2826 $NOW = Event::time; 3614 $NOW = $tick_start = EV::now;
2827 3615
2828 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
2829 3617
2830 $RUNTIME += $TICK; 3618 $RUNTIME += $TICK;
2831 $NEXT_TICK += $TICK; 3619 $NEXT_TICK = $_[0]->at;
2832 3620
2833 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2834 $NEXT_RUNTIME_WRITE = $NOW + 10; 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2835 Coro::async_pool { 3623 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver";
2836 write_runtime 3625 write_runtime
2837 or warn "ERROR: unable to write runtime file: $!"; 3626 or warn "ERROR: unable to write runtime file: $!";
2838 };
2839 } 3627 };
3628 }
2840 3629
2841# my $AFTER = Event::time;
2842# warn $AFTER - $NOW;#d#
2843
2844 # if we are delayed by four ticks or more, skip them all
2845 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2846
2847 $TICK_WATCHER->at ($NEXT_TICK);
2848 $TICK_WATCHER->start;
2849
2850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2851 $sig->send; 3631 $sig->send;
2852 } 3632 }
2853 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
2854 $sig->send; 3634 $sig->send;
2855 } 3635 }
2856 3636
3637 $LOAD = ($NOW - $tick_start) / $TICK;
3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3639
2857 _post_tick; 3640 _post_tick;
2858 }, 3641};
2859); 3642$TICK_WATCHER->priority (EV::MAXPRI);
2860 3643
2861{ 3644{
2862 BDB::max_poll_time $TICK * 0.1; 3645 # configure BDB
2863 $BDB_POLL_WATCHER = Event->io ( 3646
2864 reentrant => 0,
2865 fd => BDB::poll_fileno,
2866 poll => 'r',
2867 prio => 0,
2868 data => WF_AUTOCANCEL,
2869 cb => \&BDB::poll_cb,
2870 );
2871 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
2872 3648 BDB::max_poll_reqs $TICK * 0.1;
2873 BDB::set_sync_prepare { 3649 $Coro::BDB::WATCHER->priority (1);
2874 my $status;
2875 my $current = $Coro::current;
2876 (
2877 sub {
2878 $status = $!;
2879 $current->ready; undef $current;
2880 },
2881 sub {
2882 Coro::schedule while defined $current;
2883 $! = $status;
2884 },
2885 )
2886 };
2887 3650
2888 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
2889 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3654 | BDB::LOG_AUTOREMOVE, 1);
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2890 3657
2891 cf::sync_job { 3658 cf::sync_job {
2892 eval { 3659 eval {
2893 BDB::db_env_open 3660 BDB::db_env_open
2894 $DB_ENV, 3661 $DB_ENV,
… …
2896 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3663 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2897 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2898 0666; 3665 0666;
2899 3666
2900 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2901
2902 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2903 $DB_ENV->set_lk_detect;
2904 }; 3668 };
2905 3669
2906 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
2907 }; 3671 };
2908 } 3672 }
3673
3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3676 };
3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3679 };
3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3682 };
2909} 3683}
2910 3684
2911{ 3685{
3686 # configure IO::AIO
3687
2912 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
2913
2914 undef $Coro::AIO::WATCHER;
2915 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
2916 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
2917 reentrant => 0, 3691}
2918 data => WF_AUTOCANCEL, 3692
2919 fd => IO::AIO::poll_fileno, 3693my $_log_backtrace;
2920 poll => 'r', 3694
2921 prio => 6, 3695sub _log_backtrace {
2922 cb => \&IO::AIO::poll_cb, 3696 my ($msg, @addr) = @_;
2923 ); 3697
3698 $msg =~ s/\n//;
3699
3700 # limit the # of concurrent backtraces
3701 if ($_log_backtrace < 2) {
3702 ++$_log_backtrace;
3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3706 my @bt = fork_call {
3707 @addr = map { sprintf "%x", $_ } @addr;
3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3709 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3710 or die "addr2line: $!";
3711
3712 my @funcs;
3713 my @res = <$fh>;
3714 chomp for @res;
3715 while (@res) {
3716 my ($func, $line) = splice @res, 0, 2, ();
3717 push @funcs, "[$func] $line";
3718 }
3719
3720 @funcs
3721 };
3722
3723 LOG llevInfo, "[ABT] $msg\n";
3724 LOG llevInfo, "[ABT] $_\n" for @bt;
3725 --$_log_backtrace;
3726 };
3727 } else {
3728 LOG llevInfo, "[ABT] $msg\n";
3729 LOG llevInfo, "[ABT] [suppressed]\n";
3730 }
2924} 3731}
2925 3732
2926# load additional modules 3733# load additional modules
2927use cf::pod; 3734use cf::pod;
2928 3735

Diff Legend

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