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.358 by root, Fri Sep 7 18:10:52 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;
83our %CFG; 87our %CFG;
84 88
85our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 90our $RUNTIME;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
94 102
95binmode STDOUT; 103binmode STDOUT;
96binmode STDERR; 104binmode STDERR;
97 105
98# read virtual server time, if available 106# read virtual server time, if available
139 147
140=item $cf::TICK 148=item $cf::TICK
141 149
142The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
143 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
144=item %cf::CFG 162=item %cf::CFG
145 163
146Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
147from wherever your confdir points to. 165from wherever your confdir points to.
148 166
149=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
150 168
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
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.
154 178
155=back 179=back
156 180
157=cut 181=cut
158 182
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 204
180# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 206# within the Safe compartment.
182for my $pkg (qw( 207for my $pkg (qw(
183 cf::global cf::attachable 208 cf::global cf::attachable
191} 216}
192 217
193$Event::DIED = sub { 218$Event::DIED = sub {
194 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
195}; 220};
221
222#############################################################################
196 223
197=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
198 225
199=over 4 226=over 4
200 227
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 247 $d
221 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
222} 249}
223 250
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
227 252
228Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
229 254
230=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
231 256
232Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
240Wait until the given lock is available and then acquires it and returns 272Wait 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, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
243returned. 275returned.
244 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
245Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
247 282
248=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
249 284
250Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
251 286
252=cut 287=cut
253 288
254our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
255 291
256sub lock_wait($) { 292sub lock_wait($) {
257 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
258 299
259 # wait for lock, if any 300 # wait for lock, if any
260 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 303 Coro::schedule;
268 309
269 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
270 lock_wait $key; 311 lock_wait $key;
271 312
272 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
273 315
274 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
277 } 320 }
278} 321}
279 322
291 }; 334 };
292 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
293 $guard 336 $guard
294} 337}
295 338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
393}
394
296=item cf::async { BLOCK } 395=item cf::async { BLOCK }
297 396
298Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 398C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 399thing you are allowed to do is call C<prio> on it.
303 402
304BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
305 404
306=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
307 406
308The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 408is 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. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
311 411
312If it must be done, put the blocking parts into C<sync_job>. This will run 412If 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 413the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
315fast or be very important. 415fast or be very important.
318 418
319sub sync_job(&) { 419sub sync_job(&) {
320 my ($job) = @_; 420 my ($job) = @_;
321 421
322 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
323 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
325 427
326 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 429 # (but this is cancel-safe)
338 440
339 while ($busy) { 441 while ($busy) {
340 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
341 } 443 }
342 444
445 $time = Event::time - $time;
446
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load
451
343 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
344 } else { 453 } else {
345 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
346 455
347 $job->() 456 $job->()
366 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
367 476
368 $coro 477 $coro
369} 478}
370 479
371sub write_runtime { 480=item fork_call { }, $args
372 my $runtime = "$LOCALDIR/runtime";
373 481
374 # first touch the runtime file to show we are still running: 482Executes the given code block with the given arguments in a seperate
375 # the fsync below can take a very very long time. 483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
376 486
377 warn "touching runtime...\n";#d# 487=cut
378 if (my $fh = aio_open $runtime, O_WRONLY, 0) {
379 utime undef, undef, $fh;
380 }
381 488
382 my $guard = cf::lock_acquire "write_runtime"; 489sub fork_call(&@) {
490 my ($cb, @args) = @_;
383 491
384 warn "starting to write runtime...\n";#d# 492 # we seemingly have to make a local copy of the whole thing,
385 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 493 # otherwise perl prematurely frees the stuff :/
386 or return; 494 # TODO: investigate and fix (likely this will be rather laborious)
387 495
388 my $value = $cf::RUNTIME + 90 + 10; 496 my @res = Coro::Util::fork_eval {
389 # 10 is the runtime save interval, for a monotonic clock 497 reset_signals;
390 # 60 allows for the watchdog to kill the server. 498 &$cb
499 }, @args;
391 500
392 (aio_write $fh, 0, (length $value), $value, 0) <= 0 501 wantarray ? @res : $res[-1]
393 and return; 502}
394 503
395 # always fsync - this file is important 504=item $value = cf::db_get $family => $key
396 aio_fsync $fh
397 and return;
398 505
399 # touch it again to show we are up-to-date 506Returns a single value from the environment database.
400 utime undef, undef, $fh;
401 507
402 close $fh 508=item cf::db_put $family => $key => $value
403 or return;
404 509
405 aio_rename "$runtime~", $runtime 510Stores the given C<$value> in the family. It can currently store binary
406 and return; 511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
407 512
408 warn "... done writing runtime.\n";#d# 513=cut
409 514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
410 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
411} 618}
412 619
413=item cf::datalog type => key => value, ... 620=item cf::datalog type => key => value, ...
414 621
415Log a datalog packet of the given type with the given key-value pairs. 622Log 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") 640attach callbacks/event handlers (a collection of which is called an "attachment")
434to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
435 642
436In the following description, CLASS can be any of C<global>, C<object> 643In 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 644C<player>, C<client> or C<map> (i.e. the attachable objects in
438crossfire+). 645Crossfire TRT).
439 646
440=over 4 647=over 4
441 648
442=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
443 650
606 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
607 814
608 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
609 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
610 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
611 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
612 819
613 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
614 my $pkg = shift @arg; 821 my $pkg = shift @arg;
615 822
616 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
645 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
646 } 853 }
647 854
648 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
649 } else { 856 } else {
650 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
651 } 858 }
652 859
653 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
654} 861}
655 862
657 if (ref $_[0]) { 864 if (ref $_[0]) {
658 _object_attach @_; 865 _object_attach @_;
659 } else { 866 } else {
660 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
661 } 868 }
869 _recalc_want;
662}; 870};
663 871
664# all those should be optimised 872# all those should be optimised
665sub cf::attachable::detach { 873sub cf::attachable::detach {
666 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
669 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
670 reattach ($obj); 878 reattach ($obj);
671 } else { 879 } else {
672 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
673 } 881 }
882 _recalc_want;
674}; 883};
675 884
676sub cf::attachable::attached { 885sub cf::attachable::attached {
677 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
678 887
693 "; 902 ";
694 die if $@; 903 die if $@;
695} 904}
696 905
697our $override; 906our $override;
698our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
699 908
700sub override { 909sub override {
701 $override = 1; 910 $override = 1;
702 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
703} 912}
704 913
705sub do_invoke { 914sub do_invoke {
706 my $event = shift; 915 my $event = shift;
707 my $callbacks = shift; 916 my $callbacks = shift;
708 917
709 @invoke_results = (); 918 @INVOKE_RESULTS = ();
710 919
711 local $override; 920 local $override;
712 921
713 for (@$callbacks) { 922 for (@$callbacks) {
714 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
731 940
732Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
733 942
734This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This 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 944removed in future versions), and there is no public API to access override
736results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
737 946
738=back 947=back
739 948
740=cut 949=cut
741 950
742############################################################################# 951#############################################################################
743# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
744 964
745sub reattach { 965sub reattach {
746 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
747 my ($obj) = @_; 967 my ($obj) = @_;
748 968
792 }, 1012 },
793); 1013);
794 1014
795sub object_freezer_save { 1015sub object_freezer_save {
796 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
797 1019
798 sync_job { 1020 sync_job {
799 if (length $$rdata) { 1021 if (length $$rdata) {
800 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
801 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
825 } 1047 }
826 } else { 1048 } else {
827 aio_unlink $filename; 1049 aio_unlink $filename;
828 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
829 } 1051 }
830 } 1052 };
1053
1054 undef $guard;
831} 1055}
832 1056
833sub object_freezer_as_string { 1057sub object_freezer_as_string {
834 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
835 1059
840 1064
841sub object_thawer_load { 1065sub object_thawer_load {
842 my ($filename) = @_; 1066 my ($filename) = @_;
843 1067
844 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
845 1071
846 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
847 or return; 1073 or return;
848 1074
849 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
850 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
851 or return; 1077 or return;
1078
1079 undef $guard;
852 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
853 } 1081 }
854 1082
855 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
856 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
857 return ($data, $av); 1086 ($data, $av)
858} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
859 1094
860############################################################################# 1095#############################################################################
861# command handling &c 1096# command handling &c
862 1097
863=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
876 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
877} 1112}
878 1113
879=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
880 1115
881Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
882 1121
883If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
884called. 1123called.
885 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
886=cut 1136=cut
887 1137
888sub register_extcmd { 1138sub register_extcmd {
889 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
890 1140
891 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
892} 1148}
893 1149
894cf::player->attach ( 1150cf::player->attach (
895 on_command => sub { 1151 on_command => sub {
896 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
905 cf::override; 1161 cf::override;
906 }, 1162 },
907 on_extcmd => sub { 1163 on_extcmd => sub {
908 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
909 1165
910 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
911 1167
912 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
913 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
914 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
915 $pl->ext_reply ($msg->{msgid}, %reply);
916 }
917 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
918 } else { 1183 } else {
919 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
920 } 1185 }
921 1186
922 cf::override; 1187 cf::override;
923 }, 1188 },
924); 1189);
925 1190
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 { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
961 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
962 next unless -r $ext; 1196 next unless -r $path;
963 eval { 1197
964 load_extension $ext; 1198 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1199 my $base = $1;
1200 my $pkg = $1;
1201 $pkg =~ s/[^[:word:]]/_/g;
1202 $pkg = "ext::$pkg";
1203
1204 open my $fh, "<:utf8", $path
1205 or die "$path: $!";
1206
1207 my $source = do { local $/; <$fh> };
1208
1209 my %ext = (
1210 path => $path,
1211 base => $base,
1212 pkg => $pkg,
1213 );
1214
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217
1218 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n"
1221 . $source
1222 . "\n};\n1";
1223
1224 $todo{$base} = \%ext;
1225 }
1226
1227 my %done;
1228 while (%todo) {
1229 my $progress;
1230
1231 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip
1234 unless exists $done{$_};
1235 }
1236
1237 warn "... loading '$k' into '$v->{pkg}'\n";
1238
1239 unless (eval $v->{source}) {
1240 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n";
1242
1243 if (exists $v->{meta}{mandatory}) {
1244 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n";
1246 exit 1;
1247 }
1248
1249 warn $msg;
1250 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
965 1 1255 }
966 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
967 } 1261 };
968} 1262}
969 1263
970############################################################################# 1264#############################################################################
1265
1266=back
971 1267
972=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
973 1269
974Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
975 1271
1025 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1026 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1027 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1028 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1029 1325
1030 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1031 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1032 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1033 } 1335 }
1034 } 1336 }
1035} 1337}
1036 1338
1046 1348
1047 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1048 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1049 1351
1050 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1051 Coro::cede; 1353 cf::cede_to_tick;
1052} 1354}
1053 1355
1054sub new($) { 1356sub new($) {
1055 my ($login) = @_; 1357 my ($login) = @_;
1056 1358
1060 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1061 1363
1062 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1063 1365
1064 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1065} 1377}
1066 1378
1067=item $pl->quit_character 1379=item $pl->quit_character
1068 1380
1069Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
1124 or return []; 1436 or return [];
1125 1437
1126 my @logins; 1438 my @logins;
1127 1439
1128 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1129 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1130 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1131 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1132 1449
1133 utf8::decode $login; 1450 utf8::decode $login;
1134 push @logins, $login; 1451 push @logins, $login;
1135 } 1452 }
1136 1453
1163 } 1480 }
1164 1481
1165 \@paths 1482 \@paths
1166} 1483}
1167 1484
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1486
1487Expand crossfire pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535
1168=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1169 1537
1170Sends an ext reply to the player. 1538Sends an ext reply to the player.
1171 1539
1172=cut 1540=cut
1173 1541
1174sub ext_reply($$%) { 1542sub ext_reply($$@) {
1175 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1176 1544
1177 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1178
1179 $self->send ("ext " . cf::to_json \%msg);
1180} 1546}
1181 1547
1182=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1183 1549
1184Sends an ext event to the client. 1550Sends an ext event to the client.
1185 1551
1186=cut 1552=cut
1187 1553
1188sub ext_event($$%) { 1554sub ext_msg($$@) {
1189 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1190 1556
1191 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1192} 1558}
1193 1559
1194=head3 cf::region 1560=head3 cf::region
1195 1561
1196=over 4 1562=over 4
1199 1565
1200package cf::region; 1566package cf::region;
1201 1567
1202=item cf::region::find_by_path $path 1568=item cf::region::find_by_path $path
1203 1569
1204Tries to decuce the probable region for a map knowing only its path. 1570Tries to decuce the likely region for a map knowing only its path.
1205 1571
1206=cut 1572=cut
1207 1573
1208sub find_by_path($) { 1574sub find_by_path($) {
1209 my ($path) = @_; 1575 my ($path) = @_;
1210 1576
1211 my ($match, $specificity); 1577 my ($match, $specificity);
1212 1578
1213 for my $region (list) { 1579 for my $region (list) {
1214 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1215 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1216 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1217 } 1583 }
1218 } 1584 }
1219 1585
1283 my ($self, $merge) = @_; 1649 my ($self, $merge) = @_;
1284 1650
1285 # we have to keep some variables in memory intact 1651 # we have to keep some variables in memory intact
1286 local $self->{path}; 1652 local $self->{path};
1287 local $self->{load_path}; 1653 local $self->{load_path};
1288 local $self->{deny_save};
1289 local $self->{deny_reset};
1290 1654
1291 $self->SUPER::thawer_merge ($merge); 1655 $self->SUPER::thawer_merge ($merge);
1292} 1656}
1293 1657
1294sub normalise { 1658sub normalise {
1341 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1342 return $self; 1706 return $self;
1343 } 1707 }
1344 } 1708 }
1345 1709
1346 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1347 () 1711 ()
1348} 1712}
1349 1713
1350sub init { 1714sub init {
1351 my ($self) = @_; 1715 my ($self) = @_;
1394 1758
1395 $_->change_map_light ($change) 1759 $_->change_map_light ($change)
1396 for grep $_->outdoor, values %cf::MAP; 1760 for grep $_->outdoor, values %cf::MAP;
1397} 1761}
1398 1762
1763sub decay_objects {
1764 my ($self) = @_;
1765
1766 return if $self->{deny_reset};
1767
1768 $self->do_decay_objects;
1769}
1770
1399sub unlink_save { 1771sub unlink_save {
1400 my ($self) = @_; 1772 my ($self) = @_;
1401 1773
1402 utf8::encode (my $save = $self->save_path); 1774 utf8::encode (my $save = $self->save_path);
1403 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1775 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1406 1778
1407sub load_header_from($) { 1779sub load_header_from($) {
1408 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1409 1781
1410 utf8::encode $path; 1782 utf8::encode $path;
1411 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1412 # or return;
1413
1414 $self->_load_header ($path)
1415 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1416 1791
1417 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1418 1793
1419 1 1794 1
1420} 1795}
1459 $self->load_header_orig 1834 $self->load_header_orig
1460 or return; 1835 or return;
1461 $self->prepare_orig; 1836 $self->prepare_orig;
1462 } 1837 }
1463 1838
1839 $self->{deny_reset} = 1
1840 if $self->no_reset;
1841
1464 $self->default_region (cf::region::find_by_path $self->{path}) 1842 $self->default_region (cf::region::find_by_path $self->{path})
1465 unless $self->default_region; 1843 unless $self->default_region;
1466 1844
1467 1 1845 1
1468} 1846}
1471sub find { 1849sub find {
1472 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1473 1851
1474 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1475 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1476 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1477 1856
1478 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1479 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1480 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1481 or return; 1862 or return;
1482 1863
1483 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1484 1865
1485 $map->load_header 1866 $map->load_header
1486 or return; 1867 or return;
1487 1868
1488 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1489 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1490 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1491 $map->reset; 1874 $map->reset;
1492 undef $guard;
1493 return find $path; 1875 return find $path;
1494 } 1876 }
1495 1877
1496 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1497 } 1879 }
1506 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1507 1889
1508 my $path = $self->{path}; 1890 my $path = $self->{path};
1509 1891
1510 { 1892 {
1511 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1512 1894
1895 return unless $self->valid;
1513 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1514 1897
1515 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1516 1899
1517 $self->alloc; 1900 $self->alloc;
1518 1901
1519 $self->pre_load; 1902 $self->pre_load;
1520 Coro::cede; 1903 cf::cede_to_tick;
1521 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1522 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1523 or return; 1908 or return;
1524 1909
1525 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1526 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1527 1912
1528 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1529 utf8::encode $uniq; 1914 utf8::encode $uniq;
1530 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1531 $self->clear_unique_items; 1917 $self->clear_unique_items;
1532 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1533 } 1921 }
1534 } 1922 }
1535 1923
1536 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1537 # now do the right thing for maps 1927 # now do the right thing for maps
1538 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1539 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1540 unless $self->difficulty; 1930 unless $self->difficulty;
1541 Coro::cede; 1931 cf::cede_to_tick;
1542 1932
1543 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1544 $self->decay_objects; 1934 $self->decay_objects;
1545 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1546 $self->update_buttons; 1936 $self->update_buttons;
1547 Coro::cede; 1937 cf::cede_to_tick;
1548 $self->set_darkness_map; 1938 $self->set_darkness_map;
1549 Coro::cede; 1939 cf::cede_to_tick;
1550 $self->activate; 1940 $self->activate;
1551 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1552 1945
1553 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1554 } 1947 }
1555 1948
1556 $self->post_load; 1949 $self->post_load;
1560 my ($self, $ob) = @_; 1953 my ($self, $ob) = @_;
1561 1954
1562 return find "~" . $ob->name . "/" . $self->{path} 1955 return find "~" . $ob->name . "/" . $self->{path}
1563 if $self->per_player; 1956 if $self->per_player;
1564 1957
1958# return find "?party/" . $ob->name . "/" . $self->{path}
1959# if $self->per_party;
1960
1565 $self 1961 $self
1566} 1962}
1567 1963
1568# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1569sub load_diag { 1965sub load_neighbours {
1570 my ($map) = @_; 1966 my ($map) = @_;
1571 1967
1572 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1573 1969
1574 for (0 .. 3) { 1970 for (0 .. 3) {
1575 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1576 or next; 1972 or next;
1577 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1578 or next; 1974 or next;
1579 $neigh->load; 1975 $neigh->load;
1580 1976
1977 push @neigh,
1581 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1582 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1583 } 1980 }
1584 1981
1585 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1586 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1587 or next; 1985 or next;
1588 $neigh->load; 1986 $neigh->load;
1589 } 1987 }
1590} 1988}
1591 1989
1596} 1994}
1597 1995
1598sub do_load_sync { 1996sub do_load_sync {
1599 my ($map) = @_; 1997 my ($map) = @_;
1600 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1601 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1602} 2003}
1603 2004
1604our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1605our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1606 2007
1607sub find_async { 2008sub find_async {
1608 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1609 2010
1610 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1611 2012
1612 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1613 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1614 } 2015 }
1615 2016
1616 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1617 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1618 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1619 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1620 my $map = find $path 2022 if (my $map = find $k) {
1621 or next;
1622 $map->load; 2023 $map->load if $v;
2024 }
1623 2025
1624 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1625 } 2027 }
1626 } 2028 }
1627 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1628 }; 2030 };
1629 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
1632} 2034}
1633 2035
1634sub save { 2036sub save {
1635 my ($self) = @_; 2037 my ($self) = @_;
1636 2038
1637 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 2040
1639 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1640 2042
1641 return unless $self->dirty; 2043 return unless $self->dirty;
1642 2044
1665 my ($self) = @_; 2067 my ($self) = @_;
1666 2068
1667 # save first because save cedes 2069 # save first because save cedes
1668 $self->save; 2070 $self->save;
1669 2071
1670 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1671 2073
1672 return if $self->players; 2074 return if $self->players;
1673 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1674 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1675 2077
2078 $self->deactivate;
1676 $self->clear; 2079 $self->clear;
1677 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
1678} 2081}
1679 2082
1680sub reset_at { 2083sub reset_at {
1681 my ($self) = @_; 2084 my ($self) = @_;
1682 2085
1683 # TODO: safety, remove and allow resettable per-player maps 2086 # 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}; 2087 return 1e99 if $self->{deny_reset};
1686 2088
1687 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2089 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1688 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2090 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1689 2091
1700 my ($self) = @_; 2102 my ($self) = @_;
1701 2103
1702 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1703 2105
1704 return if $self->players; 2106 return if $self->players;
1705 return if $self->isa ("ext::map_per_player");#d#
1706 2107
1707 warn "resetting map ", $self->path;#d# 2108 warn "resetting map ", $self->path;
1708 2109
1709 $self->in_memory (cf::MAP_SWAPPED); 2110 $self->in_memory (cf::MAP_SWAPPED);
1710 2111
1711 # need to save uniques path 2112 # need to save uniques path
1712 unless ($self->{deny_save}) { 2113 unless ($self->{deny_save}) {
1716 if $uniq; 2117 if $uniq;
1717 } 2118 }
1718 2119
1719 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
1720 2121
2122 $self->deactivate;
1721 $self->clear; 2123 $self->clear;
1722 2124
1723 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
1724 2126
1725 $self->unlink_save; 2127 $self->unlink_save;
1729my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
1730 2132
1731sub nuke { 2133sub nuke {
1732 my ($self) = @_; 2134 my ($self) = @_;
1733 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
1734 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
1735 2140
1736 $self->unlink_save; 2141 $self->unlink_save;
1737 2142
1738 bless $self, "cf::map"; 2143 bless $self, "cf::map";
1739 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
1740 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
1741 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
1742 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1743 2148
1744 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
1745 2151
1746 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2153}
2154
2155=item $maps = cf::map::tmp_maps
2156
2157Returns an arrayref with all map paths of currently instantiated and saved
2158maps. May block.
2159
2160=cut
2161
2162sub tmp_maps() {
2163 [
2164 map {
2165 utf8::decode $_;
2166 /\.map$/
2167 ? normalise $_
2168 : ()
2169 } @{ aio_readdir $TMPDIR or [] }
2170 ]
2171}
2172
2173=item $maps = cf::map::random_maps
2174
2175Returns an arrayref with all map paths of currently instantiated and saved
2176random maps. May block.
2177
2178=cut
2179
2180sub random_maps() {
2181 [
2182 map {
2183 utf8::decode $_;
2184 /\.map$/
2185 ? normalise "?random/$_"
2186 : ()
2187 } @{ aio_readdir $RANDOMDIR or [] }
2188 ]
1747} 2189}
1748 2190
1749=item cf::map::unique_maps 2191=item cf::map::unique_maps
1750 2192
1751Returns an arrayref of paths of all shared maps that have 2193Returns an arrayref of paths of all shared maps that have
1752instantiated unique items. May block. 2194instantiated unique items. May block.
1753 2195
1754=cut 2196=cut
1755 2197
1756sub unique_maps() { 2198sub unique_maps() {
1757 my $files = aio_readdir $UNIQUEDIR 2199 [
1758 or return; 2200 map {
1759
1760 my @paths;
1761
1762 for (@$files) {
1763 utf8::decode $_; 2201 utf8::decode $_;
1764 next if /\.pst$/; 2202 /\.map$/
1765 next unless /^$PATH_SEP/o; 2203 ? normalise $_
1766 2204 : ()
1767 push @paths, cf::map::normalise $_; 2205 } @{ aio_readdir $UNIQUEDIR or [] }
1768 } 2206 ]
1769
1770 \@paths
1771} 2207}
1772 2208
1773package cf; 2209package cf;
1774 2210
1775=back 2211=back
1793 map { $_, inv_recursive_ $_->inv } @_ 2229 map { $_, inv_recursive_ $_->inv } @_
1794} 2230}
1795 2231
1796sub inv_recursive { 2232sub inv_recursive {
1797 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2234}
2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
1798} 2265}
1799 2266
1800package cf; 2267package cf;
1801 2268
1802=back 2269=back
1821 2288
1822 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2289 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1823 2290
1824 if ($self->{record_replies}) { 2291 if ($self->{record_replies}) {
1825 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2292 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2293
1826 } else { 2294 } else {
2295 my $pl = $self->contr;
2296
2297 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2298 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300
2301 } else {
1827 $msg = $npc->name . " says: $msg" if $npc; 2302 $msg = $npc->name . " says: $msg" if $npc;
1828 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2304 }
1829 } 2305 }
2306}
2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
1830} 2316}
1831 2317
1832=item $player_object->may ("access") 2318=item $player_object->may ("access")
1833 2319
1834Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
1881 $self->deactivate_recursive; 2367 $self->deactivate_recursive;
1882 2368
1883 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2369 return if UNIVERSAL::isa $self->map, "ext::map_link";
1884 2370
1885 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2371 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1886 if $self->map; 2372 if $self->map && $self->map->{path} ne "{link}";
1887 2373
1888 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2374 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1889} 2375}
1890 2376
1891sub cf::object::player::leave_link { 2377sub cf::object::player::leave_link {
1892 my ($self, $map, $x, $y) = @_; 2378 my ($self, $map, $x, $y) = @_;
2379
2380 return unless $self->contr->active;
1893 2381
1894 my $link_pos = delete $self->{_link_pos}; 2382 my $link_pos = delete $self->{_link_pos};
1895 2383
1896 unless ($map) { 2384 unless ($map) {
1897 # restore original map position 2385 # restore original map position
1911 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
1912 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
1913 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
1914 2402
1915 $map->load; 2403 $map->load;
1916 $map->load_diag; 2404 $map->load_neighbours;
1917 2405
1918 return unless $self->contr->active; 2406 return unless $self->contr->active;
1919 $self->activate_recursive; 2407 $self->activate_recursive;
1920 2408
1921 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1922 $self->enter_map ($map, $x, $y); 2410 $self->enter_map ($map, $x, $y);
1923} 2411}
1924 2412
1925cf::player->attach ( 2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1926 on_logout => sub {
1927 my ($pl) = @_;
1928 2414
1929 # abort map switching before logout 2415Moves the player to the given map-path and coordinates by first freezing
1930 if ($pl->ob->{_link_pos}) { 2416her, loading and preparing them map, calling the provided $check callback
1931 cf::sync_job { 2417that has to return the map if sucecssful, and then unfreezes the player on
1932 $pl->ob->leave_link 2418the new (success) or old (failed) map position. In either case, $done will
1933 }; 2419be called at the end of this process.
1934 }
1935 },
1936 on_login => sub {
1937 my ($pl) = @_;
1938 2420
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 2421=cut
2422
2423our $GOTOGEN;
1960 2424
1961sub cf::object::player::goto { 2425sub cf::object::player::goto {
1962 my ($self, $path, $x, $y) = @_; 2426 my ($self, $path, $x, $y, $check, $done) = @_;
2427
2428 # do generation counting so two concurrent goto's will be executed in-order
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1963 2430
1964 $self->enter_link; 2431 $self->enter_link;
1965 2432
1966 (async { 2433 (async {
1967 my $map = eval { 2434 my $map = eval {
1968 my $map = cf::map::find $path; 2435 my $map = cf::map::find $path;
2436
2437 if ($map) {
1969 $map = $map->customise_for ($self) if $map; 2438 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map;
2440 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2442 }
2443
1970 $map 2444 $map
2445 };
2446
2447 if ($@) {
2448 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2449 LOG llevError | logBacktrace, Carp::longmess $@;
1971 } or 2450 }
1972 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1973 2451
2452 if ($gen == $self->{_goto_generation}) {
2453 delete $self->{_goto_generation};
1974 $self->leave_link ($map, $x, $y); 2454 $self->leave_link ($map, $x, $y);
2455 }
2456
2457 $done->() if $done;
1975 })->prio (1); 2458 })->prio (1);
1976} 2459}
1977 2460
1978=item $player_object->enter_exit ($exit_object) 2461=item $player_object->enter_exit ($exit_object)
1979 2462
2048 my $hp = $exit->stats->hp; 2531 my $hp = $exit->stats->hp;
2049 my $sp = $exit->stats->sp; 2532 my $sp = $exit->stats->sp;
2050 2533
2051 $self->enter_link; 2534 $self->enter_link;
2052 2535
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2053 (async { 2540 (async {
2054 $self->deactivate_recursive; # just to be sure 2541 $self->deactivate_recursive; # just to be sure
2055 unless (eval { 2542 unless (eval {
2056 $self->goto ($slaying, $hp, $sp); 2543 $self->goto ($slaying, $hp, $sp);
2057 2544
2084 2571
2085 utf8::encode $text; 2572 utf8::encode $text;
2086 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2087} 2574}
2088 2575
2576=item $client->send_msg ($channel, $msg, $color, [extra...])
2577
2578Send a drawinfo or msg packet to the client, formatting the msg for the
2579client if neccessary. C<$type> should be a string identifying the type of
2580the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet.
2582
2583=cut
2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2600sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_;
2602
2603 $msg = $self->pl->expand_cfpod ($msg);
2604
2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2609
2610 if (ref $channel) {
2611 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2616 }
2617
2618 $channel = $channel->{id};
2619 }
2620
2621 return unless @extra || length $msg;
2622
2623 if ($self->can_msg) {
2624 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF;
2627
2628 $self->send_packet ("msg " . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2630 } else {
2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641
2642 $color &= cf::NDI_COLOR_MASK;
2643
2644 utf8::encode $msg;
2645
2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2649 } else {
2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2651 $self->send_packet ("drawinfo $color $msg")
2652 }
2653 }
2654 }
2655}
2656
2089=item $client->ext_event ($type, %msg) 2657=item $client->ext_msg ($type, @msg)
2090 2658
2091Sends an exti event to the client. 2659Sends an ext event to the client.
2092 2660
2093=cut 2661=cut
2094 2662
2095sub cf::client::ext_event($$%) { 2663sub cf::client::ext_msg($$@) {
2096 my ($self, $type, %msg) = @_; 2664 my ($self, $type, @msg) = @_;
2097 2665
2666 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove
2098 $msg{msgtype} = "event_$type"; 2669 push @msg, msgtype => "event_$type";
2099 $self->send_packet ("ext " . cf::to_json \%msg); 2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2100} 2690}
2101 2691
2102=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
2103 2693
2104Queues a query to the client, calling the given callback with 2694Queues a query to the client, calling the given callback with
2105the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2695the 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>. 2696C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2107 2697
2108Queries can fail, so check the return code. Or don't, as queries will become 2698Queries can fail, so check the return code. Or don't, as queries will
2109reliable at some point in the future. 2699become reliable at some point in the future.
2110 2700
2111=cut 2701=cut
2112 2702
2113sub cf::client::query { 2703sub cf::client::query {
2114 my ($self, $flags, $text, $cb) = @_; 2704 my ($self, $flags, $text, $cb) = @_;
2122 utf8::encode $text; 2712 utf8::encode $text;
2123 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2713 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2124 2714
2125 $self->send_packet ($self->{query_queue}[0][0]) 2715 $self->send_packet ($self->{query_queue}[0][0])
2126 if @{ $self->{query_queue} } == 1; 2716 if @{ $self->{query_queue} } == 1;
2717
2718 1
2127} 2719}
2128 2720
2129cf::client->attach ( 2721cf::client->attach (
2722 on_connect => sub {
2723 my ($ns) = @_;
2724
2725 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2726 },
2130 on_reply => sub { 2727 on_reply => sub {
2131 my ($ns, $msg) = @_; 2728 my ($ns, $msg) = @_;
2132 2729
2133 # this weird shuffling is so that direct followup queries 2730 # this weird shuffling is so that direct followup queries
2134 # get handled first 2731 # get handled first
2146 } else { 2743 } else {
2147 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2744 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2148 } 2745 }
2149 } 2746 }
2150 }, 2747 },
2748 on_exticmd => sub {
2749 my ($ns, $buf) = @_;
2750
2751 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2752
2753 if (ref $msg) {
2754 my ($type, $reply, @payload) =
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758
2759 my @reply;
2760
2761 if (my $cb = $EXTICMD{$type}) {
2762 @reply = $cb->($ns, @payload);
2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2768 } else {
2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2770 }
2771
2772 cf::override;
2773 },
2151); 2774);
2152 2775
2153=item $client->async (\&cb) 2776=item $client->async (\&cb)
2154 2777
2155Create a new coroutine, running the specified callback. The coroutine will 2778Create a new coroutine, running the specified callback. The coroutine will
2196our $safe = new Safe "safe"; 2819our $safe = new Safe "safe";
2197our $safe_hole = new Safe::Hole; 2820our $safe_hole = new Safe::Hole;
2198 2821
2199$SIG{FPE} = 'IGNORE'; 2822$SIG{FPE} = 'IGNORE';
2200 2823
2201$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2824$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math
2826 grepstart grepwhile mapstart mapwhile
2827 sort time
2828));
2202 2829
2203# here we export the classes and methods available to script code 2830# here we export the classes and methods available to script code
2204 2831
2205=pod 2832=pod
2206 2833
2207The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2208 2835
2209 cf::object contr pay_amount pay_player map 2836 cf::object
2837 contr pay_amount pay_player map x y force_find force_add
2838 insert remove name archname title slaying race decrease_ob_nr
2839
2210 cf::object::player player 2840 cf::object::player
2211 cf::player peaceful 2841 player
2212 cf::map trigger 2842
2843 cf::player
2844 peaceful
2845
2846 cf::map
2847 trigger
2213 2848
2214=cut 2849=cut
2215 2850
2216for ( 2851for (
2217 ["cf::object" => qw(contr pay_amount pay_player map)], 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2218 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2219 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2220 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2221) { 2858) {
2222 no strict 'refs'; 2859 no strict 'refs';
2293=back 2930=back
2294 2931
2295=cut 2932=cut
2296 2933
2297############################################################################# 2934#############################################################################
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 2935# the server's init and main functions
2473 2936
2474sub load_facedata($) { 2937sub load_facedata($) {
2475 my ($path) = @_; 2938 my ($path) = @_;
2939
2940 # HACK to clear player env face cache, we need some signal framework
2941 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2943
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2476 2945
2477 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2478 2947
2479 my $facedata; 2948 my $facedata;
2480 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2483 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2484 2953
2485 $facedata->{version} == 2 2954 $facedata->{version} == 2
2486 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2487 2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2963
2488 { 2964 {
2489 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2490 2966
2491 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2492 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2493 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap};
2494 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2495 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2496 Coro::cede; 2973
2974 cf::cede_to_tick;
2497 } 2975 }
2498 2976
2499 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
2500 next unless $info->{smooth}; 2978 next unless $info->{smooth};
2501 my $idx = cf::face::find $face 2979 my $idx = cf::face::find $face
2502 or next; 2980 or next;
2503 if (my $smooth = cf::face::find $info->{smooth}) { 2981 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth;
2504 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2505 } else { 2984 } else {
2506 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2985 warn "smooth face '$info->{smooth}' not found for face '$face'";
2507 } 2986 }
2508 Coro::cede; 2987
2988 cf::cede_to_tick;
2509 } 2989 }
2510 } 2990 }
2511 2991
2512 { 2992 {
2513 my $anims = $facedata->{animinfo}; 2993 my $anims = $facedata->{animinfo};
2514 2994
2515 while (my ($anim, $info) = each %$anims) { 2995 while (my ($anim, $info) = each %$anims) {
2516 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2996 cf::anim::set $anim, $info->{frames}, $info->{facings};
2517 Coro::cede; 2997 cf::cede_to_tick;
2518 } 2998 }
2519 2999
2520 cf::anim::invalidate_all; # d'oh 3000 cf::anim::invalidate_all; # d'oh
2521 } 3001 }
2522 3002
3003 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource};
3007
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013
3014 if ($info->{type} & 1) {
3015 # prepend meta info
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else {
3024 $data = $info->{data};
3025 }
3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick;
3031 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 }
3051
2523 1 3052 1
2524} 3053}
2525 3054
3055register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_;
3057
3058 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v);
3060 }
3061};
3062
2526sub reload_regions { 3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
2527 load_resource_file "$MAPDIR/regions" 3068 load_resource_file "$MAPDIR/regions"
2528 or die "unable to load regions file\n"; 3069 or die "unable to load regions file\n";
3070
3071 for (cf::region::list) {
3072 $_->{match} = qr/$_->{match}/
3073 if exists $_->{match};
3074 }
2529} 3075}
2530 3076
2531sub reload_facedata { 3077sub reload_facedata {
2532 load_facedata "$DATADIR/facedata" 3078 load_facedata "$DATADIR/facedata"
2533 or die "unable to load facedata\n"; 3079 or die "unable to load facedata\n";
2534} 3080}
2535 3081
2536sub reload_archetypes { 3082sub reload_archetypes {
2537 load_resource_file "$DATADIR/archetypes" 3083 load_resource_file "$DATADIR/archetypes"
2538 or die "unable to load archetypes\n"; 3084 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
2539} 3090}
2540 3091
2541sub reload_treasures { 3092sub reload_treasures {
2542 load_resource_file "$DATADIR/treasures" 3093 load_resource_file "$DATADIR/treasures"
2543 or die "unable to load treasurelists\n"; 3094 or die "unable to load treasurelists\n";
2546sub reload_resources { 3097sub reload_resources {
2547 warn "reloading resource files...\n"; 3098 warn "reloading resource files...\n";
2548 3099
2549 reload_regions; 3100 reload_regions;
2550 reload_facedata; 3101 reload_facedata;
3102 #reload_archetypes;#d#
2551 reload_archetypes; 3103 reload_archetypes;
2552 reload_treasures; 3104 reload_treasures;
2553 3105
2554 warn "finished reloading resource files\n"; 3106 warn "finished reloading resource files\n";
2555} 3107}
2556 3108
2557sub init { 3109sub init {
2558 reload_resources; 3110 reload_resources;
2559} 3111}
2560 3112
2561sub cfg_load { 3113sub reload_config {
2562 open my $fh, "<:utf8", "$CONFDIR/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2563 or return; 3115 or return;
2564 3116
2565 local $/; 3117 local $/;
2566 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
2586 (async { 3138 (async {
2587 Event::one_event; 3139 Event::one_event;
2588 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
2589 }; 3141 };
2590 3142
2591 cfg_load; 3143 reload_config;
2592 db_init; 3144 db_init;
2593 load_extensions; 3145 load_extensions;
2594 3146
2595 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
2596 Event::loop; 3148 Event::loop;
2612 }, 3164 },
2613 ); 3165 );
2614 } 3166 }
2615} 3167}
2616 3168
3169sub write_runtime {
3170 my $runtime = "$LOCALDIR/runtime";
3171
3172 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time.
3174
3175 IO::AIO::aio_utime $runtime, undef, undef;
3176
3177 my $guard = cf::lock_acquire "write_runtime";
3178
3179 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3180 or return;
3181
3182 my $value = $cf::RUNTIME + 90 + 10;
3183 # 10 is the runtime save interval, for a monotonic clock
3184 # 60 allows for the watchdog to kill the server.
3185
3186 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3187 and return;
3188
3189 # always fsync - this file is important
3190 aio_fsync $fh
3191 and return;
3192
3193 # touch it again to show we are up-to-date
3194 aio_utime $fh, undef, undef;
3195
3196 close $fh
3197 or return;
3198
3199 aio_rename "$runtime~", $runtime
3200 and return;
3201
3202 warn "runtime file written.\n";
3203
3204 1
3205}
3206
2617sub emergency_save() { 3207sub emergency_save() {
2618 my $freeze_guard = cf::freeze_mainloop; 3208 my $freeze_guard = cf::freeze_mainloop;
2619 3209
2620 warn "enter emergency perl save\n"; 3210 warn "enter emergency perl save\n";
2621 3211
2696 %EXT_CORO = (); 3286 %EXT_CORO = ();
2697 3287
2698 warn "removing commands"; 3288 warn "removing commands";
2699 %COMMAND = (); 3289 %COMMAND = ();
2700 3290
2701 warn "removing ext commands"; 3291 warn "removing ext/exti commands";
2702 %EXTCMD = (); 3292 %EXTCMD = ();
3293 %EXTICMD = ();
2703 3294
2704 warn "unloading/nuking all extensions"; 3295 warn "unloading/nuking all extensions";
2705 for my $pkg (@EXTS) { 3296 for my $pkg (@EXTS) {
2706 warn "... unloading $pkg"; 3297 warn "... unloading $pkg";
2707 3298
2750 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
2751 require cf; 3342 require cf;
2752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2753 3344
2754 warn "loading config and database again"; 3345 warn "loading config and database again";
2755 cf::cfg_load; 3346 cf::reload_config;
2756 3347
2757 warn "loading extensions"; 3348 warn "loading extensions";
2758 cf::load_extensions; 3349 cf::load_extensions;
2759 3350
2760 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
2825 my $signal = new Coro::Signal; 3416 my $signal = new Coro::Signal;
2826 push @WAIT_FOR_TICK_BEGIN, $signal; 3417 push @WAIT_FOR_TICK_BEGIN, $signal;
2827 $signal->wait; 3418 $signal->wait;
2828} 3419}
2829 3420
3421 my $min = 1e6;#d#
3422 my $avg = 10;
2830$TICK_WATCHER = Event->timer ( 3423$TICK_WATCHER = Event->timer (
2831 reentrant => 0, 3424 reentrant => 0,
2832 parked => 1, 3425 parked => 1,
2833 prio => 0, 3426 prio => 0,
2834 at => $NEXT_TICK || $TICK, 3427 at => $NEXT_TICK || $TICK,
2838 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2839 unless ++$bug_warning > 10; 3432 unless ++$bug_warning > 10;
2840 return; 3433 return;
2841 } 3434 }
2842 3435
2843 $NOW = Event::time; 3436 $NOW = $tick_start = Event::time;
2844 3437
2845 cf::server_tick; # one server iteration 3438 cf::server_tick; # one server iteration
3439
3440 0 && sync_job {#d#
3441 for(1..10) {
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 };
2846 3462
2847 $RUNTIME += $TICK; 3463 $RUNTIME += $TICK;
2848 $NEXT_TICK += $TICK; 3464 $NEXT_TICK += $TICK;
2849 3465
2850 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2856 } 3472 }
2857 3473
2858# my $AFTER = Event::time; 3474# my $AFTER = Event::time;
2859# warn $AFTER - $NOW;#d# 3475# warn $AFTER - $NOW;#d#
2860 3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send;
3479 }
3480 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send;
3482 }
3483
3484 $NOW = Event::time;
3485
2861 # if we are delayed by four ticks or more, skip them all 3486 # if we are delayed by four ticks or more, skip them all
2862 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2863 3488
2864 $TICK_WATCHER->at ($NEXT_TICK); 3489 $TICK_WATCHER->at ($NEXT_TICK);
2865 $TICK_WATCHER->start; 3490 $TICK_WATCHER->start;
2866 3491
2867 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3492 $LOAD = ($NOW - $tick_start) / $TICK;
2868 $sig->send; 3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2869 }
2870 while (my $sig = shift @WAIT_FOR_TICK) {
2871 $sig->send;
2872 }
2873 3494
2874 _post_tick; 3495 _post_tick;
3496
3497
2875 }, 3498 },
2876); 3499);
2877 3500
2878{ 3501{
2879 BDB::max_poll_time $TICK * 0.1; 3502 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines