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.263 by root, Sat May 5 05:40:27 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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;
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 98
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
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
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
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
239 271
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.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
244 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
291 }; 326 };
292 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
293 $guard 328 $guard
294} 329}
295 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
296=item cf::async { BLOCK } 387=item cf::async { BLOCK }
297 388
298Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
303 394
304BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
305 396
306=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
307 398
308The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 400is 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. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
311 403
312If it must be done, put the blocking parts into C<sync_job>. This will run 404If 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 405the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
315fast or be very important. 407fast or be very important.
318 410
319sub sync_job(&) { 411sub sync_job(&) {
320 my ($job) = @_; 412 my ($job) = @_;
321 413
322 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
323 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
325 419
326 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 421 # (but this is cancel-safe)
338 432
339 while ($busy) { 433 while ($busy) {
340 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
341 } 435 }
342 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
343 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
344 } else { 445 } else {
345 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
346 447
347 $job->() 448 $job->()
366 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
367 468
368 $coro 469 $coro
369} 470}
370 471
371sub write_runtime { 472=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 473
374 my $runtime = "$LOCALDIR/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
375 478
376 warn "starting to write runtime...\n";#d# 479=cut
377 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
378 or return;
379 480
380 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
381 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
382 # 60 allows for the watchdog to kill the server.
383 483
384 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
385 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
386 487
387 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
388 aio_fsync $fh 489 reset_signals;
389 and return; 490 &$cb
491 }, @args;
390 492
391 close $fh 493 wantarray ? @res : $res[-1]
392 or return; 494}
393 495
394 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
395 and return;
396 497
397 warn "... done writing runtime.\n";#d# 498Returns a single value from the environment database.
398 499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
399 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
400} 610}
401 611
402=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
403 613
404Log a datalog packet of the given type with the given key-value pairs. 614Log a datalog packet of the given type with the given key-value pairs.
422attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
423to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
424 634
425In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
426C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
427crossfire+). 637Crossfire TRT).
428 638
429=over 4 639=over 4
430 640
431=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
432 642
595 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
596 806
597 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
598 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
599 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
600 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
601 811
602 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
603 my $pkg = shift @arg; 813 my $pkg = shift @arg;
604 814
605 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
634 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
635 } 845 }
636 846
637 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
638 } else { 848 } else {
639 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
640 } 850 }
641 851
642 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
643} 853}
644 854
646 if (ref $_[0]) { 856 if (ref $_[0]) {
647 _object_attach @_; 857 _object_attach @_;
648 } else { 858 } else {
649 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
650 } 860 }
861 _recalc_want;
651}; 862};
652 863
653# all those should be optimised 864# all those should be optimised
654sub cf::attachable::detach { 865sub cf::attachable::detach {
655 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
658 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
659 reattach ($obj); 870 reattach ($obj);
660 } else { 871 } else {
661 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
662 } 873 }
874 _recalc_want;
663}; 875};
664 876
665sub cf::attachable::attached { 877sub cf::attachable::attached {
666 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
667 879
682 "; 894 ";
683 die if $@; 895 die if $@;
684} 896}
685 897
686our $override; 898our $override;
687our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
688 900
689sub override { 901sub override {
690 $override = 1; 902 $override = 1;
691 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
692} 904}
693 905
694sub do_invoke { 906sub do_invoke {
695 my $event = shift; 907 my $event = shift;
696 my $callbacks = shift; 908 my $callbacks = shift;
697 909
698 @invoke_results = (); 910 @INVOKE_RESULTS = ();
699 911
700 local $override; 912 local $override;
701 913
702 for (@$callbacks) { 914 for (@$callbacks) {
703 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
720 932
721Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
722 934
723This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
724removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
725results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
726 938
727=back 939=back
728 940
729=cut 941=cut
730 942
731############################################################################# 943#############################################################################
732# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
733 956
734sub reattach { 957sub reattach {
735 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
736 my ($obj) = @_; 959 my ($obj) = @_;
737 960
840 or return; 1063 or return;
841 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
842 } 1065 }
843 1066
844 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
845 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
846 return ($data, $av); 1069 return ($data, $av);
847} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
848 1077
849############################################################################# 1078#############################################################################
850# command handling &c 1079# command handling &c
851 1080
852=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
865 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
866} 1095}
867 1096
868=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
869 1098
870Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
871 1104
872If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
873called. 1106called.
874 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
875=cut 1119=cut
876 1120
877sub register_extcmd { 1121sub register_extcmd {
878 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
879 1123
880 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
881} 1131}
882 1132
883cf::player->attach ( 1133cf::player->attach (
884 on_command => sub { 1134 on_command => sub {
885 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
894 cf::override; 1144 cf::override;
895 }, 1145 },
896 on_extcmd => sub { 1146 on_extcmd => sub {
897 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
898 1148
899 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
900 1150
901 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
902 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
903 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
904 $pl->ext_reply ($msg->{msgid}, %reply);
905 }
906 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
907 } else { 1166 } else {
908 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
909 } 1168 }
910 1169
911 cf::override; 1170 cf::override;
912 }, 1171 },
913); 1172);
914 1173
915sub load_extension {
916 my ($path) = @_;
917
918 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
919 my $base = $1;
920 my $pkg = $1;
921 $pkg =~ s/[^[:word:]]/_/g;
922 $pkg = "ext::$pkg";
923
924 warn "... loading '$path' into '$pkg'\n";
925
926 open my $fh, "<:utf8", $path
927 or die "$path: $!";
928
929 my $source =
930 "package $pkg; use strict; use utf8;\n"
931 . "#line 1 \"$path\"\n{\n"
932 . (do { local $/; <$fh> })
933 . "\n};\n1";
934
935 unless (eval $source) {
936 my $msg = $@ ? "$path: $@\n"
937 : "extension disabled.\n";
938 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
939 warn $@;
940 warn "mandatory extension failed to load, exiting.\n";
941 exit 1;
942 }
943 die $@;
944 }
945
946 push @EXTS, $pkg;
947}
948
949sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
950 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
951 next unless -r $ext; 1179 next unless -r $path;
952 eval { 1180
953 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
954 1 1238 }
955 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
956 } 1244 };
957} 1245}
958 1246
959############################################################################# 1247#############################################################################
1248
1249=back
960 1250
961=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
962 1252
963Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
964 1254
1035 1325
1036 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1037 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1038 1328
1039 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1040 Coro::cede; 1330 cf::cede_to_tick;
1041} 1331}
1042 1332
1043sub new($) { 1333sub new($) {
1044 my ($login) = @_; 1334 my ($login) = @_;
1045 1335
1049 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1050 1340
1051 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1052 1342
1053 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1054} 1354}
1055 1355
1056=item $pl->quit_character 1356=item $pl->quit_character
1057 1357
1058Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1152 } 1452 }
1153 1453
1154 \@paths 1454 \@paths
1155} 1455}
1156 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1157=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1158 1509
1159Sends an ext reply to the player. 1510Sends an ext reply to the player.
1160 1511
1161=cut 1512=cut
1162 1513
1163sub ext_reply($$%) { 1514sub ext_reply($$@) {
1164 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1165 1516
1166 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1167
1168 $self->send ("ext " . cf::to_json \%msg);
1169} 1518}
1170 1519
1171=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1172 1521
1173Sends an ext event to the client. 1522Sends an ext event to the client.
1174 1523
1175=cut 1524=cut
1176 1525
1177sub ext_event($$%) { 1526sub ext_msg($$@) {
1178 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1179 1528
1180 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1181} 1530}
1182 1531
1183=head3 cf::region 1532=head3 cf::region
1184 1533
1185=over 4 1534=over 4
1188 1537
1189package cf::region; 1538package cf::region;
1190 1539
1191=item cf::region::find_by_path $path 1540=item cf::region::find_by_path $path
1192 1541
1193Tries to decuce the probable region for a map knowing only its path. 1542Tries to decuce the likely region for a map knowing only its path.
1194 1543
1195=cut 1544=cut
1196 1545
1197sub find_by_path($) { 1546sub find_by_path($) {
1198 my ($path) = @_; 1547 my ($path) = @_;
1199 1548
1200 my ($match, $specificity); 1549 my ($match, $specificity);
1201 1550
1202 for my $region (list) { 1551 for my $region (list) {
1203 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1204 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1205 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1206 } 1555 }
1207 } 1556 }
1208 1557
1272 my ($self, $merge) = @_; 1621 my ($self, $merge) = @_;
1273 1622
1274 # we have to keep some variables in memory intact 1623 # we have to keep some variables in memory intact
1275 local $self->{path}; 1624 local $self->{path};
1276 local $self->{load_path}; 1625 local $self->{load_path};
1277 local $self->{deny_save};
1278 local $self->{deny_reset};
1279 1626
1280 $self->SUPER::thawer_merge ($merge); 1627 $self->SUPER::thawer_merge ($merge);
1281} 1628}
1282 1629
1283sub normalise { 1630sub normalise {
1330 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1331 return $self; 1678 return $self;
1332 } 1679 }
1333 } 1680 }
1334 1681
1335 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1336 () 1683 ()
1337} 1684}
1338 1685
1339sub init { 1686sub init {
1340 my ($self) = @_; 1687 my ($self) = @_;
1381sub change_all_map_light { 1728sub change_all_map_light {
1382 my ($change) = @_; 1729 my ($change) = @_;
1383 1730
1384 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1385 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1733}
1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1386} 1741}
1387 1742
1388sub unlink_save { 1743sub unlink_save {
1389 my ($self) = @_; 1744 my ($self) = @_;
1390 1745
1448 $self->load_header_orig 1803 $self->load_header_orig
1449 or return; 1804 or return;
1450 $self->prepare_orig; 1805 $self->prepare_orig;
1451 } 1806 }
1452 1807
1808 $self->{deny_reset} = 1
1809 if $self->no_reset;
1810
1453 $self->default_region (cf::region::find_by_path $self->{path}) 1811 $self->default_region (cf::region::find_by_path $self->{path})
1454 unless $self->default_region; 1812 unless $self->default_region;
1455 1813
1456 1 1814 1
1457} 1815}
1472 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1473 1831
1474 $map->load_header 1832 $map->load_header
1475 or return; 1833 or return;
1476 1834
1477 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1478 # doing this can freeze the server in a sync job, obviously 1836 # doing this can freeze the server in a sync job, obviously
1479 #$cf::WAIT_FOR_TICK->wait; 1837 #$cf::WAIT_FOR_TICK->wait;
1480 $map->reset; 1838 $map->reset;
1481 undef $guard; 1839 undef $guard;
1482 return find $path; 1840 return find $path;
1495 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1496 1854
1497 my $path = $self->{path}; 1855 my $path = $self->{path};
1498 1856
1499 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1500 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1501 1860
1502 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1503 1862
1504 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1505 1864
1506 $self->alloc; 1865 $self->alloc;
1507 1866
1508 $self->pre_load; 1867 $self->pre_load;
1509 Coro::cede; 1868 cf::cede_to_tick;
1510 1869
1511 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1512 or return; 1871 or return;
1513 1872
1514 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1520 $self->clear_unique_items; 1879 $self->clear_unique_items;
1521 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1522 } 1881 }
1523 } 1882 }
1524 1883
1525 Coro::cede; 1884 cf::cede_to_tick;
1526 # now do the right thing for maps 1885 # now do the right thing for maps
1527 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1528 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1529 unless $self->difficulty; 1888 unless $self->difficulty;
1530 Coro::cede; 1889 cf::cede_to_tick;
1531 1890
1532 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1533 $self->decay_objects; 1892 $self->decay_objects;
1534 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1535 $self->update_buttons; 1894 $self->update_buttons;
1536 Coro::cede; 1895 cf::cede_to_tick;
1537 $self->set_darkness_map; 1896 $self->set_darkness_map;
1538 Coro::cede; 1897 cf::cede_to_tick;
1539 $self->activate; 1898 $self->activate;
1540 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1541 1903
1542 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1543 } 1905 }
1544 1906
1545 $self->post_load; 1907 $self->post_load;
1549 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1550 1912
1551 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1552 if $self->per_player; 1914 if $self->per_player;
1553 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1554 $self 1919 $self
1555} 1920}
1556 1921
1557# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1558sub load_diag { 1923sub load_neighbours {
1559 my ($map) = @_; 1924 my ($map) = @_;
1560 1925
1561 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1562 1927
1563 for (0 .. 3) { 1928 for (0 .. 3) {
1564 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1565 or next; 1930 or next;
1566 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1567 or next; 1932 or next;
1568 $neigh->load; 1933 $neigh->load;
1569 1934
1935 push @neigh,
1570 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1571 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1572 } 1938 }
1573 1939
1574 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1575 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1576 or next; 1943 or next;
1577 $neigh->load; 1944 $neigh->load;
1578 } 1945 }
1579} 1946}
1580 1947
1585} 1952}
1586 1953
1587sub do_load_sync { 1954sub do_load_sync {
1588 my ($map) = @_; 1955 my ($map) = @_;
1589 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1590 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1591} 1961}
1592 1962
1593our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1594our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1595 1965
1596sub find_async { 1966sub find_async {
1597 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1598 1968
1599 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1600 1970
1601 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1602 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1603 } 1973 }
1604 1974
1605 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1606 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1607 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1608 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1609 my $map = find $path 1980 if (my $map = find $k) {
1610 or next;
1611 $map->load; 1981 $map->load if $v;
1982 }
1612 1983
1613 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1614 } 1985 }
1615 } 1986 }
1616 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1617 }; 1988 };
1618 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
1621} 1992}
1622 1993
1623sub save { 1994sub save {
1624 my ($self) = @_; 1995 my ($self) = @_;
1625 1996
1626 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1627 1998
1628 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1629 2000
1630 return unless $self->dirty; 2001 return unless $self->dirty;
1631 2002
1654 my ($self) = @_; 2025 my ($self) = @_;
1655 2026
1656 # save first because save cedes 2027 # save first because save cedes
1657 $self->save; 2028 $self->save;
1658 2029
1659 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1660 2031
1661 return if $self->players; 2032 return if $self->players;
1662 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1663 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1664 2035
1668 2039
1669sub reset_at { 2040sub reset_at {
1670 my ($self) = @_; 2041 my ($self) = @_;
1671 2042
1672 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1673 return 1e99 if $self->isa ("ext::map_per_player");#d#
1674 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1675 2045
1676 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1677 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2047 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1678 2048
1689 my ($self) = @_; 2059 my ($self) = @_;
1690 2060
1691 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1692 2062
1693 return if $self->players; 2063 return if $self->players;
1694 return if $self->isa ("ext::map_per_player");#d#
1695 2064
1696 warn "resetting map ", $self->path;#d# 2065 warn "resetting map ", $self->path;
1697 2066
1698 $self->in_memory (cf::MAP_SWAPPED); 2067 $self->in_memory (cf::MAP_SWAPPED);
1699 2068
1700 # need to save uniques path 2069 # need to save uniques path
1701 unless ($self->{deny_save}) { 2070 unless ($self->{deny_save}) {
1718my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1719 2088
1720sub nuke { 2089sub nuke {
1721 my ($self) = @_; 2090 my ($self) = @_;
1722 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1723 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1724 2096
1725 $self->unlink_save; 2097 $self->unlink_save;
1726 2098
1727 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1728 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1729 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1730 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1731 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1732 2104
1733 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
1734 2107
1735 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2109}
2110
2111=item $maps = cf::map::tmp_maps
2112
2113Returns an arrayref with all map paths of currently instantiated and saved
2114maps. May block.
2115
2116=cut
2117
2118sub tmp_maps() {
2119 [
2120 map {
2121 utf8::decode $_;
2122 /\.map$/
2123 ? normalise $_
2124 : ()
2125 } @{ aio_readdir $TMPDIR or [] }
2126 ]
2127}
2128
2129=item $maps = cf::map::random_maps
2130
2131Returns an arrayref with all map paths of currently instantiated and saved
2132random maps. May block.
2133
2134=cut
2135
2136sub random_maps() {
2137 [
2138 map {
2139 utf8::decode $_;
2140 /\.map$/
2141 ? normalise "?random/$_"
2142 : ()
2143 } @{ aio_readdir $RANDOMDIR or [] }
2144 ]
1736} 2145}
1737 2146
1738=item cf::map::unique_maps 2147=item cf::map::unique_maps
1739 2148
1740Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1741instantiated unique items. May block. 2150instantiated unique items. May block.
1742 2151
1743=cut 2152=cut
1744 2153
1745sub unique_maps() { 2154sub unique_maps() {
1746 my $files = aio_readdir $UNIQUEDIR 2155 [
1747 or return; 2156 map {
1748
1749 my @paths;
1750
1751 for (@$files) {
1752 utf8::decode $_; 2157 utf8::decode $_;
1753 next if /\.pst$/; 2158 /\.map$/
1754 next unless /^$PATH_SEP/o; 2159 ? normalise $_
1755 2160 : ()
1756 push @paths, cf::map::normalise $_; 2161 } @{ aio_readdir $UNIQUEDIR or [] }
1757 } 2162 ]
1758
1759 \@paths
1760} 2163}
1761 2164
1762package cf; 2165package cf;
1763 2166
1764=back 2167=back
1810 2213
1811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1812 2215
1813 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1814 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1815 } else { 2219 } else {
2220 my $pl = $self->contr;
2221
2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2223 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225
2226 } else {
1816 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1817 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1818 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
1819} 2241}
1820 2242
1821=item $player_object->may ("access") 2243=item $player_object->may ("access")
1822 2244
1823Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
1870 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1871 2293
1872 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1873 2295
1874 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1875 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1876 2298
1877 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1878} 2300}
1879 2301
1880sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1881 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1882 2306
1883 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1884 2308
1885 unless ($map) { 2309 unless ($map) {
1886 # restore original map position 2310 # restore original map position
1900 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1901 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1902 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1903 2327
1904 $map->load; 2328 $map->load;
1905 $map->load_diag; 2329 $map->load_neighbours;
1906 2330
1907 return unless $self->contr->active; 2331 return unless $self->contr->active;
1908 $self->activate_recursive; 2332 $self->activate_recursive;
1909 2333
1910 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1911 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1912} 2336}
1913 2337
1914cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1915 on_logout => sub {
1916 my ($pl) = @_;
1917 2339
1918 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1919 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1920 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1921 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1922 }; 2344be called at the end of this process.
1923 }
1924 },
1925 on_login => sub {
1926 my ($pl) = @_;
1927 2345
1928 # try to abort aborted map switching on player login :)
1929 # should happen only on crashes
1930 if ($pl->ob->{_link_pos}) {
1931 $pl->ob->enter_link;
1932 (async {
1933 $pl->ob->reply (undef,
1934 "There was an internal problem at your last logout, "
1935 . "the server will try to bring you to your intended destination in a second.",
1936 cf::NDI_RED);
1937 # we need this sleep as the login has a concurrent enter_exit running
1938 # and this sleep increases chances of the player not ending up in scorn
1939 Coro::Timer::sleep 1;
1940 $pl->ob->leave_link;
1941 })->prio (2);
1942 }
1943 },
1944);
1945
1946=item $player_object->goto ($path, $x, $y)
1947
1948=cut 2346=cut
2347
2348our $GOTOGEN;
1949 2349
1950sub cf::object::player::goto { 2350sub cf::object::player::goto {
1951 my ($self, $path, $x, $y) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2352
2353 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1952 2355
1953 $self->enter_link; 2356 $self->enter_link;
1954 2357
1955 (async { 2358 (async {
1956 my $map = eval { 2359 my $map = eval {
1957 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1958 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map;
2365 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2367 }
2368
1959 $map 2369 $map
2370 };
2371
2372 if ($@) {
2373 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2374 LOG llevError | logBacktrace, Carp::longmess $@;
1960 } or 2375 }
1961 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1962 2376
2377 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation};
1963 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1964 })->prio (1); 2383 })->prio (1);
1965} 2384}
1966 2385
1967=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1968 2387
2037 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
2038 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
2039 2458
2040 $self->enter_link; 2459 $self->enter_link;
2041 2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2042 (async { 2465 (async {
2043 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
2044 unless (eval { 2467 unless (eval {
2045 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
2046 2469
2073 2496
2074 utf8::encode $text; 2497 utf8::encode $text;
2075 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2076} 2499}
2077 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel);
2540 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2545 return unless @extra || length $msg;
2546
2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2554 } else {
2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2573 } else {
2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2575 $self->send_packet ("drawinfo $color $msg")
2576 }
2577 }
2578 }
2579}
2580
2078=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2079 2582
2080Sends an exti event to the client. 2583Sends an ext event to the client.
2081 2584
2082=cut 2585=cut
2083 2586
2084sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2085 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2086 2589
2590 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2087 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2088 $self->send_packet ("ext " . cf::to_json \%msg); 2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2089} 2614}
2090 2615
2091=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2092 2617
2093Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
2094the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2619the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2095C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2620C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2096 2621
2097Queries can fail, so check the return code. Or don't, as queries will become 2622Queries can fail, so check the return code. Or don't, as queries will
2098reliable at some point in the future. 2623become reliable at some point in the future.
2099 2624
2100=cut 2625=cut
2101 2626
2102sub cf::client::query { 2627sub cf::client::query {
2103 my ($self, $flags, $text, $cb) = @_; 2628 my ($self, $flags, $text, $cb) = @_;
2111 utf8::encode $text; 2636 utf8::encode $text;
2112 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2637 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2113 2638
2114 $self->send_packet ($self->{query_queue}[0][0]) 2639 $self->send_packet ($self->{query_queue}[0][0])
2115 if @{ $self->{query_queue} } == 1; 2640 if @{ $self->{query_queue} } == 1;
2641
2642 1
2116} 2643}
2117 2644
2118cf::client->attach ( 2645cf::client->attach (
2646 on_connect => sub {
2647 my ($ns) = @_;
2648
2649 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2650 },
2119 on_reply => sub { 2651 on_reply => sub {
2120 my ($ns, $msg) = @_; 2652 my ($ns, $msg) = @_;
2121 2653
2122 # this weird shuffling is so that direct followup queries 2654 # this weird shuffling is so that direct followup queries
2123 # get handled first 2655 # get handled first
2135 } else { 2667 } else {
2136 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2668 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2137 } 2669 }
2138 } 2670 }
2139 }, 2671 },
2672 on_exticmd => sub {
2673 my ($ns, $buf) = @_;
2674
2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2676
2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2685 if (my $cb = $EXTICMD{$type}) {
2686 @reply = $cb->($ns, @payload);
2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2692 } else {
2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2694 }
2695
2696 cf::override;
2697 },
2140); 2698);
2141 2699
2142=item $client->async (\&cb) 2700=item $client->async (\&cb)
2143 2701
2144Create a new coroutine, running the specified callback. The coroutine will 2702Create a new coroutine, running the specified callback. The coroutine will
2185our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2186our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2187 2745
2188$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2189 2747
2190$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2191 2753
2192# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2193 2755
2194=pod 2756=pod
2195 2757
2196The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2197 2759
2198 cf::object contr pay_amount pay_player map 2760 cf::object
2761 contr pay_amount pay_player map x y force_find force_add
2762 insert remove name archname title slaying race decrease_ob_nr
2763
2199 cf::object::player player 2764 cf::object::player
2200 cf::player peaceful 2765 player
2201 cf::map trigger 2766
2767 cf::player
2768 peaceful
2769
2770 cf::map
2771 trigger
2202 2772
2203=cut 2773=cut
2204 2774
2205for ( 2775for (
2206 ["cf::object" => qw(contr pay_amount pay_player map)], 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2778 decrease_ob_nr)],
2207 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2208 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2209 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2210) { 2782) {
2211 no strict 'refs'; 2783 no strict 'refs';
2282=back 2854=back
2283 2855
2284=cut 2856=cut
2285 2857
2286############################################################################# 2858#############################################################################
2287
2288=head2 EXTENSION DATABASE SUPPORT
2289
2290Crossfire maintains a very simple database for extension use. It can
2291currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2292convert to/from binary).
2293
2294The parameter C<$family> should best start with the name of the extension
2295using it, it should be unique.
2296
2297=over 4
2298
2299=item $value = cf::db_get $family => $key
2300
2301Returns a single value from the database.
2302
2303=item cf::db_put $family => $key => $value
2304
2305Stores the given C<$value> in the family.
2306
2307=cut
2308
2309our $DB;
2310
2311sub db_init {
2312 unless ($DB) {
2313 $DB = BDB::db_create $DB_ENV;
2314
2315 cf::sync_job {
2316 eval {
2317 $DB->set_flags (BDB::CHKSUM);
2318
2319 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2320 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2321 cf::cleanup "db_open(db): $!" if $!;
2322 };
2323 cf::cleanup "db_open(db): $@" if $@;
2324 };
2325 }
2326}
2327
2328sub db_get($$) {
2329 my $key = "$_[0]/$_[1]";
2330
2331 cf::sync_job {
2332 BDB::db_get $DB, undef, $key, my $data;
2333
2334 $! ? ()
2335 : $data
2336 }
2337}
2338
2339sub db_put($$$) {
2340 BDB::dbreq_pri 4;
2341 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2342}
2343
2344=item cf::cache $id => [$paths...], $processversion => $process
2345
2346Generic caching function that returns the value of the resource $id,
2347caching and regenerating as required.
2348
2349This function can block.
2350
2351=cut
2352
2353sub cache {
2354 my ($id, $src, $processversion, $process) = @_;
2355
2356 my $meta =
2357 join "\x00",
2358 $processversion,
2359 map {
2360 aio_stat $_
2361 and Carp::croak "$_: $!";
2362
2363 ($_, (stat _)[7,9])
2364 } @$src;
2365
2366 my $dbmeta = db_get cache => "$id/meta";
2367 if ($dbmeta ne $meta) {
2368 # changed, we may need to process
2369
2370 my @data;
2371 my $md5;
2372
2373 for (0 .. $#$src) {
2374 0 <= aio_load $src->[$_], $data[$_]
2375 or Carp::croak "$src->[$_]: $!";
2376 }
2377
2378 # if processing is expensive, check
2379 # checksum first
2380 if (1) {
2381 $md5 =
2382 join "\x00",
2383 $processversion,
2384 map {
2385 Coro::cede;
2386 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2387 } 0.. $#$src;
2388
2389
2390 my $dbmd5 = db_get cache => "$id/md5";
2391 if ($dbmd5 eq $md5) {
2392 db_put cache => "$id/meta", $meta;
2393
2394 return db_get cache => "$id/data";
2395 }
2396 }
2397
2398 my $t1 = Time::HiRes::time;
2399 my $data = $process->(\@data);
2400 my $t2 = Time::HiRes::time;
2401
2402 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2403
2404 db_put cache => "$id/data", $data;
2405 db_put cache => "$id/md5" , $md5;
2406 db_put cache => "$id/meta", $meta;
2407
2408 return $data;
2409 }
2410
2411 db_get cache => "$id/data"
2412}
2413
2414=item fork_call { }, $args
2415
2416Executes the given code block with the given arguments in a seperate
2417process, returning the results. Everything must be serialisable with
2418Coro::Storable. May, of course, block. Note that the executed sub may
2419never block itself or use any form of Event handling.
2420
2421=cut
2422
2423sub fork_call(&@) {
2424 my ($cb, @args) = @_;
2425
2426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2427# or die "socketpair: $!";
2428 pipe my $fh1, my $fh2
2429 or die "pipe: $!";
2430
2431 if (my $pid = fork) {
2432 close $fh2;
2433
2434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2435 $res = Coro::Storable::thaw $res;
2436
2437 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2438
2439 die $$res unless "ARRAY" eq ref $res;
2440
2441 return wantarray ? @$res : $res->[-1];
2442 } else {
2443 reset_signals;
2444 local $SIG{__WARN__};
2445 local $SIG{__DIE__};
2446 eval {
2447 close $fh1;
2448
2449 my @res = eval { $cb->(@args) };
2450 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2451 };
2452
2453 warn $@ if $@;
2454 _exit 0;
2455 }
2456}
2457
2458
2459
2460#############################################################################
2461# the server's init and main functions 2859# the server's init and main functions
2462 2860
2463sub load_facedata($) { 2861sub load_facedata($) {
2464 my ($path) = @_; 2862 my ($path) = @_;
2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2465 2869
2466 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2467 2871
2468 my $facedata; 2872 my $facedata;
2469 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2472 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2473 2877
2474 $facedata->{version} == 2 2878 $facedata->{version} == 2
2475 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2476 2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2887
2477 { 2888 {
2478 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2479 2890
2480 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2481 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2482 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap};
2483 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2484 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2485 Coro::cede; 2897
2898 cf::cede_to_tick;
2486 } 2899 }
2487 2900
2488 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
2489 next unless $info->{smooth}; 2902 next unless $info->{smooth};
2490 my $idx = cf::face::find $face 2903 my $idx = cf::face::find $face
2491 or next; 2904 or next;
2492 if (my $smooth = cf::face::find $info->{smooth}) { 2905 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth;
2493 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2494 } else { 2908 } else {
2495 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2909 warn "smooth face '$info->{smooth}' not found for face '$face'";
2496 } 2910 }
2497 Coro::cede; 2911
2912 cf::cede_to_tick;
2498 } 2913 }
2499 } 2914 }
2500 2915
2501 { 2916 {
2502 my $anims = $facedata->{animinfo}; 2917 my $anims = $facedata->{animinfo};
2503 2918
2504 while (my ($anim, $info) = each %$anims) { 2919 while (my ($anim, $info) = each %$anims) {
2505 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2920 cf::anim::set $anim, $info->{frames}, $info->{facings};
2506 Coro::cede; 2921 cf::cede_to_tick;
2507 } 2922 }
2508 2923
2509 cf::anim::invalidate_all; # d'oh 2924 cf::anim::invalidate_all; # d'oh
2510 } 2925 }
2511 2926
2927 {
2928 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource};
2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2937
2938 if ($info->{type} & 1) {
2939 # prepend meta info
2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2947 } else {
2948 $data = $info->{data};
2949 }
2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick;
2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 }
2975
2512 1 2976 1
2513} 2977}
2514 2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2515sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2516 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2517 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2994
2995 for (cf::region::list) {
2996 $_->{match} = qr/$_->{match}/
2997 if exists $_->{match};
2998 }
2518} 2999}
2519 3000
2520sub reload_facedata { 3001sub reload_facedata {
2521 load_facedata "$DATADIR/facedata" 3002 load_facedata "$DATADIR/facedata"
2522 or die "unable to load facedata\n"; 3003 or die "unable to load facedata\n";
2523} 3004}
2524 3005
2525sub reload_archetypes { 3006sub reload_archetypes {
2526 load_resource_file "$DATADIR/archetypes" 3007 load_resource_file "$DATADIR/archetypes"
2527 or die "unable to load archetypes\n"; 3008 or die "unable to load archetypes\n";
3009 #d# NEED to laod twice to resolve forward references
3010 # this really needs to be done in an extra post-pass
3011 # (which needs to be synchronous, so solve it differently)
3012 load_resource_file "$DATADIR/archetypes"
3013 or die "unable to load archetypes\n";
2528} 3014}
2529 3015
2530sub reload_treasures { 3016sub reload_treasures {
2531 load_resource_file "$DATADIR/treasures" 3017 load_resource_file "$DATADIR/treasures"
2532 or die "unable to load treasurelists\n"; 3018 or die "unable to load treasurelists\n";
2535sub reload_resources { 3021sub reload_resources {
2536 warn "reloading resource files...\n"; 3022 warn "reloading resource files...\n";
2537 3023
2538 reload_regions; 3024 reload_regions;
2539 reload_facedata; 3025 reload_facedata;
3026 #reload_archetypes;#d#
2540 reload_archetypes; 3027 reload_archetypes;
2541 reload_treasures; 3028 reload_treasures;
2542 3029
2543 warn "finished reloading resource files\n"; 3030 warn "finished reloading resource files\n";
2544} 3031}
2545 3032
2546sub init { 3033sub init {
2547 reload_resources; 3034 reload_resources;
2548} 3035}
2549 3036
2550sub cfg_load { 3037sub reload_config {
2551 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2552 or return; 3039 or return;
2553 3040
2554 local $/; 3041 local $/;
2555 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
2575 (async { 3062 (async {
2576 Event::one_event; 3063 Event::one_event;
2577 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2578 }; 3065 };
2579 3066
2580 cfg_load; 3067 reload_config;
2581 db_init; 3068 db_init;
2582 load_extensions; 3069 load_extensions;
2583 3070
2584 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2585 Event::loop; 3072 Event::loop;
2601 }, 3088 },
2602 ); 3089 );
2603 } 3090 }
2604} 3091}
2605 3092
3093sub write_runtime {
3094 my $runtime = "$LOCALDIR/runtime";
3095
3096 # first touch the runtime file to show we are still running:
3097 # the fsync below can take a very very long time.
3098
3099 IO::AIO::aio_utime $runtime, undef, undef;
3100
3101 my $guard = cf::lock_acquire "write_runtime";
3102
3103 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3104 or return;
3105
3106 my $value = $cf::RUNTIME + 90 + 10;
3107 # 10 is the runtime save interval, for a monotonic clock
3108 # 60 allows for the watchdog to kill the server.
3109
3110 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3111 and return;
3112
3113 # always fsync - this file is important
3114 aio_fsync $fh
3115 and return;
3116
3117 # touch it again to show we are up-to-date
3118 aio_utime $fh, undef, undef;
3119
3120 close $fh
3121 or return;
3122
3123 aio_rename "$runtime~", $runtime
3124 and return;
3125
3126 warn "runtime file written.\n";
3127
3128 1
3129}
3130
2606sub emergency_save() { 3131sub emergency_save() {
2607 my $freeze_guard = cf::freeze_mainloop; 3132 my $freeze_guard = cf::freeze_mainloop;
2608 3133
2609 warn "enter emergency perl save\n"; 3134 warn "enter emergency perl save\n";
2610 3135
2685 %EXT_CORO = (); 3210 %EXT_CORO = ();
2686 3211
2687 warn "removing commands"; 3212 warn "removing commands";
2688 %COMMAND = (); 3213 %COMMAND = ();
2689 3214
2690 warn "removing ext commands"; 3215 warn "removing ext/exti commands";
2691 %EXTCMD = (); 3216 %EXTCMD = ();
3217 %EXTICMD = ();
2692 3218
2693 warn "unloading/nuking all extensions"; 3219 warn "unloading/nuking all extensions";
2694 for my $pkg (@EXTS) { 3220 for my $pkg (@EXTS) {
2695 warn "... unloading $pkg"; 3221 warn "... unloading $pkg";
2696 3222
2739 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
2740 require cf; 3266 require cf;
2741 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2742 3268
2743 warn "loading config and database again"; 3269 warn "loading config and database again";
2744 cf::cfg_load; 3270 cf::reload_config;
2745 3271
2746 warn "loading extensions"; 3272 warn "loading extensions";
2747 cf::load_extensions; 3273 cf::load_extensions;
2748 3274
2749 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";
2814 my $signal = new Coro::Signal; 3340 my $signal = new Coro::Signal;
2815 push @WAIT_FOR_TICK_BEGIN, $signal; 3341 push @WAIT_FOR_TICK_BEGIN, $signal;
2816 $signal->wait; 3342 $signal->wait;
2817} 3343}
2818 3344
3345 my $min = 1e6;#d#
3346 my $avg = 10;
2819$TICK_WATCHER = Event->timer ( 3347$TICK_WATCHER = Event->timer (
2820 reentrant => 0, 3348 reentrant => 0,
2821 parked => 1, 3349 parked => 1,
2822 prio => 0, 3350 prio => 0,
2823 at => $NEXT_TICK || $TICK, 3351 at => $NEXT_TICK || $TICK,
2827 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2828 unless ++$bug_warning > 10; 3356 unless ++$bug_warning > 10;
2829 return; 3357 return;
2830 } 3358 }
2831 3359
2832 $NOW = Event::time; 3360 $NOW = $tick_start = Event::time;
2833 3361
2834 cf::server_tick; # one server iteration 3362 cf::server_tick; # one server iteration
3363
3364 0 && sync_job {#d#
3365 for(1..10) {
3366 my $t = Event::time;
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3368 or die;
3369
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 };
2835 3386
2836 $RUNTIME += $TICK; 3387 $RUNTIME += $TICK;
2837 $NEXT_TICK += $TICK; 3388 $NEXT_TICK += $TICK;
2838 3389
2839 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2845 } 3396 }
2846 3397
2847# my $AFTER = Event::time; 3398# my $AFTER = Event::time;
2848# warn $AFTER - $NOW;#d# 3399# warn $AFTER - $NOW;#d#
2849 3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send;
3403 }
3404 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send;
3406 }
3407
3408 $NOW = Event::time;
3409
2850 # if we are delayed by four ticks or more, skip them all 3410 # if we are delayed by four ticks or more, skip them all
2851 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2852 3412
2853 $TICK_WATCHER->at ($NEXT_TICK); 3413 $TICK_WATCHER->at ($NEXT_TICK);
2854 $TICK_WATCHER->start; 3414 $TICK_WATCHER->start;
2855 3415
2856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3416 $LOAD = ($NOW - $tick_start) / $TICK;
2857 $sig->send; 3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2858 }
2859 while (my $sig = shift @WAIT_FOR_TICK) {
2860 $sig->send;
2861 }
2862 3418
2863 _post_tick; 3419 _post_tick;
3420
3421
2864 }, 3422 },
2865); 3423);
2866 3424
2867{ 3425{
2868 BDB::max_poll_time $TICK * 0.1; 3426 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines