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

Diff Legend

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