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

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

Diff Legend

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