ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

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

Diff Legend

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