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.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101
102our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing
104our $tick_start; # for load detecting purposes
94 105
95binmode STDOUT; 106binmode STDOUT;
96binmode STDERR; 107binmode STDERR;
97 108
98# read virtual server time, if available 109# read virtual server time, if available
139 150
140=item $cf::TICK 151=item $cf::TICK
141 152
142The interval between server ticks, in seconds. 153The interval between server ticks, in seconds.
143 154
155=item $cf::LOADAVG
156
157The current CPU load on the server (alpha-smoothed), as a value between 0
158(none) and 1 (overloaded), indicating how much time is spent on processing
159objects per tick. Healthy values are < 0.5.
160
161=item $cf::LOAD
162
163The raw value load value from the last tick.
164
144=item %cf::CFG 165=item %cf::CFG
145 166
146Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 168from wherever your confdir points to.
148 169
150 171
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
154 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
155=back 182=back
156 183
157=cut 184=cut
158 185
159BEGIN { 186BEGIN {
163 $msg .= "\n" 190 $msg .= "\n"
164 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
165 192
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167 194
168 utf8::encode $msg;
169 LOG llevError, $msg; 195 LOG llevError, $msg;
170 }; 196 };
171} 197}
172 198
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 206
180# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 208# within the Safe compartment.
182for my $pkg (qw( 209for my $pkg (qw(
183 cf::global cf::attachable 210 cf::global cf::attachable
191} 218}
192 219
193$Event::DIED = sub { 220$Event::DIED = sub {
194 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
195}; 222};
223
224#############################################################################
196 225
197=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
198 227
199=over 4 228=over 4
200 229
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 249 $d
221 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
222} 251}
223 252
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
227 254
228Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
229 256
230=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
231 258
232Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
233 267
234=item cf::lock_wait $string 268=item cf::lock_wait $string
235 269
236Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
237 271
240Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
241a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
243returned. 277returned.
244 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
245Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
247 284
248=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
249 286
250Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
251 288
252=cut 289=cut
253 290
254our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
255 293
256sub lock_wait($) { 294sub lock_wait($) {
257 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
258 301
259 # wait for lock, if any 302 # wait for lock, if any
260 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 305 Coro::schedule;
268 311
269 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
270 lock_wait $key; 313 lock_wait $key;
271 314
272 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
273 317
274 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
277 } 322 }
278} 323}
279 324
291 }; 336 };
292 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
293 $guard 338 $guard
294} 339}
295 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 my $signal = new Coro::Signal;
360
361 while () {
362 next_job:
363 my $avail = cf::till_tick;
364 if ($avail > 0.01) {
365 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) {
367 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send;
369 Coro::cede;
370 goto next_job;
371 }
372 }
373 }
374
375 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait;
379 } else {
380 Coro::schedule;
381 }
382 }
383};
384
385sub get_slot($;$$) {
386 my ($time, $pri, $name) = @_;
387
388 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal;
390
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready;
394 $sig->wait;
395}
396
296=item cf::async { BLOCK } 397=item cf::async { BLOCK }
297 398
298Currently the same as Coro::async_pool, meaning you cannot use 399Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 400C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 401thing you are allowed to do is call C<prio> on it.
303 404
304BEGIN { *async = \&Coro::async_pool } 405BEGIN { *async = \&Coro::async_pool }
305 406
306=item cf::sync_job { BLOCK } 407=item cf::sync_job { BLOCK }
307 408
308The design of crossfire+ requires that the main coro ($Coro::main) is 409The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 410is always able to handle events or runnable, as Crossfire TRT is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable.
311 413
312If it must be done, put the blocking parts into C<sync_job>. This will run 414If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 415the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 416server will be frozen during this time, so the block should either finish
315fast or be very important. 417fast or be very important.
318 420
319sub sync_job(&) { 421sub sync_job(&) {
320 my ($job) = @_; 422 my ($job) = @_;
321 423
322 if ($Coro::current == $Coro::main) { 424 if ($Coro::current == $Coro::main) {
425 my $time = Event::time;
426
323 # this is the main coro, too bad, we have to block 427 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 428 # till the operation succeeds, freezing the server :/
325 429
326 # TODO: use suspend/resume instead 430 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 431 # (but this is cancel-safe)
338 442
339 while ($busy) { 443 while ($busy) {
340 Coro::cede or Event::one_event; 444 Coro::cede or Event::one_event;
341 } 445 }
342 446
447 $time = Event::time - $time;
448
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load
453
343 wantarray ? @res : $res[0] 454 wantarray ? @res : $res[0]
344 } else { 455 } else {
345 # we are in another coroutine, how wonderful, everything just works 456 # we are in another coroutine, how wonderful, everything just works
346 457
347 $job->() 458 $job->()
366 $EXT_CORO{$coro+0} = $coro; 477 $EXT_CORO{$coro+0} = $coro;
367 478
368 $coro 479 $coro
369} 480}
370 481
371sub write_runtime { 482=item fork_call { }, $args
372 my $runtime = "$LOCALDIR/runtime";
373 483
374 # first touch the runtime file to show we are still running: 484Executes the given code block with the given arguments in a seperate
375 # the fsync below can take a very very long time. 485process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling.
376 488
377 warn "touching runtime...\n";#d# 489=cut
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 490
379 utime undef, undef, $fh; 491sub fork_call(&@) {
492 my ($cb, @args) = @_;
493
494 # we seemingly have to make a local copy of the whole thing,
495 # otherwise perl prematurely frees the stuff :/
496 # TODO: investigate and fix (likely this will be rather laborious)
497
498 my @res = Coro::Util::fork_eval {
499 reset_signals;
500 &$cb
501 }, @args;
502
503 wantarray ? @res : $res[-1]
504}
505
506=item $value = cf::db_get $family => $key
507
508Returns a single value from the environment database.
509
510=item cf::db_put $family => $key => $value
511
512Stores the given C<$value> in the family. It can currently store binary
513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
380 } 533 };
534 cf::cleanup "db_open(db): $@" if $@;
381 535
382 my $guard = cf::lock_acquire "write_runtime"; 536 $db
537}
383 538
384 warn "starting to write runtime...\n";#d# 539our $DB;
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
386 or return;
387 540
388 my $value = $cf::RUNTIME + 90 + 10; 541sub db_init {
389 # 10 is the runtime save interval, for a monotonic clock 542 cf::sync_job {
390 # 60 allows for the watchdog to kill the server. 543 $DB ||= db_table "db";
544 };
545}
391 546
392 (aio_write $fh, 0, (length $value), $value, 0) <= 0 547sub db_get($$) {
393 and return; 548 my $key = "$_[0]/$_[1]";
394 549
395 # always fsync - this file is important 550 cf::sync_job {
396 aio_fsync $fh 551 BDB::db_get $DB, undef, $key, my $data;
397 and return;
398 552
399 # touch it again to show we are up-to-date 553 $! ? ()
400 utime undef, undef, $fh; 554 : $data
401
402 close $fh
403 or return;
404
405 aio_rename "$runtime~", $runtime
406 and return;
407
408 warn "... done writing runtime.\n";#d#
409
410 1 555 }
556}
557
558sub db_put($$$) {
559 BDB::dbreq_pri 4;
560 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
561}
562
563=item cf::cache $id => [$paths...], $processversion => $process
564
565Generic caching function that returns the value of the resource $id,
566caching and regenerating as required.
567
568This function can block.
569
570=cut
571
572sub cache {
573 my ($id, $src, $processversion, $process) = @_;
574
575 my $meta =
576 join "\x00",
577 $processversion,
578 map {
579 aio_stat $_
580 and Carp::croak "$_: $!";
581
582 ($_, (stat _)[7,9])
583 } @$src;
584
585 my $dbmeta = db_get cache => "$id/meta";
586 if ($dbmeta ne $meta) {
587 # changed, we may need to process
588
589 my @data;
590 my $md5;
591
592 for (0 .. $#$src) {
593 0 <= aio_load $src->[$_], $data[$_]
594 or Carp::croak "$src->[$_]: $!";
595 }
596
597 # if processing is expensive, check
598 # checksum first
599 if (1) {
600 $md5 =
601 join "\x00",
602 $processversion,
603 map {
604 cf::cede_to_tick;
605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
606 } 0.. $#$src;
607
608
609 my $dbmd5 = db_get cache => "$id/md5";
610 if ($dbmd5 eq $md5) {
611 db_put cache => "$id/meta", $meta;
612
613 return db_get cache => "$id/data";
614 }
615 }
616
617 my $t1 = Time::HiRes::time;
618 my $data = $process->(\@data);
619 my $t2 = Time::HiRes::time;
620
621 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
622
623 db_put cache => "$id/data", $data;
624 db_put cache => "$id/md5" , $md5;
625 db_put cache => "$id/meta", $meta;
626
627 return $data;
628 }
629
630 db_get cache => "$id/data"
411} 631}
412 632
413=item cf::datalog type => key => value, ... 633=item cf::datalog type => key => value, ...
414 634
415Log a datalog packet of the given type with the given key-value pairs. 635Log a datalog packet of the given type with the given key-value pairs.
433attach callbacks/event handlers (a collection of which is called an "attachment") 653attach callbacks/event handlers (a collection of which is called an "attachment")
434to it. All such attachable objects support the following methods. 654to it. All such attachable objects support the following methods.
435 655
436In the following description, CLASS can be any of C<global>, C<object> 656In the following description, CLASS can be any of C<global>, C<object>
437C<player>, C<client> or C<map> (i.e. the attachable objects in 657C<player>, C<client> or C<map> (i.e. the attachable objects in
438crossfire+). 658Crossfire TRT).
439 659
440=over 4 660=over 4
441 661
442=item $attachable->attach ($attachment, key => $value...) 662=item $attachable->attach ($attachment, key => $value...)
443 663
606 $registry = $CB_TYPE[$object_type] ||= []; 826 $registry = $CB_TYPE[$object_type] ||= [];
607 827
608 } elsif ($type eq "subtype") { 828 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 829 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 830 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 831 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 832
613 } elsif ($type eq "package") { 833 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 834 my $pkg = shift @arg;
615 835
616 while (my ($name, $id) = each %cb_id) { 836 while (my ($name, $id) = each %cb_id) {
645 _attach $registry, $klass, @attach; 865 _attach $registry, $klass, @attach;
646 } 866 }
647 867
648 $obj->{$name} = \%arg; 868 $obj->{$name} = \%arg;
649 } else { 869 } else {
650 warn "object uses attachment '$name' that is not available, postponing.\n"; 870 warn "object uses attachment '$name' which is not available, postponing.\n";
651 } 871 }
652 872
653 $obj->{_attachment}{$name} = undef; 873 $obj->{_attachment}{$name} = undef;
654} 874}
655 875
657 if (ref $_[0]) { 877 if (ref $_[0]) {
658 _object_attach @_; 878 _object_attach @_;
659 } else { 879 } else {
660 _attach shift->_attach_registry, @_; 880 _attach shift->_attach_registry, @_;
661 } 881 }
882 _recalc_want;
662}; 883};
663 884
664# all those should be optimised 885# all those should be optimised
665sub cf::attachable::detach { 886sub cf::attachable::detach {
666 my ($obj, $name) = @_; 887 my ($obj, $name) = @_;
669 delete $obj->{_attachment}{$name}; 890 delete $obj->{_attachment}{$name};
670 reattach ($obj); 891 reattach ($obj);
671 } else { 892 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 893 Carp::croak "cannot, currently, detach class attachments";
673 } 894 }
895 _recalc_want;
674}; 896};
675 897
676sub cf::attachable::attached { 898sub cf::attachable::attached {
677 my ($obj, $name) = @_; 899 my ($obj, $name) = @_;
678 900
693 "; 915 ";
694 die if $@; 916 die if $@;
695} 917}
696 918
697our $override; 919our $override;
698our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 920our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
699 921
700sub override { 922sub override {
701 $override = 1; 923 $override = 1;
702 @invoke_results = (); 924 @INVOKE_RESULTS = (@_);
703} 925}
704 926
705sub do_invoke { 927sub do_invoke {
706 my $event = shift; 928 my $event = shift;
707 my $callbacks = shift; 929 my $callbacks = shift;
708 930
709 @invoke_results = (); 931 @INVOKE_RESULTS = ();
710 932
711 local $override; 933 local $override;
712 934
713 for (@$callbacks) { 935 for (@$callbacks) {
714 eval { &{$_->[1]} }; 936 eval { &{$_->[1]} };
731 953
732Generate an object-specific event with the given arguments. 954Generate an object-specific event with the given arguments.
733 955
734This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 956This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
735removed in future versions), and there is no public API to access override 957removed in future versions), and there is no public API to access override
736results (if you must, access C<@cf::invoke_results> directly). 958results (if you must, access C<@cf::INVOKE_RESULTS> directly).
737 959
738=back 960=back
739 961
740=cut 962=cut
741 963
742############################################################################# 964#############################################################################
743# object support 965# object support
966#
967
968sub _can_merge {
969 my ($ob1, $ob2) = @_;
970
971 local $Storable::canonical = 1;
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974
975 $fob1 eq $fob2
976}
744 977
745sub reattach { 978sub reattach {
746 # basically do the same as instantiate, without calling instantiate 979 # basically do the same as instantiate, without calling instantiate
747 my ($obj) = @_; 980 my ($obj) = @_;
748 981
793); 1026);
794 1027
795sub object_freezer_save { 1028sub object_freezer_save {
796 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
797 1030
1031 my $guard = cf::lock_acquire "io";
1032
798 sync_job { 1033 sync_job {
799 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
800 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
801 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
802 1038
803 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
804 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
805 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
806 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
825 } 1061 }
826 } else { 1062 } else {
827 aio_unlink $filename; 1063 aio_unlink $filename;
828 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
829 } 1065 }
830 } 1066 };
1067
1068 undef $guard;
831} 1069}
832 1070
833sub object_freezer_as_string { 1071sub object_freezer_as_string {
834 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
835 1073
840 1078
841sub object_thawer_load { 1079sub object_thawer_load {
842 my ($filename) = @_; 1080 my ($filename) = @_;
843 1081
844 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
845 1085
846 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
847 or return; 1087 or return;
848 1088
849 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
850 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
851 or return; 1091 or return;
1092
1093 undef $guard;
852 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
853 } 1095 }
854 1096
1097 utf8::decode (my $decname = $filename);
855 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
856 $filename, length $data, scalar @{$av || []};#d# 1099 $decname, length $data, scalar @{$av || []};
1100
857 return ($data, $av); 1101 ($data, $av)
858} 1102}
1103
1104=head2 COMMAND CALLBACKS
1105
1106=over 4
1107
1108=cut
859 1109
860############################################################################# 1110#############################################################################
861# command handling &c 1111# command handling &c
862 1112
863=item cf::register_command $name => \&callback($ob,$args); 1113=item cf::register_command $name => \&callback($ob,$args);
876 push @{ $COMMAND{$name} }, [$caller, $cb]; 1126 push @{ $COMMAND{$name} }, [$caller, $cb];
877} 1127}
878 1128
879=item cf::register_extcmd $name => \&callback($pl,$packet); 1129=item cf::register_extcmd $name => \&callback($pl,$packet);
880 1130
881Register a callbackf ro execution when the client sends an extcmd packet. 1131Register a callback for execution when the client sends an (synchronous)
1132extcmd packet. Ext commands will be processed in the order they are
1133received by the server, like other user commands. The first argument is
1134the logged-in player. Ext commands can only be processed after a player
1135has logged in successfully.
882 1136
883If the callback returns something, it is sent back as if reply was being 1137If the callback returns something, it is sent back as if reply was being
884called. 1138called.
885 1139
1140=item cf::register_exticmd $name => \&callback($ns,$packet);
1141
1142Register a callback for execution when the client sends an (asynchronous)
1143exticmd packet. Exti commands are processed by the server as soon as they
1144are received, i.e. out of order w.r.t. other commands. The first argument
1145is a client socket. Exti commands can be received anytime, even before
1146log-in.
1147
1148If the callback returns something, it is sent back as if reply was being
1149called.
1150
886=cut 1151=cut
887 1152
888sub register_extcmd { 1153sub register_extcmd {
889 my ($name, $cb) = @_; 1154 my ($name, $cb) = @_;
890 1155
891 $EXTCMD{$name} = $cb; 1156 $EXTCMD{$name} = $cb;
1157}
1158
1159sub register_exticmd {
1160 my ($name, $cb) = @_;
1161
1162 $EXTICMD{$name} = $cb;
892} 1163}
893 1164
894cf::player->attach ( 1165cf::player->attach (
895 on_command => sub { 1166 on_command => sub {
896 my ($pl, $name, $params) = @_; 1167 my ($pl, $name, $params) = @_;
905 cf::override; 1176 cf::override;
906 }, 1177 },
907 on_extcmd => sub { 1178 on_extcmd => sub {
908 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
909 1180
910 my $msg = eval { from_json $buf }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
911 1182
912 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
913 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
914 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
915 $pl->ext_reply ($msg->{msgid}, %reply);
916 }
917 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
918 } else { 1198 } else {
919 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
920 } 1200 }
921 1201
922 cf::override; 1202 cf::override;
923 }, 1203 },
924); 1204);
925 1205
926sub load_extension {
927 my ($path) = @_;
928
929 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
930 my $base = $1;
931 my $pkg = $1;
932 $pkg =~ s/[^[:word:]]/_/g;
933 $pkg = "ext::$pkg";
934
935 warn "... loading '$path' into '$pkg'\n";
936
937 open my $fh, "<:utf8", $path
938 or die "$path: $!";
939
940 my $source =
941 "package $pkg; use strict; use utf8;\n"
942 . "#line 1 \"$path\"\n{\n"
943 . (do { local $/; <$fh> })
944 . "\n};\n1";
945
946 unless (eval $source) {
947 my $msg = $@ ? "$path: $@\n"
948 : "extension disabled.\n";
949 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
950 warn $@;
951 warn "mandatory extension failed to load, exiting.\n";
952 exit 1;
953 }
954 die $@;
955 }
956
957 push @EXTS, $pkg;
958}
959
960sub load_extensions { 1206sub load_extensions {
1207 cf::sync_job {
1208 my %todo;
1209
961 for my $ext (<$LIBDIR/*.ext>) { 1210 for my $path (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 1211 next unless -r $path;
963 eval { 1212
964 load_extension $ext; 1213 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1214 my $base = $1;
1215 my $pkg = $1;
1216 $pkg =~ s/[^[:word:]]/_/g;
1217 $pkg = "ext::$pkg";
1218
1219 open my $fh, "<:utf8", $path
1220 or die "$path: $!";
1221
1222 my $source = do { local $/; <$fh> };
1223
1224 my %ext = (
1225 path => $path,
1226 base => $base,
1227 pkg => $pkg,
1228 );
1229
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232
1233 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n"
1236 . $source
1237 . "\n};\n1";
1238
1239 $todo{$base} = \%ext;
1240 }
1241
1242 my %done;
1243 while (%todo) {
1244 my $progress;
1245
1246 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip
1249 unless exists $done{$_};
1250 }
1251
1252 warn "... loading '$k' into '$v->{pkg}'\n";
1253
1254 unless (eval $v->{source}) {
1255 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n";
1257
1258 if (exists $v->{meta}{mandatory}) {
1259 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n";
1261 exit 1;
1262 }
1263
1264 warn $msg;
1265 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
965 1 1270 }
966 } or warn "$ext not loaded: $@"; 1271
1272 skip:
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1274 unless $progress;
1275 }
967 } 1276 };
968} 1277}
969 1278
970############################################################################# 1279#############################################################################
971 1280
1281=back
1282
972=head2 CORE EXTENSIONS 1283=head2 CORE EXTENSIONS
973 1284
974Functions and methods that extend core crossfire objects. 1285Functions and methods that extend core crossfire objects.
975 1286
976=cut 1287=cut
980use Coro::AIO; 1291use Coro::AIO;
981 1292
982=head3 cf::player 1293=head3 cf::player
983 1294
984=over 4 1295=over 4
1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
985 1310
986=item cf::player::find $login 1311=item cf::player::find $login
987 1312
988Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
989 1314
1025 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1026 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1027 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1028 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1029 1354
1030 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1031 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1032 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1033 } 1364 }
1034 } 1365 }
1035} 1366}
1036 1367
1046 1377
1047 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1048 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1049 1380
1050 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1051 Coro::cede; 1382 cf::cede_to_tick;
1052} 1383}
1053 1384
1054sub new($) { 1385sub new($) {
1055 my ($login) = @_; 1386 my ($login) = @_;
1056 1387
1060 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1061 1392
1062 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1063 1394
1064 $self 1395 $self
1396}
1397
1398=item $player->send_msg ($channel, $msg, $color, [extra...])
1399
1400=cut
1401
1402sub send_msg {
1403 my $ns = shift->ns
1404 or return;
1405 $ns->send_msg (@_);
1065} 1406}
1066 1407
1067=item $pl->quit_character 1408=item $pl->quit_character
1068 1409
1069Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
1124 or return []; 1465 or return [];
1125 1466
1126 my @logins; 1467 my @logins;
1127 1468
1128 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1129 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1130 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1131 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1132 1478
1133 utf8::decode $login; 1479 utf8::decode $login;
1134 push @logins, $login; 1480 push @logins, $login;
1135 } 1481 }
1136 1482
1163 } 1509 }
1164 1510
1165 \@paths 1511 \@paths
1166} 1512}
1167 1513
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1515
1516Expand crossfire pod fragments into protocol xml.
1517
1518=cut
1519
1520sub expand_cfpod {
1521 ((my $self), (local $_)) = @_;
1522
1523 # escape & and <
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526
1527 # this is buggy, it needs to properly take care of nested <'s
1528
1529 1 while
1530 # replace B<>, I<>, U<> etc.
1531 s/B<([^\>]*)>/<b>$1<\/b>/
1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1535 # replace G<male|female> tags
1536 || s{G<([^>|]*)\|([^>]*)>}{
1537 $self->gender ? $2 : $1
1538 }ge
1539 # replace H<hint text>
1540 || s{H<([^\>]*)>}
1541 {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "")
1545 [$self->{hintmode}]
1546 }ge;
1547
1548 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g;
1550
1551 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines
1556
1557 $_
1558}
1559
1560sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode}
1563}
1564
1168=item $player->ext_reply ($msgid, %msg) 1565=item $player->ext_reply ($msgid, @msg)
1169 1566
1170Sends an ext reply to the player. 1567Sends an ext reply to the player.
1171 1568
1172=cut 1569=cut
1173 1570
1174sub ext_reply($$%) { 1571sub ext_reply($$@) {
1175 my ($self, $id, %msg) = @_; 1572 my ($self, $id, @msg) = @_;
1176 1573
1177 $msg{msgid} = $id; 1574 $self->ns->ext_reply ($id, @msg)
1178
1179 $self->send ("ext " . cf::to_json \%msg);
1180} 1575}
1181 1576
1182=item $player->ext_event ($type, %msg) 1577=item $player->ext_msg ($type, @msg)
1183 1578
1184Sends an ext event to the client. 1579Sends an ext event to the client.
1185 1580
1186=cut 1581=cut
1187 1582
1188sub ext_event($$%) { 1583sub ext_msg($$@) {
1189 my ($self, $type, %msg) = @_; 1584 my ($self, $type, @msg) = @_;
1190 1585
1191 $self->ns->ext_event ($type, %msg); 1586 $self->ns->ext_msg ($type, @msg);
1192} 1587}
1193 1588
1194=head3 cf::region 1589=head3 cf::region
1195 1590
1196=over 4 1591=over 4
1199 1594
1200package cf::region; 1595package cf::region;
1201 1596
1202=item cf::region::find_by_path $path 1597=item cf::region::find_by_path $path
1203 1598
1204Tries to decuce the probable region for a map knowing only its path. 1599Tries to decuce the likely region for a map knowing only its path.
1205 1600
1206=cut 1601=cut
1207 1602
1208sub find_by_path($) { 1603sub find_by_path($) {
1209 my ($path) = @_; 1604 my ($path) = @_;
1210 1605
1211 my ($match, $specificity); 1606 my ($match, $specificity);
1212 1607
1213 for my $region (list) { 1608 for my $region (list) {
1214 if ($region->match && $path =~ $region->match) { 1609 if ($region->{match} && $path =~ $region->{match}) {
1215 ($match, $specificity) = ($region, $region->specificity) 1610 ($match, $specificity) = ($region, $region->specificity)
1216 if $region->specificity > $specificity; 1611 if $region->specificity > $specificity;
1217 } 1612 }
1218 } 1613 }
1219 1614
1283 my ($self, $merge) = @_; 1678 my ($self, $merge) = @_;
1284 1679
1285 # we have to keep some variables in memory intact 1680 # we have to keep some variables in memory intact
1286 local $self->{path}; 1681 local $self->{path};
1287 local $self->{load_path}; 1682 local $self->{load_path};
1288 local $self->{deny_save};
1289 local $self->{deny_reset};
1290 1683
1291 $self->SUPER::thawer_merge ($merge); 1684 $self->SUPER::thawer_merge ($merge);
1292} 1685}
1293 1686
1294sub normalise { 1687sub normalise {
1341 $self->init; # pass $1 etc. 1734 $self->init; # pass $1 etc.
1342 return $self; 1735 return $self;
1343 } 1736 }
1344 } 1737 }
1345 1738
1346 Carp::carp "unable to resolve path '$path' (base '$base')."; 1739 Carp::cluck "unable to resolve path '$path' (base '$base').";
1347 () 1740 ()
1348} 1741}
1349 1742
1350sub init { 1743sub init {
1351 my ($self) = @_; 1744 my ($self) = @_;
1394 1787
1395 $_->change_map_light ($change) 1788 $_->change_map_light ($change)
1396 for grep $_->outdoor, values %cf::MAP; 1789 for grep $_->outdoor, values %cf::MAP;
1397} 1790}
1398 1791
1792sub decay_objects {
1793 my ($self) = @_;
1794
1795 return if $self->{deny_reset};
1796
1797 $self->do_decay_objects;
1798}
1799
1399sub unlink_save { 1800sub unlink_save {
1400 my ($self) = @_; 1801 my ($self) = @_;
1401 1802
1402 utf8::encode (my $save = $self->save_path); 1803 utf8::encode (my $save = $self->save_path);
1403 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1804 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1406 1807
1407sub load_header_from($) { 1808sub load_header_from($) {
1408 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1409 1810
1410 utf8::encode $path; 1811 utf8::encode $path;
1411 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1412 # or return;
1413
1414 $self->_load_header ($path)
1415 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1416 1820
1417 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1418 1822
1419 1 1823 1
1420} 1824}
1459 $self->load_header_orig 1863 $self->load_header_orig
1460 or return; 1864 or return;
1461 $self->prepare_orig; 1865 $self->prepare_orig;
1462 } 1866 }
1463 1867
1868 $self->{deny_reset} = 1
1869 if $self->no_reset;
1870
1464 $self->default_region (cf::region::find_by_path $self->{path}) 1871 $self->default_region (cf::region::find_by_path $self->{path})
1465 unless $self->default_region; 1872 unless $self->default_region;
1466 1873
1467 1 1874 1
1468} 1875}
1471sub find { 1878sub find {
1472 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1473 1880
1474 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1475 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1476 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1477 1885
1478 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1479 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1480 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1481 or return; 1891 or return;
1482 1892
1483 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1484 1894
1485 $map->load_header 1895 $map->load_header
1486 or return; 1896 or return;
1487 1897
1488 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1490 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1491 $map->reset; 1903 $map->reset;
1492 undef $guard;
1493 return find $path; 1904 return find $path;
1494 } 1905 }
1495 1906
1496 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1497 } 1908 }
1506 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1507 1918
1508 my $path = $self->{path}; 1919 my $path = $self->{path};
1509 1920
1510 { 1921 {
1511 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1512 1923
1924 return unless $self->valid;
1513 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1514 1926
1515 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1516 1928
1517 $self->alloc; 1929 $self->alloc;
1518 1930
1519 $self->pre_load; 1931 $self->pre_load;
1520 Coro::cede; 1932 cf::cede_to_tick;
1521 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1522 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1523 or return; 1937 or return;
1524 1938
1525 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1526 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1527 1941
1528 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1529 utf8::encode $uniq; 1943 utf8::encode $uniq;
1530 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1531 $self->clear_unique_items; 1946 $self->clear_unique_items;
1532 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1533 } 1950 }
1534 } 1951 }
1535 1952
1536 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1537 # now do the right thing for maps 1956 # now do the right thing for maps
1538 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1539 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1540 unless $self->difficulty; 1959 unless $self->difficulty;
1541 Coro::cede; 1960 cf::cede_to_tick;
1542 1961
1543 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1544 $self->decay_objects; 1963 $self->decay_objects;
1545 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1546 $self->update_buttons; 1965 $self->update_buttons;
1547 Coro::cede; 1966 cf::cede_to_tick;
1548 $self->set_darkness_map; 1967 $self->set_darkness_map;
1549 Coro::cede; 1968 cf::cede_to_tick;
1550 $self->activate; 1969 $self->activate;
1551 } 1970 }
1971
1972 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME);
1552 1974
1553 $self->in_memory (cf::MAP_IN_MEMORY); 1975 $self->in_memory (cf::MAP_IN_MEMORY);
1554 } 1976 }
1555 1977
1556 $self->post_load; 1978 $self->post_load;
1560 my ($self, $ob) = @_; 1982 my ($self, $ob) = @_;
1561 1983
1562 return find "~" . $ob->name . "/" . $self->{path} 1984 return find "~" . $ob->name . "/" . $self->{path}
1563 if $self->per_player; 1985 if $self->per_player;
1564 1986
1987# return find "?party/" . $ob->name . "/" . $self->{path}
1988# if $self->per_party;
1989
1565 $self 1990 $self
1566} 1991}
1567 1992
1568# find and load all maps in the 3x3 area around a map 1993# find and load all maps in the 3x3 area around a map
1569sub load_diag { 1994sub load_neighbours {
1570 my ($map) = @_; 1995 my ($map) = @_;
1571 1996
1572 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1573 1998
1574 for (0 .. 3) { 1999 for (0 .. 3) {
1575 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1576 or next; 2001 or next;
1577 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1578 or next; 2003 or next;
1579 $neigh->load; 2004 $neigh->load;
1580 2005
2006 push @neigh,
1581 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1582 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1583 } 2009 }
1584 2010
1585 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1586 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1587 or next; 2014 or next;
1588 $neigh->load; 2015 $neigh->load;
1589 } 2016 }
1590} 2017}
1591 2018
1596} 2023}
1597 2024
1598sub do_load_sync { 2025sub do_load_sync {
1599 my ($map) = @_; 2026 my ($map) = @_;
1600 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1601 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1602} 2032}
1603 2033
1604our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1605our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1606 2036
1607sub find_async { 2037sub find_async {
1608 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1609 2039
1610 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1611 2041
1612 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1613 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1614 } 2044 }
1615 2045
1616 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1617 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1618 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1619 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1620 my $map = find $path 2051 if (my $map = find $k) {
1621 or next;
1622 $map->load; 2052 $map->load if $v;
2053 }
1623 2054
1624 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
1625 } 2056 }
1626 } 2057 }
1627 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
1628 }; 2059 };
1629 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
1632} 2063}
1633 2064
1634sub save { 2065sub save {
1635 my ($self) = @_; 2066 my ($self) = @_;
1636 2067
1637 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 2069
1639 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
1640 2071
1641 return unless $self->dirty; 2072 return unless $self->dirty;
1642 2073
1665 my ($self) = @_; 2096 my ($self) = @_;
1666 2097
1667 # save first because save cedes 2098 # save first because save cedes
1668 $self->save; 2099 $self->save;
1669 2100
1670 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
1671 2102
1672 return if $self->players; 2103 return if $self->players;
1673 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
1674 return if $self->{deny_save}; 2105 return if $self->{deny_save};
1675 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
1676 $self->clear; 2111 $self->clear;
1677 $self->in_memory (cf::MAP_SWAPPED);
1678} 2112}
1679 2113
1680sub reset_at { 2114sub reset_at {
1681 my ($self) = @_; 2115 my ($self) = @_;
1682 2116
1683 # TODO: safety, remove and allow resettable per-player maps 2117 # TODO: safety, remove and allow resettable per-player maps
1684 return 1e99 if $self->isa ("ext::map_per_player");#d#
1685 return 1e99 if $self->{deny_reset}; 2118 return 1e99 if $self->{deny_reset};
1686 2119
1687 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2120 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2121 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1689 2122
1700 my ($self) = @_; 2133 my ($self) = @_;
1701 2134
1702 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2135 my $lock = cf::lock_acquire "map_data:$self->{path}";
1703 2136
1704 return if $self->players; 2137 return if $self->players;
1705 return if $self->isa ("ext::map_per_player");#d#
1706 2138
1707 warn "resetting map ", $self->path;#d# 2139 warn "resetting map ", $self->path;
1708 2140
1709 $self->in_memory (cf::MAP_SWAPPED); 2141 $self->in_memory (cf::MAP_SWAPPED);
1710 2142
1711 # need to save uniques path 2143 # need to save uniques path
1712 unless ($self->{deny_save}) { 2144 unless ($self->{deny_save}) {
1716 if $uniq; 2148 if $uniq;
1717 } 2149 }
1718 2150
1719 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
1720 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
1721 $self->clear; 2155 $self->clear;
1722
1723 $_->clear_links_to ($self) for values %cf::MAP;
1724 2156
1725 $self->unlink_save; 2157 $self->unlink_save;
1726 $self->destroy; 2158 $self->destroy;
1727} 2159}
1728 2160
1729my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
1730 2162
1731sub nuke { 2163sub nuke {
1732 my ($self) = @_; 2164 my ($self) = @_;
1733 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
1734 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
1735 2170
1736 $self->unlink_save; 2171 $self->unlink_save;
1737 2172
1738 bless $self, "cf::map"; 2173 bless $self, "cf::map";
1739 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
1740 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
1741 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
1742 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1743 2178
1744 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
1745 2181
1746 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2183}
2184
2185=item $maps = cf::map::tmp_maps
2186
2187Returns an arrayref with all map paths of currently instantiated and saved
2188maps. May block.
2189
2190=cut
2191
2192sub tmp_maps() {
2193 [
2194 map {
2195 utf8::decode $_;
2196 /\.map$/
2197 ? normalise $_
2198 : ()
2199 } @{ aio_readdir $TMPDIR or [] }
2200 ]
2201}
2202
2203=item $maps = cf::map::random_maps
2204
2205Returns an arrayref with all map paths of currently instantiated and saved
2206random maps. May block.
2207
2208=cut
2209
2210sub random_maps() {
2211 [
2212 map {
2213 utf8::decode $_;
2214 /\.map$/
2215 ? normalise "?random/$_"
2216 : ()
2217 } @{ aio_readdir $RANDOMDIR or [] }
2218 ]
1747} 2219}
1748 2220
1749=item cf::map::unique_maps 2221=item cf::map::unique_maps
1750 2222
1751Returns an arrayref of paths of all shared maps that have 2223Returns an arrayref of paths of all shared maps that have
1752instantiated unique items. May block. 2224instantiated unique items. May block.
1753 2225
1754=cut 2226=cut
1755 2227
1756sub unique_maps() { 2228sub unique_maps() {
1757 my $files = aio_readdir $UNIQUEDIR 2229 [
1758 or return; 2230 map {
1759
1760 my @paths;
1761
1762 for (@$files) {
1763 utf8::decode $_; 2231 utf8::decode $_;
1764 next if /\.pst$/; 2232 /\.map$/
1765 next unless /^$PATH_SEP/o; 2233 ? normalise $_
1766 2234 : ()
1767 push @paths, cf::map::normalise $_; 2235 } @{ aio_readdir $UNIQUEDIR or [] }
1768 } 2236 ]
1769
1770 \@paths
1771} 2237}
1772 2238
1773package cf; 2239package cf;
1774 2240
1775=back 2241=back
1793 map { $_, inv_recursive_ $_->inv } @_ 2259 map { $_, inv_recursive_ $_->inv } @_
1794} 2260}
1795 2261
1796sub inv_recursive { 2262sub inv_recursive {
1797 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2264}
2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
1798} 2295}
1799 2296
1800package cf; 2297package cf;
1801 2298
1802=back 2299=back
1821 2318
1822 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2319 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1823 2320
1824 if ($self->{record_replies}) { 2321 if ($self->{record_replies}) {
1825 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2322 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2323
1826 } else { 2324 } else {
2325 my $pl = $self->contr;
2326
2327 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2328 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330
2331 } else {
1827 $msg = $npc->name . " says: $msg" if $npc; 2332 $msg = $npc->name . " says: $msg" if $npc;
1828 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2334 }
1829 } 2335 }
2336}
2337
2338=item $object->send_msg ($channel, $msg, $color, [extra...])
2339
2340=cut
2341
2342sub cf::object::send_msg {
2343 my $pl = shift->contr
2344 or return;
2345 $pl->send_msg (@_);
1830} 2346}
1831 2347
1832=item $player_object->may ("access") 2348=item $player_object->may ("access")
1833 2349
1834Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
1881 $self->deactivate_recursive; 2397 $self->deactivate_recursive;
1882 2398
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2399 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 2400
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2401 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 2402 if $self->map && $self->map->{path} ne "{link}";
1887 2403
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2404 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 2405}
1890 2406
1891sub cf::object::player::leave_link { 2407sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 2408 my ($self, $map, $x, $y) = @_;
2409
2410 return unless $self->contr->active;
1893 2411
1894 my $link_pos = delete $self->{_link_pos}; 2412 my $link_pos = delete $self->{_link_pos};
1895 2413
1896 unless ($map) { 2414 unless ($map) {
1897 # restore original map position 2415 # restore original map position
1911 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
1912 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
1913 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
1914 2432
1915 $map->load; 2433 $map->load;
1916 $map->load_diag; 2434 $map->load_neighbours;
1917 2435
1918 return unless $self->contr->active; 2436 return unless $self->contr->active;
1919 $self->activate_recursive; 2437 $self->activate_recursive;
1920 2438
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 2440 $self->enter_map ($map, $x, $y);
1923} 2441}
1924 2442
1925cf::player->attach ( 2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1926 on_logout => sub {
1927 my ($pl) = @_;
1928 2444
1929 # abort map switching before logout 2445Moves the player to the given map-path and coordinates by first freezing
1930 if ($pl->ob->{_link_pos}) { 2446her, loading and preparing them map, calling the provided $check callback
1931 cf::sync_job { 2447that has to return the map if sucecssful, and then unfreezes the player on
1932 $pl->ob->leave_link 2448the new (success) or old (failed) map position. In either case, $done will
1933 }; 2449be called at the end of this process.
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938 2450
1939 # try to abort aborted map switching on player login :)
1940 # should happen only on crashes
1941 if ($pl->ob->{_link_pos}) {
1942 $pl->ob->enter_link;
1943 (async {
1944 $pl->ob->reply (undef,
1945 "There was an internal problem at your last logout, "
1946 . "the server will try to bring you to your intended destination in a second.",
1947 cf::NDI_RED);
1948 # we need this sleep as the login has a concurrent enter_exit running
1949 # and this sleep increases chances of the player not ending up in scorn
1950 Coro::Timer::sleep 1;
1951 $pl->ob->leave_link;
1952 })->prio (2);
1953 }
1954 },
1955);
1956
1957=item $player_object->goto ($path, $x, $y)
1958
1959=cut 2451=cut
2452
2453our $GOTOGEN;
1960 2454
1961sub cf::object::player::goto { 2455sub cf::object::player::goto {
1962 my ($self, $path, $x, $y) = @_; 2456 my ($self, $path, $x, $y, $check, $done) = @_;
2457
2458 # do generation counting so two concurrent goto's will be executed in-order
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1963 2460
1964 $self->enter_link; 2461 $self->enter_link;
1965 2462
1966 (async { 2463 (async {
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
1967 my $map = eval { 2483 my $map = eval {
1968 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2485
2486 if ($map) {
1969 $map = $map->customise_for ($self) if $map; 2487 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map;
2489 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 }
2492
1970 $map 2493 $map
2494 };
2495
2496 if ($@) {
2497 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2498 LOG llevError | logBacktrace, Carp::longmess $@;
1971 } or 2499 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 2500
2501 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 2503 $self->leave_link ($map, $x, $y);
2504 }
2505
2506 $done->() if $done;
1975 })->prio (1); 2507 })->prio (1);
1976} 2508}
1977 2509
1978=item $player_object->enter_exit ($exit_object) 2510=item $player_object->enter_exit ($exit_object)
1979 2511
2048 my $hp = $exit->stats->hp; 2580 my $hp = $exit->stats->hp;
2049 my $sp = $exit->stats->sp; 2581 my $sp = $exit->stats->sp;
2050 2582
2051 $self->enter_link; 2583 $self->enter_link;
2052 2584
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2053 (async { 2589 (async {
2054 $self->deactivate_recursive; # just to be sure 2590 $self->deactivate_recursive; # just to be sure
2055 unless (eval { 2591 unless (eval {
2056 $self->goto ($slaying, $hp, $sp); 2592 $self->goto ($slaying, $hp, $sp);
2057 2593
2084 2620
2085 utf8::encode $text; 2621 utf8::encode $text;
2086 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2087} 2623}
2088 2624
2625=item $client->send_msg ($channel, $msg, $color, [extra...])
2626
2627Send a drawinfo or msg packet to the client, formatting the msg for the
2628client if neccessary. C<$type> should be a string identifying the type of
2629the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet.
2631
2632=cut
2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2649sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_;
2651
2652 $msg = $self->pl->expand_cfpod ($msg);
2653
2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2658
2659 if (ref $channel) {
2660 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2665 }
2666
2667 $channel = $channel->{id};
2668 }
2669
2670 return unless @extra || length $msg;
2671
2672 if ($self->can_msg) {
2673 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF;
2676
2677 $self->send_packet ("msg " . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2679 } else {
2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690
2691 $color &= cf::NDI_COLOR_MASK;
2692
2693 utf8::encode $msg;
2694
2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2698 } else {
2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2700 $self->send_packet ("drawinfo $color $msg")
2701 }
2702 }
2703 }
2704}
2705
2089=item $client->ext_event ($type, %msg) 2706=item $client->ext_msg ($type, @msg)
2090 2707
2091Sends an exti event to the client. 2708Sends an ext event to the client.
2092 2709
2093=cut 2710=cut
2094 2711
2095sub cf::client::ext_event($$%) { 2712sub cf::client::ext_msg($$@) {
2096 my ($self, $type, %msg) = @_; 2713 my ($self, $type, @msg) = @_;
2097 2714
2715 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove
2098 $msg{msgtype} = "event_$type"; 2718 push @msg, msgtype => "event_$type";
2099 $self->send_packet ("ext " . cf::to_json \%msg); 2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 }
2721}
2722
2723=item $client->ext_reply ($msgid, @msg)
2724
2725Sends an ext reply to the client.
2726
2727=cut
2728
2729sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_;
2731
2732 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 }
2100} 2739}
2101 2740
2102=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
2103 2742
2104Queues a query to the client, calling the given callback with 2743Queues a query to the client, calling the given callback with
2105the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2744the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2106C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2745C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2107 2746
2108Queries can fail, so check the return code. Or don't, as queries will become 2747Queries can fail, so check the return code. Or don't, as queries will
2109reliable at some point in the future. 2748become reliable at some point in the future.
2110 2749
2111=cut 2750=cut
2112 2751
2113sub cf::client::query { 2752sub cf::client::query {
2114 my ($self, $flags, $text, $cb) = @_; 2753 my ($self, $flags, $text, $cb) = @_;
2122 utf8::encode $text; 2761 utf8::encode $text;
2123 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2762 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2124 2763
2125 $self->send_packet ($self->{query_queue}[0][0]) 2764 $self->send_packet ($self->{query_queue}[0][0])
2126 if @{ $self->{query_queue} } == 1; 2765 if @{ $self->{query_queue} } == 1;
2766
2767 1
2127} 2768}
2128 2769
2129cf::client->attach ( 2770cf::client->attach (
2771 on_connect => sub {
2772 my ($ns) = @_;
2773
2774 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2775 },
2130 on_reply => sub { 2776 on_reply => sub {
2131 my ($ns, $msg) = @_; 2777 my ($ns, $msg) = @_;
2132 2778
2133 # this weird shuffling is so that direct followup queries 2779 # this weird shuffling is so that direct followup queries
2134 # get handled first 2780 # get handled first
2146 } else { 2792 } else {
2147 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2793 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2148 } 2794 }
2149 } 2795 }
2150 }, 2796 },
2797 on_exticmd => sub {
2798 my ($ns, $buf) = @_;
2799
2800 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2801
2802 if (ref $msg) {
2803 my ($type, $reply, @payload) =
2804 "ARRAY" eq ref $msg
2805 ? @$msg
2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2807
2808 my @reply;
2809
2810 if (my $cb = $EXTICMD{$type}) {
2811 @reply = $cb->($ns, @payload);
2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2817 } else {
2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2819 }
2820
2821 cf::override;
2822 },
2151); 2823);
2152 2824
2153=item $client->async (\&cb) 2825=item $client->async (\&cb)
2154 2826
2155Create a new coroutine, running the specified callback. The coroutine will 2827Create a new coroutine, running the specified callback. The coroutine will
2196our $safe = new Safe "safe"; 2868our $safe = new Safe "safe";
2197our $safe_hole = new Safe::Hole; 2869our $safe_hole = new Safe::Hole;
2198 2870
2199$SIG{FPE} = 'IGNORE'; 2871$SIG{FPE} = 'IGNORE';
2200 2872
2201$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2873$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math
2875 grepstart grepwhile mapstart mapwhile
2876 sort time
2877));
2202 2878
2203# here we export the classes and methods available to script code 2879# here we export the classes and methods available to script code
2204 2880
2205=pod 2881=pod
2206 2882
2207The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2208 2884
2209 cf::object contr pay_amount pay_player map 2885 cf::object
2886 contr pay_amount pay_player map x y force_find force_add
2887 insert remove name archname title slaying race decrease_ob_nr
2888
2210 cf::object::player player 2889 cf::object::player
2211 cf::player peaceful 2890 player
2212 cf::map trigger 2891
2892 cf::player
2893 peaceful
2894
2895 cf::map
2896 trigger
2213 2897
2214=cut 2898=cut
2215 2899
2216for ( 2900for (
2217 ["cf::object" => qw(contr pay_amount pay_player map)], 2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race
2903 decrease_ob_nr)],
2218 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2219 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2220 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2221) { 2907) {
2222 no strict 'refs'; 2908 no strict 'refs';
2293=back 2979=back
2294 2980
2295=cut 2981=cut
2296 2982
2297############################################################################# 2983#############################################################################
2298
2299=head2 EXTENSION DATABASE SUPPORT
2300
2301Crossfire maintains a very simple database for extension use. It can
2302currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2303convert to/from binary).
2304
2305The parameter C<$family> should best start with the name of the extension
2306using it, it should be unique.
2307
2308=over 4
2309
2310=item $value = cf::db_get $family => $key
2311
2312Returns a single value from the database.
2313
2314=item cf::db_put $family => $key => $value
2315
2316Stores the given C<$value> in the family.
2317
2318=cut
2319
2320our $DB;
2321
2322sub db_init {
2323 unless ($DB) {
2324 $DB = BDB::db_create $DB_ENV;
2325
2326 cf::sync_job {
2327 eval {
2328 $DB->set_flags (BDB::CHKSUM);
2329
2330 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2331 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2332 cf::cleanup "db_open(db): $!" if $!;
2333 };
2334 cf::cleanup "db_open(db): $@" if $@;
2335 };
2336 }
2337}
2338
2339sub db_get($$) {
2340 my $key = "$_[0]/$_[1]";
2341
2342 cf::sync_job {
2343 BDB::db_get $DB, undef, $key, my $data;
2344
2345 $! ? ()
2346 : $data
2347 }
2348}
2349
2350sub db_put($$$) {
2351 BDB::dbreq_pri 4;
2352 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2353}
2354
2355=item cf::cache $id => [$paths...], $processversion => $process
2356
2357Generic caching function that returns the value of the resource $id,
2358caching and regenerating as required.
2359
2360This function can block.
2361
2362=cut
2363
2364sub cache {
2365 my ($id, $src, $processversion, $process) = @_;
2366
2367 my $meta =
2368 join "\x00",
2369 $processversion,
2370 map {
2371 aio_stat $_
2372 and Carp::croak "$_: $!";
2373
2374 ($_, (stat _)[7,9])
2375 } @$src;
2376
2377 my $dbmeta = db_get cache => "$id/meta";
2378 if ($dbmeta ne $meta) {
2379 # changed, we may need to process
2380
2381 my @data;
2382 my $md5;
2383
2384 for (0 .. $#$src) {
2385 0 <= aio_load $src->[$_], $data[$_]
2386 or Carp::croak "$src->[$_]: $!";
2387 }
2388
2389 # if processing is expensive, check
2390 # checksum first
2391 if (1) {
2392 $md5 =
2393 join "\x00",
2394 $processversion,
2395 map {
2396 Coro::cede;
2397 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2398 } 0.. $#$src;
2399
2400
2401 my $dbmd5 = db_get cache => "$id/md5";
2402 if ($dbmd5 eq $md5) {
2403 db_put cache => "$id/meta", $meta;
2404
2405 return db_get cache => "$id/data";
2406 }
2407 }
2408
2409 my $t1 = Time::HiRes::time;
2410 my $data = $process->(\@data);
2411 my $t2 = Time::HiRes::time;
2412
2413 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2414
2415 db_put cache => "$id/data", $data;
2416 db_put cache => "$id/md5" , $md5;
2417 db_put cache => "$id/meta", $meta;
2418
2419 return $data;
2420 }
2421
2422 db_get cache => "$id/data"
2423}
2424
2425=item fork_call { }, $args
2426
2427Executes the given code block with the given arguments in a seperate
2428process, returning the results. Everything must be serialisable with
2429Coro::Storable. May, of course, block. Note that the executed sub may
2430never block itself or use any form of Event handling.
2431
2432=cut
2433
2434sub fork_call(&@) {
2435 my ($cb, @args) = @_;
2436
2437# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2438# or die "socketpair: $!";
2439 pipe my $fh1, my $fh2
2440 or die "pipe: $!";
2441
2442 if (my $pid = fork) {
2443 close $fh2;
2444
2445 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2446 $res = Coro::Storable::thaw $res;
2447
2448 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2449
2450 die $$res unless "ARRAY" eq ref $res;
2451
2452 return wantarray ? @$res : $res->[-1];
2453 } else {
2454 reset_signals;
2455 local $SIG{__WARN__};
2456 local $SIG{__DIE__};
2457 eval {
2458 close $fh1;
2459
2460 my @res = eval { $cb->(@args) };
2461 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2462 };
2463
2464 warn $@ if $@;
2465 _exit 0;
2466 }
2467}
2468
2469
2470
2471#############################################################################
2472# the server's init and main functions 2984# the server's init and main functions
2473 2985
2474sub load_facedata($) { 2986sub load_facedata($) {
2475 my ($path) = @_; 2987 my ($path) = @_;
2988
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2476 2994
2477 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2478 2996
2479 my $facedata; 2997 my $facedata;
2480 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2483 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2484 3002
2485 $facedata->{version} == 2 3003 $facedata->{version} == 2
2486 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
2487 3005
3006 # patch in the exptable
3007 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3010 };
3011 cf::cede_to_tick;
3012
2488 { 3013 {
2489 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2490 3015
2491 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2493 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3018 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap};
2494 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2495 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2496 Coro::cede; 3022
3023 cf::cede_to_tick;
2497 } 3024 }
2498 3025
2499 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
2500 next unless $info->{smooth}; 3027 next unless $info->{smooth};
2501 my $idx = cf::face::find $face 3028 my $idx = cf::face::find $face
2502 or next; 3029 or next;
2503 if (my $smooth = cf::face::find $info->{smooth}) { 3030 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth;
2504 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2505 } else { 3033 } else {
2506 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3034 warn "smooth face '$info->{smooth}' not found for face '$face'";
2507 } 3035 }
2508 Coro::cede; 3036
3037 cf::cede_to_tick;
2509 } 3038 }
2510 } 3039 }
2511 3040
2512 { 3041 {
2513 my $anims = $facedata->{animinfo}; 3042 my $anims = $facedata->{animinfo};
2514 3043
2515 while (my ($anim, $info) = each %$anims) { 3044 while (my ($anim, $info) = each %$anims) {
2516 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3045 cf::anim::set $anim, $info->{frames}, $info->{facings};
2517 Coro::cede; 3046 cf::cede_to_tick;
2518 } 3047 }
2519 3048
2520 cf::anim::invalidate_all; # d'oh 3049 cf::anim::invalidate_all; # d'oh
2521 } 3050 }
2522 3051
3052 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource};
3056
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062
3063 if ($info->{type} & 1) {
3064 # prepend meta info
3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
3072 } else {
3073 $data = $info->{data};
3074 }
3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick;
3080 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 }
3100
2523 1 3101 1
2524} 3102}
2525 3103
3104register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_;
3106
3107 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v);
3109 }
3110};
3111
2526sub reload_regions { 3112sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = ();
3116
2527 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2528 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
3119
3120 for (cf::region::list) {
3121 $_->{match} = qr/$_->{match}/
3122 if exists $_->{match};
3123 }
2529} 3124}
2530 3125
2531sub reload_facedata { 3126sub reload_facedata {
2532 load_facedata "$DATADIR/facedata" 3127 load_facedata "$DATADIR/facedata"
2533 or die "unable to load facedata\n"; 3128 or die "unable to load facedata\n";
2534} 3129}
2535 3130
2536sub reload_archetypes { 3131sub reload_archetypes {
2537 load_resource_file "$DATADIR/archetypes" 3132 load_resource_file "$DATADIR/archetypes"
2538 or die "unable to load archetypes\n"; 3133 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
2539} 3139}
2540 3140
2541sub reload_treasures { 3141sub reload_treasures {
2542 load_resource_file "$DATADIR/treasures" 3142 load_resource_file "$DATADIR/treasures"
2543 or die "unable to load treasurelists\n"; 3143 or die "unable to load treasurelists\n";
2546sub reload_resources { 3146sub reload_resources {
2547 warn "reloading resource files...\n"; 3147 warn "reloading resource files...\n";
2548 3148
2549 reload_regions; 3149 reload_regions;
2550 reload_facedata; 3150 reload_facedata;
3151 #reload_archetypes;#d#
2551 reload_archetypes; 3152 reload_archetypes;
2552 reload_treasures; 3153 reload_treasures;
2553 3154
2554 warn "finished reloading resource files\n"; 3155 warn "finished reloading resource files\n";
2555} 3156}
2556 3157
2557sub init { 3158sub init {
2558 reload_resources; 3159 reload_resources;
2559} 3160}
2560 3161
2561sub cfg_load { 3162sub reload_config {
2562 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2563 or return; 3164 or return;
2564 3165
2565 local $/; 3166 local $/;
2566 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
2586 (async { 3187 (async {
2587 Event::one_event; 3188 Event::one_event;
2588 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
2589 }; 3190 };
2590 3191
2591 cfg_load; 3192 reload_config;
2592 db_init; 3193 db_init;
2593 load_extensions; 3194 load_extensions;
2594 3195
2595 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
2596 Event::loop; 3197 Event::loop;
2612 }, 3213 },
2613 ); 3214 );
2614 } 3215 }
2615} 3216}
2616 3217
3218sub write_runtime {
3219 my $runtime = "$LOCALDIR/runtime";
3220
3221 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time.
3223
3224 IO::AIO::aio_utime $runtime, undef, undef;
3225
3226 my $guard = cf::lock_acquire "write_runtime";
3227
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3229 or return;
3230
3231 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server.
3234
3235 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3236 and return;
3237
3238 # always fsync - this file is important
3239 aio_fsync $fh
3240 and return;
3241
3242 # touch it again to show we are up-to-date
3243 aio_utime $fh, undef, undef;
3244
3245 close $fh
3246 or return;
3247
3248 aio_rename "$runtime~", $runtime
3249 and return;
3250
3251 warn "runtime file written.\n";
3252
3253 1
3254}
3255
2617sub emergency_save() { 3256sub emergency_save() {
2618 my $freeze_guard = cf::freeze_mainloop; 3257 my $freeze_guard = cf::freeze_mainloop;
2619 3258
2620 warn "enter emergency perl save\n"; 3259 warn "enter emergency perl save\n";
2621 3260
2696 %EXT_CORO = (); 3335 %EXT_CORO = ();
2697 3336
2698 warn "removing commands"; 3337 warn "removing commands";
2699 %COMMAND = (); 3338 %COMMAND = ();
2700 3339
2701 warn "removing ext commands"; 3340 warn "removing ext/exti commands";
2702 %EXTCMD = (); 3341 %EXTCMD = ();
3342 %EXTICMD = ();
2703 3343
2704 warn "unloading/nuking all extensions"; 3344 warn "unloading/nuking all extensions";
2705 for my $pkg (@EXTS) { 3345 for my $pkg (@EXTS) {
2706 warn "... unloading $pkg"; 3346 warn "... unloading $pkg";
2707 3347
2750 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
2751 require cf; 3391 require cf;
2752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2753 3393
2754 warn "loading config and database again"; 3394 warn "loading config and database again";
2755 cf::cfg_load; 3395 cf::reload_config;
2756 3396
2757 warn "loading extensions"; 3397 warn "loading extensions";
2758 cf::load_extensions; 3398 cf::load_extensions;
2759 3399
2760 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
2838 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839 unless ++$bug_warning > 10; 3479 unless ++$bug_warning > 10;
2840 return; 3480 return;
2841 } 3481 }
2842 3482
2843 $NOW = Event::time; 3483 $NOW = $tick_start = Event::time;
2844 3484
2845 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
2846 3486
2847 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
2853 write_runtime 3493 write_runtime
2854 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
2855 }; 3495 };
2856 } 3496 }
2857 3497
2858# my $AFTER = Event::time; 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2859# warn $AFTER - $NOW;#d# 3499 $sig->send;
3500 }
3501 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send;
3503 }
3504
3505 $NOW = Event::time;
2860 3506
2861 # if we are delayed by four ticks or more, skip them all 3507 # if we are delayed by four ticks or more, skip them all
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 3509
2864 $TICK_WATCHER->at ($NEXT_TICK); 3510 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 3511 $TICK_WATCHER->start;
2866 3512
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3513 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 3515
2874 _post_tick; 3516 _post_tick;
2875 }, 3517 },
2876); 3518);
2877 3519
2878{ 3520{
3521 BDB::min_parallel 8;
2879 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
2880 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
2881 reentrant => 0, 3524 reentrant => 0,
2882 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
2883 poll => 'r', 3526 poll => 'r',
2884 prio => 0, 3527 prio => 0,
2885 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
2886 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
2887 ); 3530 );
2888 BDB::min_parallel 8;
2889 3531
2890 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
2891 my $status; 3533 my $status;
2892 my $current = $Coro::current; 3534 my $current = $Coro::current;
2893 ( 3535 (
2902 ) 3544 )
2903 }; 3545 };
2904 3546
2905 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
2906 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2907 3553
2908 cf::sync_job { 3554 cf::sync_job {
2909 eval { 3555 eval {
2910 BDB::db_env_open 3556 BDB::db_env_open
2911 $DB_ENV, 3557 $DB_ENV,
2913 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2914 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2915 0666; 3561 0666;
2916 3562
2917 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2918
2919 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2920 $DB_ENV->set_lk_detect;
2921 }; 3564 };
2922 3565
2923 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
2924 }; 3567 };
2925 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
2926} 3600}
2927 3601
2928{ 3602{
2929 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
2930 3604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines