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.262 by root, Sat Apr 28 05:55:55 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 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
150 168
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
154 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
178
155=back 179=back
156 180
157=cut 181=cut
158 182
159BEGIN { 183BEGIN {
163 $msg .= "\n" 187 $msg .= "\n"
164 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
165 189
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167 191
168 utf8::encode $msg;
169 LOG llevError, $msg; 192 LOG llevError, $msg;
170 }; 193 };
171} 194}
172 195
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 200@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
201@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 202@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 203
180# we bless all objects into (empty) derived classes to force a method lookup 204# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 205# within the Safe compartment.
182for my $pkg (qw( 206for my $pkg (qw(
183 cf::global cf::attachable 207 cf::global cf::attachable
191} 215}
192 216
193$Event::DIED = sub { 217$Event::DIED = sub {
194 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
195}; 219};
220
221#############################################################################
196 222
197=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
198 224
199=over 4 225=over 4
200 226
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 246 $d
221 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
222} 248}
223 249
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
227 251
228Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
229 253
230=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
231 255
232Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
233 264
234=item cf::lock_wait $string 265=item cf::lock_wait $string
235 266
236Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
237 268
240Wait until the given lock is available and then acquires it and returns 271Wait 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, 272a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 273for example when the coroutine gets canceled), the lock is automatically
243returned. 274returned.
244 275
276Locks are *not* recursive, locking from the same coro twice results in a
277deadlocked coro.
278
245Lock names should begin with a unique identifier (for example, cf::map::find 279Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 280uses map_find and cf::map::load uses map_load).
247 281
248=item $locked = cf::lock_active $string 282=item $locked = cf::lock_active $string
249 283
250Return true if the lock is currently active, i.e. somebody has locked it. 284Return true if the lock is currently active, i.e. somebody has locked it.
251 285
252=cut 286=cut
253 287
254our %LOCK; 288our %LOCK;
289our %LOCKER;#d#
255 290
256sub lock_wait($) { 291sub lock_wait($) {
257 my ($key) = @_; 292 my ($key) = @_;
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
258 298
259 # wait for lock, if any 299 # wait for lock, if any
260 while ($LOCK{$key}) { 300 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 301 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 302 Coro::schedule;
268 308
269 # wait, to be sure we are not locked 309 # wait, to be sure we are not locked
270 lock_wait $key; 310 lock_wait $key;
271 311
272 $LOCK{$key} = []; 312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
273 314
274 Coro::guard { 315 Coro::guard {
316 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 317 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 318 $_->ready for @{ delete $LOCK{$key} };
277 } 319 }
278} 320}
279 321
291 }; 333 };
292 $TICK_WATCHER->stop; 334 $TICK_WATCHER->stop;
293 $guard 335 $guard
294} 336}
295 337
338=item cf::get_slot $time[, $priority[, $name]]
339
340Allocate $time seconds of blocking CPU time at priority C<$priority>:
341This call blocks and returns only when you have at least C<$time> seconds
342of cpu time till the next tick. The slot is only valid till the next cede.
343
344The optional C<$name> can be used to identify the job to run. It might be
345used for statistical purposes and should identify the same time-class.
346
347Useful for short background jobs.
348
349=cut
350
351our @SLOT_QUEUE;
352our $SLOT_QUEUE;
353
354$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async {
356 my $signal = new Coro::Signal;
357
358 while () {
359 next_job:
360 my $avail = cf::till_tick;
361 if ($avail > 0.01) {
362 for (0 .. $#SLOT_QUEUE) {
363 if ($SLOT_QUEUE[$_][0] < $avail) {
364 my $job = splice @SLOT_QUEUE, $_, 1, ();
365 $job->[2]->send;
366 Coro::cede;
367 goto next_job;
368 }
369 }
370 }
371
372 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait;
376 } else {
377 Coro::schedule;
378 }
379 }
380};
381
382sub get_slot($;$$) {
383 my ($time, $pri, $name) = @_;
384
385 $time = $TICK * .6 if $time > $TICK * .6;
386 my $sig = new Coro::Signal;
387
388 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
389 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
390 $SLOT_QUEUE->ready;
391 $sig->wait;
392}
393
296=item cf::async { BLOCK } 394=item cf::async { BLOCK }
297 395
298Currently the same as Coro::async_pool, meaning you cannot use 396Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 397C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 398thing you are allowed to do is call C<prio> on it.
303 401
304BEGIN { *async = \&Coro::async_pool } 402BEGIN { *async = \&Coro::async_pool }
305 403
306=item cf::sync_job { BLOCK } 404=item cf::sync_job { BLOCK }
307 405
308The design of crossfire+ requires that the main coro ($Coro::main) is 406The design of Crossfire TRT requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 407is 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. 408partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
409acceptable.
311 410
312If it must be done, put the blocking parts into C<sync_job>. This will run 411If 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 412the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 413server will be frozen during this time, so the block should either finish
315fast or be very important. 414fast or be very important.
318 417
319sub sync_job(&) { 418sub sync_job(&) {
320 my ($job) = @_; 419 my ($job) = @_;
321 420
322 if ($Coro::current == $Coro::main) { 421 if ($Coro::current == $Coro::main) {
422 my $time = Event::time;
423
323 # this is the main coro, too bad, we have to block 424 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 425 # till the operation succeeds, freezing the server :/
325 426
326 # TODO: use suspend/resume instead 427 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 428 # (but this is cancel-safe)
338 439
339 while ($busy) { 440 while ($busy) {
340 Coro::cede or Event::one_event; 441 Coro::cede or Event::one_event;
341 } 442 }
342 443
444 $time = Event::time - $time;
445
446 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448
449 $tick_start += $time; # do not account sync jobs to server load
450
343 wantarray ? @res : $res[0] 451 wantarray ? @res : $res[0]
344 } else { 452 } else {
345 # we are in another coroutine, how wonderful, everything just works 453 # we are in another coroutine, how wonderful, everything just works
346 454
347 $job->() 455 $job->()
366 $EXT_CORO{$coro+0} = $coro; 474 $EXT_CORO{$coro+0} = $coro;
367 475
368 $coro 476 $coro
369} 477}
370 478
371sub write_runtime { 479=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 480
374 my $runtime = "$LOCALDIR/runtime"; 481Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling.
375 485
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 486=cut
377 or return;
378 487
379 my $value = $cf::RUNTIME + 90 + 10; 488sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 489 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 490
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 491 # we seemingly have to make a local copy of the whole thing,
384 and return; 492 # otherwise perl prematurely frees the stuff :/
493 # TODO: investigate and fix (likely this will be rather laborious)
385 494
386 # always fsync - this file is important 495 my @res = Coro::Util::fork_eval {
387 aio_fsync $fh 496 reset_signals;
388 and return; 497 &$cb
498 }, @args;
389 499
390 close $fh 500 wantarray ? @res : $res[-1]
391 or return; 501}
392 502
393 aio_rename "$runtime~", $runtime 503=item $value = cf::db_get $family => $key
394 and return;
395 504
505Returns a single value from the environment database.
506
507=item cf::db_put $family => $key => $value
508
509Stores the given C<$value> in the family. It can currently store binary
510data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511
512=cut
513
514our $DB;
515
516sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job {
521 eval {
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
396 1 530 }
531}
532
533sub db_get($$) {
534 my $key = "$_[0]/$_[1]";
535
536 cf::sync_job {
537 BDB::db_get $DB, undef, $key, my $data;
538
539 $! ? ()
540 : $data
541 }
542}
543
544sub db_put($$$) {
545 BDB::dbreq_pri 4;
546 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
547}
548
549=item cf::cache $id => [$paths...], $processversion => $process
550
551Generic caching function that returns the value of the resource $id,
552caching and regenerating as required.
553
554This function can block.
555
556=cut
557
558sub cache {
559 my ($id, $src, $processversion, $process) = @_;
560
561 my $meta =
562 join "\x00",
563 $processversion,
564 map {
565 aio_stat $_
566 and Carp::croak "$_: $!";
567
568 ($_, (stat _)[7,9])
569 } @$src;
570
571 my $dbmeta = db_get cache => "$id/meta";
572 if ($dbmeta ne $meta) {
573 # changed, we may need to process
574
575 my @data;
576 my $md5;
577
578 for (0 .. $#$src) {
579 0 <= aio_load $src->[$_], $data[$_]
580 or Carp::croak "$src->[$_]: $!";
581 }
582
583 # if processing is expensive, check
584 # checksum first
585 if (1) {
586 $md5 =
587 join "\x00",
588 $processversion,
589 map {
590 cf::cede_to_tick;
591 ($src->[$_], Digest::MD5::md5_hex $data[$_])
592 } 0.. $#$src;
593
594
595 my $dbmd5 = db_get cache => "$id/md5";
596 if ($dbmd5 eq $md5) {
597 db_put cache => "$id/meta", $meta;
598
599 return db_get cache => "$id/data";
600 }
601 }
602
603 my $t1 = Time::HiRes::time;
604 my $data = $process->(\@data);
605 my $t2 = Time::HiRes::time;
606
607 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
608
609 db_put cache => "$id/data", $data;
610 db_put cache => "$id/md5" , $md5;
611 db_put cache => "$id/meta", $meta;
612
613 return $data;
614 }
615
616 db_get cache => "$id/data"
397} 617}
398 618
399=item cf::datalog type => key => value, ... 619=item cf::datalog type => key => value, ...
400 620
401Log a datalog packet of the given type with the given key-value pairs. 621Log a datalog packet of the given type with the given key-value pairs.
419attach callbacks/event handlers (a collection of which is called an "attachment") 639attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 640to it. All such attachable objects support the following methods.
421 641
422In the following description, CLASS can be any of C<global>, C<object> 642In the following description, CLASS can be any of C<global>, C<object>
423C<player>, C<client> or C<map> (i.e. the attachable objects in 643C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 644Crossfire TRT).
425 645
426=over 4 646=over 4
427 647
428=item $attachable->attach ($attachment, key => $value...) 648=item $attachable->attach ($attachment, key => $value...)
429 649
592 $registry = $CB_TYPE[$object_type] ||= []; 812 $registry = $CB_TYPE[$object_type] ||= [];
593 813
594 } elsif ($type eq "subtype") { 814 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 815 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 816 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 817 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 818
599 } elsif ($type eq "package") { 819 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 820 my $pkg = shift @arg;
601 821
602 while (my ($name, $id) = each %cb_id) { 822 while (my ($name, $id) = each %cb_id) {
631 _attach $registry, $klass, @attach; 851 _attach $registry, $klass, @attach;
632 } 852 }
633 853
634 $obj->{$name} = \%arg; 854 $obj->{$name} = \%arg;
635 } else { 855 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 856 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 857 }
638 858
639 $obj->{_attachment}{$name} = undef; 859 $obj->{_attachment}{$name} = undef;
640} 860}
641 861
643 if (ref $_[0]) { 863 if (ref $_[0]) {
644 _object_attach @_; 864 _object_attach @_;
645 } else { 865 } else {
646 _attach shift->_attach_registry, @_; 866 _attach shift->_attach_registry, @_;
647 } 867 }
868 _recalc_want;
648}; 869};
649 870
650# all those should be optimised 871# all those should be optimised
651sub cf::attachable::detach { 872sub cf::attachable::detach {
652 my ($obj, $name) = @_; 873 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 876 delete $obj->{_attachment}{$name};
656 reattach ($obj); 877 reattach ($obj);
657 } else { 878 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 879 Carp::croak "cannot, currently, detach class attachments";
659 } 880 }
881 _recalc_want;
660}; 882};
661 883
662sub cf::attachable::attached { 884sub cf::attachable::attached {
663 my ($obj, $name) = @_; 885 my ($obj, $name) = @_;
664 886
679 "; 901 ";
680 die if $@; 902 die if $@;
681} 903}
682 904
683our $override; 905our $override;
684our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 906our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
685 907
686sub override { 908sub override {
687 $override = 1; 909 $override = 1;
688 @invoke_results = (); 910 @INVOKE_RESULTS = (@_);
689} 911}
690 912
691sub do_invoke { 913sub do_invoke {
692 my $event = shift; 914 my $event = shift;
693 my $callbacks = shift; 915 my $callbacks = shift;
694 916
695 @invoke_results = (); 917 @INVOKE_RESULTS = ();
696 918
697 local $override; 919 local $override;
698 920
699 for (@$callbacks) { 921 for (@$callbacks) {
700 eval { &{$_->[1]} }; 922 eval { &{$_->[1]} };
717 939
718Generate an object-specific event with the given arguments. 940Generate an object-specific event with the given arguments.
719 941
720This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 942This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
721removed in future versions), and there is no public API to access override 943removed in future versions), and there is no public API to access override
722results (if you must, access C<@cf::invoke_results> directly). 944results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 945
724=back 946=back
725 947
726=cut 948=cut
727 949
728############################################################################# 950#############################################################################
729# object support 951# object support
952#
953
954sub _can_merge {
955 my ($ob1, $ob2) = @_;
956
957 local $Storable::canonical = 1;
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960
961 $fob1 eq $fob2
962}
730 963
731sub reattach { 964sub reattach {
732 # basically do the same as instantiate, without calling instantiate 965 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 966 my ($obj) = @_;
734 967
779); 1012);
780 1013
781sub object_freezer_save { 1014sub object_freezer_save {
782 my ($filename, $rdata, $objs) = @_; 1015 my ($filename, $rdata, $objs) = @_;
783 1016
1017 my $guard = cf::lock_acquire "io";
1018
784 sync_job { 1019 sync_job {
785 if (length $$rdata) { 1020 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename);
786 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
787 $filename, length $$rdata, scalar @$objs; 1023 $decname, length $$rdata, scalar @$objs;
788 1024
789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
790 chmod SAVE_MODE, $fh; 1026 chmod SAVE_MODE, $fh;
791 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
792 aio_fsync $fh if $cf::USE_FSYNC; 1028 aio_fsync $fh if $cf::USE_FSYNC;
811 } 1047 }
812 } else { 1048 } else {
813 aio_unlink $filename; 1049 aio_unlink $filename;
814 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
815 } 1051 }
816 } 1052 };
1053
1054 undef $guard;
817} 1055}
818 1056
819sub object_freezer_as_string { 1057sub object_freezer_as_string {
820 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
821 1059
826 1064
827sub object_thawer_load { 1065sub object_thawer_load {
828 my ($filename) = @_; 1066 my ($filename) = @_;
829 1067
830 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
831 1071
832 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
833 or return; 1073 or return;
834 1074
835 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
836 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
837 or return; 1077 or return;
1078
1079 undef $guard;
838 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
839 } 1081 }
840 1082
1083 utf8::decode (my $decname = $filename);
841 warn sprintf "loading %s (%d)\n", 1084 warn sprintf "loading %s (%d,%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1085 $decname, length $data, scalar @{$av || []};
1086
843 return ($data, $av); 1087 ($data, $av)
844} 1088}
1089
1090=head2 COMMAND CALLBACKS
1091
1092=over 4
1093
1094=cut
845 1095
846############################################################################# 1096#############################################################################
847# command handling &c 1097# command handling &c
848 1098
849=item cf::register_command $name => \&callback($ob,$args); 1099=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1112 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1113}
864 1114
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1115=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1116
867Register a callbackf ro execution when the client sends an extcmd packet. 1117Register a callback for execution when the client sends an (synchronous)
1118extcmd packet. Ext commands will be processed in the order they are
1119received by the server, like other user commands. The first argument is
1120the logged-in player. Ext commands can only be processed after a player
1121has logged in successfully.
868 1122
869If the callback returns something, it is sent back as if reply was being 1123If the callback returns something, it is sent back as if reply was being
870called. 1124called.
871 1125
1126=item cf::register_exticmd $name => \&callback($ns,$packet);
1127
1128Register a callback for execution when the client sends an (asynchronous)
1129exticmd packet. Exti commands are processed by the server as soon as they
1130are received, i.e. out of order w.r.t. other commands. The first argument
1131is a client socket. Exti commands can be received anytime, even before
1132log-in.
1133
1134If the callback returns something, it is sent back as if reply was being
1135called.
1136
872=cut 1137=cut
873 1138
874sub register_extcmd { 1139sub register_extcmd {
875 my ($name, $cb) = @_; 1140 my ($name, $cb) = @_;
876 1141
877 $EXTCMD{$name} = $cb; 1142 $EXTCMD{$name} = $cb;
1143}
1144
1145sub register_exticmd {
1146 my ($name, $cb) = @_;
1147
1148 $EXTICMD{$name} = $cb;
878} 1149}
879 1150
880cf::player->attach ( 1151cf::player->attach (
881 on_command => sub { 1152 on_command => sub {
882 my ($pl, $name, $params) = @_; 1153 my ($pl, $name, $params) = @_;
891 cf::override; 1162 cf::override;
892 }, 1163 },
893 on_extcmd => sub { 1164 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1165 my ($pl, $buf) = @_;
895 1166
896 my $msg = eval { from_json $buf }; 1167 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1168
898 if (ref $msg) { 1169 if (ref $msg) {
1170 my ($type, $reply, @payload) =
1171 "ARRAY" eq ref $msg
1172 ? @$msg
1173 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1174
1175 my @reply;
1176
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1177 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1178 @reply = $cb->($pl, @payload);
901 $pl->ext_reply ($msg->{msgid}, %reply);
902 }
903 } 1179 }
1180
1181 $pl->ext_reply ($reply, @reply)
1182 if $reply;
1183
904 } else { 1184 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1185 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1186 }
907 1187
908 cf::override; 1188 cf::override;
909 }, 1189 },
910); 1190);
911 1191
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1192sub load_extensions {
1193 cf::sync_job {
1194 my %todo;
1195
947 for my $ext (<$LIBDIR/*.ext>) { 1196 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1197 next unless -r $path;
949 eval { 1198
950 load_extension $ext; 1199 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1200 my $base = $1;
1201 my $pkg = $1;
1202 $pkg =~ s/[^[:word:]]/_/g;
1203 $pkg = "ext::$pkg";
1204
1205 open my $fh, "<:utf8", $path
1206 or die "$path: $!";
1207
1208 my $source = do { local $/; <$fh> };
1209
1210 my %ext = (
1211 path => $path,
1212 base => $base,
1213 pkg => $pkg,
1214 );
1215
1216 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1217 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1218
1219 $ext{source} =
1220 "package $pkg; use strict; use utf8;\n"
1221 . "#line 1 \"$path\"\n{\n"
1222 . $source
1223 . "\n};\n1";
1224
1225 $todo{$base} = \%ext;
1226 }
1227
1228 my %done;
1229 while (%todo) {
1230 my $progress;
1231
1232 while (my ($k, $v) = each %todo) {
1233 for (split /,\s*/, $v->{meta}{depends}) {
1234 goto skip
1235 unless exists $done{$_};
1236 }
1237
1238 warn "... loading '$k' into '$v->{pkg}'\n";
1239
1240 unless (eval $v->{source}) {
1241 my $msg = $@ ? "$v->{path}: $@\n"
1242 : "$v->{base}: extension inactive.\n";
1243
1244 if (exists $v->{meta}{mandatory}) {
1245 warn $msg;
1246 warn "mandatory extension failed to load, exiting.\n";
1247 exit 1;
1248 }
1249
1250 warn $msg;
1251 }
1252
1253 $done{$k} = delete $todo{$k};
1254 push @EXTS, $v->{pkg};
1255 $progress = 1;
951 1 1256 }
952 } or warn "$ext not loaded: $@"; 1257
1258 skip:
1259 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1260 unless $progress;
1261 }
953 } 1262 };
954} 1263}
955 1264
956############################################################################# 1265#############################################################################
957 1266
1267=back
1268
958=head2 CORE EXTENSIONS 1269=head2 CORE EXTENSIONS
959 1270
960Functions and methods that extend core crossfire objects. 1271Functions and methods that extend core crossfire objects.
961 1272
962=cut 1273=cut
966use Coro::AIO; 1277use Coro::AIO;
967 1278
968=head3 cf::player 1279=head3 cf::player
969 1280
970=over 4 1281=over 4
1282
1283=item cf::player::num_playing
1284
1285Returns the official number of playing players, as per the Crossfire metaserver rules.
1286
1287=cut
1288
1289sub num_playing {
1290 scalar grep
1291 $_->ob->map
1292 && !$_->hidden
1293 && !$_->ob->flag (cf::FLAG_WIZ),
1294 cf::player::list
1295}
971 1296
972=item cf::player::find $login 1297=item cf::player::find $login
973 1298
974Returns the given player object, loading it if necessary (might block). 1299Returns the given player object, loading it if necessary (might block).
975 1300
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1336 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1337 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1338 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl"; 1339 aio_unlink +(playerdir $login) . "/$login.pl";
1015 1340
1016 my $pl = load_pl path $login 1341 my $f = new_from_file cf::object::thawer path $login
1017 or return; 1342 or return;
1343
1344 $f->next;
1345 my $pl = cf::player::load_pl $f
1346 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs;
1018 $cf::PLAYER{$login} = $pl 1349 $cf::PLAYER{$login} = $pl
1019 } 1350 }
1020 } 1351 }
1021} 1352}
1022 1353
1032 1363
1033 aio_mkdir playerdir $pl, 0770; 1364 aio_mkdir playerdir $pl, 0770;
1034 $pl->{last_save} = $cf::RUNTIME; 1365 $pl->{last_save} = $cf::RUNTIME;
1035 1366
1036 $pl->save_pl ($path); 1367 $pl->save_pl ($path);
1037 Coro::cede; 1368 cf::cede_to_tick;
1038} 1369}
1039 1370
1040sub new($) { 1371sub new($) {
1041 my ($login) = @_; 1372 my ($login) = @_;
1042 1373
1046 $self->{deny_save} = 1; 1377 $self->{deny_save} = 1;
1047 1378
1048 $cf::PLAYER{$login} = $self; 1379 $cf::PLAYER{$login} = $self;
1049 1380
1050 $self 1381 $self
1382}
1383
1384=item $player->send_msg ($channel, $msg, $color, [extra...])
1385
1386=cut
1387
1388sub send_msg {
1389 my $ns = shift->ns
1390 or return;
1391 $ns->send_msg (@_);
1051} 1392}
1052 1393
1053=item $pl->quit_character 1394=item $pl->quit_character
1054 1395
1055Nukes the player without looking back. If logged in, the connection will 1396Nukes the player without looking back. If logged in, the connection will
1110 or return []; 1451 or return [];
1111 1452
1112 my @logins; 1453 my @logins;
1113 1454
1114 for my $login (@$dirs) { 1455 for my $login (@$dirs) {
1456 my $path = path $login;
1457
1458 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") {
1115 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1116 aio_read $fh, 0, 512, my $buf, 0 or next; 1461 aio_read $fh, 0, 512, my $buf, 0 or next;
1117 $buf !~ /^password -------------$/m or next; # official not-valid tag 1462 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 }
1118 1464
1119 utf8::decode $login; 1465 utf8::decode $login;
1120 push @logins, $login; 1466 push @logins, $login;
1121 } 1467 }
1122 1468
1149 } 1495 }
1150 1496
1151 \@paths 1497 \@paths
1152} 1498}
1153 1499
1500=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1501
1502Expand crossfire pod fragments into protocol xml.
1503
1504=cut
1505
1506sub expand_cfpod {
1507 ((my $self), (local $_)) = @_;
1508
1509 # escape & and <
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512
1513 # this is buggy, it needs to properly take care of nested <'s
1514
1515 1 while
1516 # replace B<>, I<>, U<> etc.
1517 s/B<([^\>]*)>/<b>$1<\/b>/
1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1521 # replace G<male|female> tags
1522 || s{G<([^>|]*)\|([^>]*)>}{
1523 $self->gender ? $2 : $1
1524 }ge
1525 # replace H<hint text>
1526 || s{H<([^\>]*)>}
1527 {
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "")
1531 [$self->{hintmode}]
1532 }ge;
1533
1534 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g;
1536
1537 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines
1542
1543 $_
1544}
1545
1546sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode}
1549}
1550
1154=item $player->ext_reply ($msgid, %msg) 1551=item $player->ext_reply ($msgid, @msg)
1155 1552
1156Sends an ext reply to the player. 1553Sends an ext reply to the player.
1157 1554
1158=cut 1555=cut
1159 1556
1160sub ext_reply($$%) { 1557sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1558 my ($self, $id, @msg) = @_;
1162 1559
1163 $msg{msgid} = $id; 1560 $self->ns->ext_reply ($id, @msg)
1164
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1561}
1167 1562
1168=item $player->ext_event ($type, %msg) 1563=item $player->ext_msg ($type, @msg)
1169 1564
1170Sends an ext event to the client. 1565Sends an ext event to the client.
1171 1566
1172=cut 1567=cut
1173 1568
1174sub ext_event($$%) { 1569sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1570 my ($self, $type, @msg) = @_;
1176 1571
1177 $self->ns->ext_event ($type, %msg); 1572 $self->ns->ext_msg ($type, @msg);
1178} 1573}
1179 1574
1180=head3 cf::region 1575=head3 cf::region
1181 1576
1182=over 4 1577=over 4
1185 1580
1186package cf::region; 1581package cf::region;
1187 1582
1188=item cf::region::find_by_path $path 1583=item cf::region::find_by_path $path
1189 1584
1190Tries to decuce the probable region for a map knowing only its path. 1585Tries to decuce the likely region for a map knowing only its path.
1191 1586
1192=cut 1587=cut
1193 1588
1194sub find_by_path($) { 1589sub find_by_path($) {
1195 my ($path) = @_; 1590 my ($path) = @_;
1196 1591
1197 my ($match, $specificity); 1592 my ($match, $specificity);
1198 1593
1199 for my $region (list) { 1594 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1595 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1596 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1597 if $region->specificity > $specificity;
1203 } 1598 }
1204 } 1599 }
1205 1600
1269 my ($self, $merge) = @_; 1664 my ($self, $merge) = @_;
1270 1665
1271 # we have to keep some variables in memory intact 1666 # we have to keep some variables in memory intact
1272 local $self->{path}; 1667 local $self->{path};
1273 local $self->{load_path}; 1668 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1669
1277 $self->SUPER::thawer_merge ($merge); 1670 $self->SUPER::thawer_merge ($merge);
1278} 1671}
1279 1672
1280sub normalise { 1673sub normalise {
1327 $self->init; # pass $1 etc. 1720 $self->init; # pass $1 etc.
1328 return $self; 1721 return $self;
1329 } 1722 }
1330 } 1723 }
1331 1724
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1725 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1726 ()
1334} 1727}
1335 1728
1336sub init { 1729sub init {
1337 my ($self) = @_; 1730 my ($self) = @_;
1380 1773
1381 $_->change_map_light ($change) 1774 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1775 for grep $_->outdoor, values %cf::MAP;
1383} 1776}
1384 1777
1778sub decay_objects {
1779 my ($self) = @_;
1780
1781 return if $self->{deny_reset};
1782
1783 $self->do_decay_objects;
1784}
1785
1385sub unlink_save { 1786sub unlink_save {
1386 my ($self) = @_; 1787 my ($self) = @_;
1387 1788
1388 utf8::encode (my $save = $self->save_path); 1789 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1790 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1392 1793
1393sub load_header_from($) { 1794sub load_header_from($) {
1394 my ($self, $path) = @_; 1795 my ($self, $path) = @_;
1395 1796
1396 utf8::encode $path; 1797 utf8::encode $path;
1397 #aio_open $path, O_RDONLY, 0 1798 my $f = new_from_file cf::object::thawer $path
1398 # or return;
1399
1400 $self->_load_header ($path)
1401 or return; 1799 or return;
1800
1801 $self->_load_header ($f)
1802 or return;
1803
1804 local $MAP_LOADING{$self->{path}} = $self;
1805 $f->resolve_delayed_derefs;
1402 1806
1403 $self->{load_path} = $path; 1807 $self->{load_path} = $path;
1404 1808
1405 1 1809 1
1406} 1810}
1445 $self->load_header_orig 1849 $self->load_header_orig
1446 or return; 1850 or return;
1447 $self->prepare_orig; 1851 $self->prepare_orig;
1448 } 1852 }
1449 1853
1854 $self->{deny_reset} = 1
1855 if $self->no_reset;
1856
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1857 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1858 unless $self->default_region;
1452 1859
1453 1 1860 1
1454} 1861}
1457sub find { 1864sub find {
1458 my ($path, $origin) = @_; 1865 my ($path, $origin) = @_;
1459 1866
1460 $path = normalise $path, $origin && $origin->path; 1867 $path = normalise $path, $origin && $origin->path;
1461 1868
1869 cf::lock_wait "map_data:$path";#d#remove
1462 cf::lock_wait "map_find:$path"; 1870 cf::lock_wait "map_find:$path";
1463 1871
1464 $cf::MAP{$path} || do { 1872 $cf::MAP{$path} || do {
1465 my $guard = cf::lock_acquire "map_find:$path"; 1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1466 my $map = new_from_path cf::map $path 1876 my $map = new_from_path cf::map $path
1467 or return; 1877 or return;
1468 1878
1469 $map->{last_save} = $cf::RUNTIME; 1879 $map->{last_save} = $cf::RUNTIME;
1470 1880
1471 $map->load_header 1881 $map->load_header
1472 or return; 1882 or return;
1473 1883
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 1885 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 1886 #$cf::WAIT_FOR_TICK->wait;
1887 undef $guard1;
1888 undef $guard2;
1477 $map->reset; 1889 $map->reset;
1478 undef $guard;
1479 return find $path; 1890 return find $path;
1480 } 1891 }
1481 1892
1482 $cf::MAP{$path} = $map 1893 $cf::MAP{$path} = $map
1483 } 1894 }
1492 local $self->{deny_reset} = 1; # loading can take a long time 1903 local $self->{deny_reset} = 1; # loading can take a long time
1493 1904
1494 my $path = $self->{path}; 1905 my $path = $self->{path};
1495 1906
1496 { 1907 {
1497 my $guard = cf::lock_acquire "map_load:$path"; 1908 my $guard = cf::lock_acquire "map_data:$path";
1498 1909
1910 return unless $self->valid;
1499 return if $self->in_memory != cf::MAP_SWAPPED; 1911 return unless $self->in_memory == cf::MAP_SWAPPED;
1500 1912
1501 $self->in_memory (cf::MAP_LOADING); 1913 $self->in_memory (cf::MAP_LOADING);
1502 1914
1503 $self->alloc; 1915 $self->alloc;
1504 1916
1505 $self->pre_load; 1917 $self->pre_load;
1506 Coro::cede; 1918 cf::cede_to_tick;
1507 1919
1920 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block;
1508 $self->_load_objects ($self->{load_path}, 1) 1922 $self->_load_objects ($f)
1509 or return; 1923 or return;
1510 1924
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original}; 1926 if delete $self->{load_original};
1513 1927
1514 if (my $uniq = $self->uniq_path) { 1928 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq; 1929 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) { 1930 unless (aio_stat $uniq) {
1931 if (my $f = new_from_file cf::object::thawer $uniq) {
1517 $self->clear_unique_items; 1932 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0); 1933 $self->_load_objects ($f);
1934 $f->resolve_delayed_derefs;
1935 }
1519 } 1936 }
1520 } 1937 }
1521 1938
1522 Coro::cede; 1939 $f->resolve_delayed_derefs;
1940
1941 cf::cede_to_tick;
1523 # now do the right thing for maps 1942 # now do the right thing for maps
1524 $self->link_multipart_objects; 1943 $self->link_multipart_objects;
1525 $self->difficulty ($self->estimate_difficulty) 1944 $self->difficulty ($self->estimate_difficulty)
1526 unless $self->difficulty; 1945 unless $self->difficulty;
1527 Coro::cede; 1946 cf::cede_to_tick;
1528 1947
1529 unless ($self->{deny_activate}) { 1948 unless ($self->{deny_activate}) {
1530 $self->decay_objects; 1949 $self->decay_objects;
1531 $self->fix_auto_apply; 1950 $self->fix_auto_apply;
1532 $self->update_buttons; 1951 $self->update_buttons;
1533 Coro::cede; 1952 cf::cede_to_tick;
1534 $self->set_darkness_map; 1953 $self->set_darkness_map;
1535 Coro::cede; 1954 cf::cede_to_tick;
1536 $self->activate; 1955 $self->activate;
1537 } 1956 }
1957
1958 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME);
1538 1960
1539 $self->in_memory (cf::MAP_IN_MEMORY); 1961 $self->in_memory (cf::MAP_IN_MEMORY);
1540 } 1962 }
1541 1963
1542 $self->post_load; 1964 $self->post_load;
1546 my ($self, $ob) = @_; 1968 my ($self, $ob) = @_;
1547 1969
1548 return find "~" . $ob->name . "/" . $self->{path} 1970 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 1971 if $self->per_player;
1550 1972
1973# return find "?party/" . $ob->name . "/" . $self->{path}
1974# if $self->per_party;
1975
1551 $self 1976 $self
1552} 1977}
1553 1978
1554# find and load all maps in the 3x3 area around a map 1979# find and load all maps in the 3x3 area around a map
1555sub load_diag { 1980sub load_neighbours {
1556 my ($map) = @_; 1981 my ($map) = @_;
1557 1982
1558 my @diag; # diagonal neighbours 1983 my @neigh; # diagonal neighbours
1559 1984
1560 for (0 .. 3) { 1985 for (0 .. 3) {
1561 my $neigh = $map->tile_path ($_) 1986 my $neigh = $map->tile_path ($_)
1562 or next; 1987 or next;
1563 $neigh = find $neigh, $map 1988 $neigh = find $neigh, $map
1564 or next; 1989 or next;
1565 $neigh->load; 1990 $neigh->load;
1566 1991
1992 push @neigh,
1567 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1993 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1568 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1994 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1569 } 1995 }
1570 1996
1571 for (@diag) { 1997 for (grep defined $_->[0], @neigh) {
1998 my ($path, $origin) = @$_;
1572 my $neigh = find @$_ 1999 my $neigh = find $path, $origin
1573 or next; 2000 or next;
1574 $neigh->load; 2001 $neigh->load;
1575 } 2002 }
1576} 2003}
1577 2004
1582} 2009}
1583 2010
1584sub do_load_sync { 2011sub do_load_sync {
1585 my ($map) = @_; 2012 my ($map) = @_;
1586 2013
2014 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2015 if $Coro::current == $Coro::main;
2016
1587 cf::sync_job { $map->load }; 2017 cf::sync_job { $map->load };
1588} 2018}
1589 2019
1590our %MAP_PREFETCH; 2020our %MAP_PREFETCH;
1591our $MAP_PREFETCHER = undef; 2021our $MAP_PREFETCHER = undef;
1592 2022
1593sub find_async { 2023sub find_async {
1594 my ($path, $origin) = @_; 2024 my ($path, $origin, $load) = @_;
1595 2025
1596 $path = normalise $path, $origin && $origin->{path}; 2026 $path = normalise $path, $origin && $origin->{path};
1597 2027
1598 if (my $map = $cf::MAP{$path}) { 2028 if (my $map = $cf::MAP{$path}) {
1599 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1600 } 2030 }
1601 2031
1602 undef $MAP_PREFETCH{$path}; 2032 $MAP_PREFETCH{$path} |= $load;
2033
1603 $MAP_PREFETCHER ||= cf::async { 2034 $MAP_PREFETCHER ||= cf::async {
1604 while (%MAP_PREFETCH) { 2035 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) { 2036 while (my ($k, $v) = each %MAP_PREFETCH) {
1606 my $map = find $path 2037 if (my $map = find $k) {
1607 or next;
1608 $map->load; 2038 $map->load if $v;
2039 }
1609 2040
1610 delete $MAP_PREFETCH{$path}; 2041 delete $MAP_PREFETCH{$k};
1611 } 2042 }
1612 } 2043 }
1613 undef $MAP_PREFETCHER; 2044 undef $MAP_PREFETCHER;
1614 }; 2045 };
1615 $MAP_PREFETCHER->prio (6); 2046 $MAP_PREFETCHER->prio (6);
1618} 2049}
1619 2050
1620sub save { 2051sub save {
1621 my ($self) = @_; 2052 my ($self) = @_;
1622 2053
1623 my $lock = cf::lock_acquire "map_data:" . $self->path; 2054 my $lock = cf::lock_acquire "map_data:$self->{path}";
1624 2055
1625 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1626 2057
1627 return unless $self->dirty; 2058 return unless $self->dirty;
1628 2059
1651 my ($self) = @_; 2082 my ($self) = @_;
1652 2083
1653 # save first because save cedes 2084 # save first because save cedes
1654 $self->save; 2085 $self->save;
1655 2086
1656 my $lock = cf::lock_acquire "map_data:" . $self->path; 2087 my $lock = cf::lock_acquire "map_data:$self->{path}";
1657 2088
1658 return if $self->players; 2089 return if $self->players;
1659 return if $self->in_memory != cf::MAP_IN_MEMORY; 2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
1660 return if $self->{deny_save}; 2091 return if $self->{deny_save};
1661 2092
2093 $self->in_memory (cf::MAP_SWAPPED);
2094
2095 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP;
1662 $self->clear; 2097 $self->clear;
1663 $self->in_memory (cf::MAP_SWAPPED);
1664} 2098}
1665 2099
1666sub reset_at { 2100sub reset_at {
1667 my ($self) = @_; 2101 my ($self) = @_;
1668 2102
1669 # TODO: safety, remove and allow resettable per-player maps 2103 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 2104 return 1e99 if $self->{deny_reset};
1672 2105
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2106 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2107 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 2108
1686 my ($self) = @_; 2119 my ($self) = @_;
1687 2120
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2121 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 2122
1690 return if $self->players; 2123 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 2124
1693 warn "resetting map ", $self->path;#d# 2125 warn "resetting map ", $self->path;
1694 2126
1695 $self->in_memory (cf::MAP_SWAPPED); 2127 $self->in_memory (cf::MAP_SWAPPED);
1696 2128
1697 # need to save uniques path 2129 # need to save uniques path
1698 unless ($self->{deny_save}) { 2130 unless ($self->{deny_save}) {
1702 if $uniq; 2134 if $uniq;
1703 } 2135 }
1704 2136
1705 delete $cf::MAP{$self->path}; 2137 delete $cf::MAP{$self->path};
1706 2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
1707 $self->clear; 2141 $self->clear;
1708
1709 $_->clear_links_to ($self) for values %cf::MAP;
1710 2142
1711 $self->unlink_save; 2143 $self->unlink_save;
1712 $self->destroy; 2144 $self->destroy;
1713} 2145}
1714 2146
1715my $nuke_counter = "aaaa"; 2147my $nuke_counter = "aaaa";
1716 2148
1717sub nuke { 2149sub nuke {
1718 my ($self) = @_; 2150 my ($self) = @_;
1719 2151
2152 {
2153 my $lock = cf::lock_acquire "map_data:$self->{path}";
2154
1720 delete $cf::MAP{$self->path}; 2155 delete $cf::MAP{$self->path};
1721 2156
1722 $self->unlink_save; 2157 $self->unlink_save;
1723 2158
1724 bless $self, "cf::map"; 2159 bless $self, "cf::map";
1725 delete $self->{deny_reset}; 2160 delete $self->{deny_reset};
1726 $self->{deny_save} = 1; 2161 $self->{deny_save} = 1;
1727 $self->reset_timeout (1); 2162 $self->reset_timeout (1);
1728 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2163 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1729 2164
1730 $cf::MAP{$self->path} = $self; 2165 $cf::MAP{$self->path} = $self;
2166 }
1731 2167
1732 $self->reset; # polite request, might not happen 2168 $self->reset; # polite request, might not happen
2169}
2170
2171=item $maps = cf::map::tmp_maps
2172
2173Returns an arrayref with all map paths of currently instantiated and saved
2174maps. May block.
2175
2176=cut
2177
2178sub tmp_maps() {
2179 [
2180 map {
2181 utf8::decode $_;
2182 /\.map$/
2183 ? normalise $_
2184 : ()
2185 } @{ aio_readdir $TMPDIR or [] }
2186 ]
2187}
2188
2189=item $maps = cf::map::random_maps
2190
2191Returns an arrayref with all map paths of currently instantiated and saved
2192random maps. May block.
2193
2194=cut
2195
2196sub random_maps() {
2197 [
2198 map {
2199 utf8::decode $_;
2200 /\.map$/
2201 ? normalise "?random/$_"
2202 : ()
2203 } @{ aio_readdir $RANDOMDIR or [] }
2204 ]
1733} 2205}
1734 2206
1735=item cf::map::unique_maps 2207=item cf::map::unique_maps
1736 2208
1737Returns an arrayref of paths of all shared maps that have 2209Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2210instantiated unique items. May block.
1739 2211
1740=cut 2212=cut
1741 2213
1742sub unique_maps() { 2214sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2215 [
1744 or return; 2216 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2217 utf8::decode $_;
1750 next if /\.pst$/; 2218 /\.map$/
1751 next unless /^$PATH_SEP/o; 2219 ? normalise $_
1752 2220 : ()
1753 push @paths, cf::map::normalise $_; 2221 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2222 ]
1755
1756 \@paths
1757} 2223}
1758 2224
1759package cf; 2225package cf;
1760 2226
1761=back 2227=back
1779 map { $_, inv_recursive_ $_->inv } @_ 2245 map { $_, inv_recursive_ $_->inv } @_
1780} 2246}
1781 2247
1782sub inv_recursive { 2248sub inv_recursive {
1783 inv_recursive_ inv $_[0] 2249 inv_recursive_ inv $_[0]
2250}
2251
2252=item $ref = $ob->ref
2253
2254creates and returns a persistent reference to an objetc that can be stored as a string.
2255
2256=item $ob = cf::object::deref ($refstring)
2257
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block.
2260
2261=cut
2262
2263sub deref {
2264 my ($ref) = @_;
2265
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return;
2273 $pl->ob->uuid eq $uuid
2274 or return;
2275
2276 $pl->ob
2277 } else {
2278 warn "$ref: cannot resolve object reference\n";
2279 undef
2280 }
1784} 2281}
1785 2282
1786package cf; 2283package cf;
1787 2284
1788=back 2285=back
1807 2304
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2305 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2306
1810 if ($self->{record_replies}) { 2307 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2308 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2309
1812 } else { 2310 } else {
2311 my $pl = $self->contr;
2312
2313 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2314 my $dialog = $pl->{npc_dialog};
2315 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2316
2317 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2318 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2319 $self->message ($msg, $flags);
2320 }
1815 } 2321 }
2322}
2323
2324=item $object->send_msg ($channel, $msg, $color, [extra...])
2325
2326=cut
2327
2328sub cf::object::send_msg {
2329 my $pl = shift->contr
2330 or return;
2331 $pl->send_msg (@_);
1816} 2332}
1817 2333
1818=item $player_object->may ("access") 2334=item $player_object->may ("access")
1819 2335
1820Returns wether the given player is authorized to access resource "access" 2336Returns wether the given player is authorized to access resource "access"
1867 $self->deactivate_recursive; 2383 $self->deactivate_recursive;
1868 2384
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2385 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 2386
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2387 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 2388 if $self->map && $self->map->{path} ne "{link}";
1873 2389
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2390 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 2391}
1876 2392
1877sub cf::object::player::leave_link { 2393sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 2394 my ($self, $map, $x, $y) = @_;
2395
2396 return unless $self->contr->active;
1879 2397
1880 my $link_pos = delete $self->{_link_pos}; 2398 my $link_pos = delete $self->{_link_pos};
1881 2399
1882 unless ($map) { 2400 unless ($map) {
1883 # restore original map position 2401 # restore original map position
1897 # use -1 or undef as default coordinates, not 0, 0 2415 # use -1 or undef as default coordinates, not 0, 0
1898 ($x, $y) = ($map->enter_x, $map->enter_y) 2416 ($x, $y) = ($map->enter_x, $map->enter_y)
1899 if $x <=0 && $y <= 0; 2417 if $x <=0 && $y <= 0;
1900 2418
1901 $map->load; 2419 $map->load;
1902 $map->load_diag; 2420 $map->load_neighbours;
1903 2421
1904 return unless $self->contr->active; 2422 return unless $self->contr->active;
1905 $self->activate_recursive; 2423 $self->activate_recursive;
1906 2424
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2425 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2426 $self->enter_map ($map, $x, $y);
1909} 2427}
1910 2428
1911cf::player->attach ( 2429=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1912 on_logout => sub {
1913 my ($pl) = @_;
1914 2430
1915 # abort map switching before logout 2431Moves the player to the given map-path and coordinates by first freezing
1916 if ($pl->ob->{_link_pos}) { 2432her, loading and preparing them map, calling the provided $check callback
1917 cf::sync_job { 2433that has to return the map if sucecssful, and then unfreezes the player on
1918 $pl->ob->leave_link 2434the new (success) or old (failed) map position. In either case, $done will
1919 }; 2435be called at the end of this process.
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924 2436
1925 # try to abort aborted map switching on player login :)
1926 # should happen only on crashes
1927 if ($pl->ob->{_link_pos}) {
1928 $pl->ob->enter_link;
1929 (async {
1930 $pl->ob->reply (undef,
1931 "There was an internal problem at your last logout, "
1932 . "the server will try to bring you to your intended destination in a second.",
1933 cf::NDI_RED);
1934 # we need this sleep as the login has a concurrent enter_exit running
1935 # and this sleep increases chances of the player not ending up in scorn
1936 Coro::Timer::sleep 1;
1937 $pl->ob->leave_link;
1938 })->prio (2);
1939 }
1940 },
1941);
1942
1943=item $player_object->goto ($path, $x, $y)
1944
1945=cut 2437=cut
2438
2439our $GOTOGEN;
1946 2440
1947sub cf::object::player::goto { 2441sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 2442 my ($self, $path, $x, $y, $check, $done) = @_;
2443
2444 # do generation counting so two concurrent goto's will be executed in-order
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 2446
1950 $self->enter_link; 2447 $self->enter_link;
1951 2448
1952 (async { 2449 (async {
1953 my $map = eval { 2450 my $map = eval {
1954 my $map = cf::map::find $path; 2451 my $map = cf::map::find $path;
2452
2453 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2454 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map;
2456 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2458 }
2459
1956 $map 2460 $map
2461 };
2462
2463 if ($@) {
2464 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2465 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2466 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2467
2468 if ($gen == $self->{_goto_generation}) {
2469 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2470 $self->leave_link ($map, $x, $y);
2471 }
2472
2473 $done->() if $done;
1961 })->prio (1); 2474 })->prio (1);
1962} 2475}
1963 2476
1964=item $player_object->enter_exit ($exit_object) 2477=item $player_object->enter_exit ($exit_object)
1965 2478
2034 my $hp = $exit->stats->hp; 2547 my $hp = $exit->stats->hp;
2035 my $sp = $exit->stats->sp; 2548 my $sp = $exit->stats->sp;
2036 2549
2037 $self->enter_link; 2550 $self->enter_link;
2038 2551
2552 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED);
2555
2039 (async { 2556 (async {
2040 $self->deactivate_recursive; # just to be sure 2557 $self->deactivate_recursive; # just to be sure
2041 unless (eval { 2558 unless (eval {
2042 $self->goto ($slaying, $hp, $sp); 2559 $self->goto ($slaying, $hp, $sp);
2043 2560
2070 2587
2071 utf8::encode $text; 2588 utf8::encode $text;
2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2589 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2073} 2590}
2074 2591
2592=item $client->send_msg ($channel, $msg, $color, [extra...])
2593
2594Send a drawinfo or msg packet to the client, formatting the msg for the
2595client if neccessary. C<$type> should be a string identifying the type of
2596the message, with C<log> being the default. If C<$color> is negative, suppress
2597the message unless the client supports the msg packet.
2598
2599=cut
2600
2601our %CHANNEL = (
2602 "c/identify" => {
2603 id => "identify",
2604 title => "Identify",
2605 reply => undef,
2606 tooltip => "Items recently identified",
2607 },
2608 "c/examine" => {
2609 id => "examine",
2610 title => "Examine",
2611 reply => undef,
2612 tooltip => "Signs and other items you examined",
2613 },
2614);
2615
2616sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_;
2618
2619 $msg = $self->pl->expand_cfpod ($msg);
2620
2621 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622
2623 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2625
2626 if (ref $channel) {
2627 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg;
2632 }
2633
2634 $channel = $channel->{id};
2635 }
2636
2637 return unless @extra || length $msg;
2638
2639 if ($self->can_msg) {
2640 # default colour, mask it out
2641 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2642 if $color & cf::NDI_DEF;
2643
2644 $self->send_packet ("msg " . $self->{json_coder}->encode (
2645 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2646 } else {
2647 if ($color >= 0) {
2648 # replace some tags by gcfclient-compatible ones
2649 for ($msg) {
2650 1 while
2651 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2652 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2653 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2654 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2655 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2656 }
2657
2658 $color &= cf::NDI_COLOR_MASK;
2659
2660 utf8::encode $msg;
2661
2662 if (0 && $msg =~ /\[/) {
2663 # COMMAND/INFO
2664 $self->send_packet ("drawextinfo $color 10 8 $msg")
2665 } else {
2666 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2667 $self->send_packet ("drawinfo $color $msg")
2668 }
2669 }
2670 }
2671}
2672
2075=item $client->ext_event ($type, %msg) 2673=item $client->ext_msg ($type, @msg)
2076 2674
2077Sends an exti event to the client. 2675Sends an ext event to the client.
2078 2676
2079=cut 2677=cut
2080 2678
2081sub cf::client::ext_event($$%) { 2679sub cf::client::ext_msg($$@) {
2082 my ($self, $type, %msg) = @_; 2680 my ($self, $type, @msg) = @_;
2083 2681
2682 if ($self->extcmd == 2) {
2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2684 } elsif ($self->extcmd == 1) { # TODO: remove
2084 $msg{msgtype} = "event_$type"; 2685 push @msg, msgtype => "event_$type";
2085 $self->send_packet ("ext " . cf::to_json \%msg); 2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2687 }
2688}
2689
2690=item $client->ext_reply ($msgid, @msg)
2691
2692Sends an ext reply to the client.
2693
2694=cut
2695
2696sub cf::client::ext_reply($$@) {
2697 my ($self, $id, @msg) = @_;
2698
2699 if ($self->extcmd == 2) {
2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2701 } elsif ($self->extcmd == 1) {
2702 #TODO: version 1, remove
2703 unshift @msg, msgtype => "reply", msgid => $id;
2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2705 }
2086} 2706}
2087 2707
2088=item $success = $client->query ($flags, "text", \&cb) 2708=item $success = $client->query ($flags, "text", \&cb)
2089 2709
2090Queues a query to the client, calling the given callback with 2710Queues a query to the client, calling the given callback with
2091the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2711the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2092C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2712C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2093 2713
2094Queries can fail, so check the return code. Or don't, as queries will become 2714Queries can fail, so check the return code. Or don't, as queries will
2095reliable at some point in the future. 2715become reliable at some point in the future.
2096 2716
2097=cut 2717=cut
2098 2718
2099sub cf::client::query { 2719sub cf::client::query {
2100 my ($self, $flags, $text, $cb) = @_; 2720 my ($self, $flags, $text, $cb) = @_;
2108 utf8::encode $text; 2728 utf8::encode $text;
2109 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2729 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2110 2730
2111 $self->send_packet ($self->{query_queue}[0][0]) 2731 $self->send_packet ($self->{query_queue}[0][0])
2112 if @{ $self->{query_queue} } == 1; 2732 if @{ $self->{query_queue} } == 1;
2733
2734 1
2113} 2735}
2114 2736
2115cf::client->attach ( 2737cf::client->attach (
2738 on_connect => sub {
2739 my ($ns) = @_;
2740
2741 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2742 },
2116 on_reply => sub { 2743 on_reply => sub {
2117 my ($ns, $msg) = @_; 2744 my ($ns, $msg) = @_;
2118 2745
2119 # this weird shuffling is so that direct followup queries 2746 # this weird shuffling is so that direct followup queries
2120 # get handled first 2747 # get handled first
2132 } else { 2759 } else {
2133 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2760 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2134 } 2761 }
2135 } 2762 }
2136 }, 2763 },
2764 on_exticmd => sub {
2765 my ($ns, $buf) = @_;
2766
2767 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2768
2769 if (ref $msg) {
2770 my ($type, $reply, @payload) =
2771 "ARRAY" eq ref $msg
2772 ? @$msg
2773 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2774
2775 my @reply;
2776
2777 if (my $cb = $EXTICMD{$type}) {
2778 @reply = $cb->($ns, @payload);
2779 }
2780
2781 $ns->ext_reply ($reply, @reply)
2782 if $reply;
2783
2784 } else {
2785 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2786 }
2787
2788 cf::override;
2789 },
2137); 2790);
2138 2791
2139=item $client->async (\&cb) 2792=item $client->async (\&cb)
2140 2793
2141Create a new coroutine, running the specified callback. The coroutine will 2794Create a new coroutine, running the specified callback. The coroutine will
2182our $safe = new Safe "safe"; 2835our $safe = new Safe "safe";
2183our $safe_hole = new Safe::Hole; 2836our $safe_hole = new Safe::Hole;
2184 2837
2185$SIG{FPE} = 'IGNORE'; 2838$SIG{FPE} = 'IGNORE';
2186 2839
2187$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2840$safe->permit_only (Opcode::opset qw(
2841 :base_core :base_mem :base_orig :base_math
2842 grepstart grepwhile mapstart mapwhile
2843 sort time
2844));
2188 2845
2189# here we export the classes and methods available to script code 2846# here we export the classes and methods available to script code
2190 2847
2191=pod 2848=pod
2192 2849
2193The following functions and methods are available within a safe environment: 2850The following functions and methods are available within a safe environment:
2194 2851
2195 cf::object contr pay_amount pay_player map 2852 cf::object
2853 contr pay_amount pay_player map x y force_find force_add
2854 insert remove name archname title slaying race decrease_ob_nr
2855
2196 cf::object::player player 2856 cf::object::player
2197 cf::player peaceful 2857 player
2198 cf::map trigger 2858
2859 cf::player
2860 peaceful
2861
2862 cf::map
2863 trigger
2199 2864
2200=cut 2865=cut
2201 2866
2202for ( 2867for (
2203 ["cf::object" => qw(contr pay_amount pay_player map)], 2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race
2870 decrease_ob_nr)],
2204 ["cf::object::player" => qw(player)], 2871 ["cf::object::player" => qw(player)],
2205 ["cf::player" => qw(peaceful)], 2872 ["cf::player" => qw(peaceful)],
2206 ["cf::map" => qw(trigger)], 2873 ["cf::map" => qw(trigger)],
2207) { 2874) {
2208 no strict 'refs'; 2875 no strict 'refs';
2279=back 2946=back
2280 2947
2281=cut 2948=cut
2282 2949
2283############################################################################# 2950#############################################################################
2284
2285=head2 EXTENSION DATABASE SUPPORT
2286
2287Crossfire maintains a very simple database for extension use. It can
2288currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2289convert to/from binary).
2290
2291The parameter C<$family> should best start with the name of the extension
2292using it, it should be unique.
2293
2294=over 4
2295
2296=item $value = cf::db_get $family => $key
2297
2298Returns a single value from the database.
2299
2300=item cf::db_put $family => $key => $value
2301
2302Stores the given C<$value> in the family.
2303
2304=cut
2305
2306our $DB;
2307
2308sub db_init {
2309 unless ($DB) {
2310 $DB = BDB::db_create $DB_ENV;
2311
2312 cf::sync_job {
2313 eval {
2314 $DB->set_flags (BDB::CHKSUM);
2315
2316 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2317 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2318 cf::cleanup "db_open(db): $!" if $!;
2319 };
2320 cf::cleanup "db_open(db): $@" if $@;
2321 };
2322 }
2323}
2324
2325sub db_get($$) {
2326 my $key = "$_[0]/$_[1]";
2327
2328 cf::sync_job {
2329 BDB::db_get $DB, undef, $key, my $data;
2330
2331 $! ? ()
2332 : $data
2333 }
2334}
2335
2336sub db_put($$$) {
2337 BDB::dbreq_pri 4;
2338 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2339}
2340
2341=item cf::cache $id => [$paths...], $processversion => $process
2342
2343Generic caching function that returns the value of the resource $id,
2344caching and regenerating as required.
2345
2346This function can block.
2347
2348=cut
2349
2350sub cache {
2351 my ($id, $src, $processversion, $process) = @_;
2352
2353 my $meta =
2354 join "\x00",
2355 $processversion,
2356 map {
2357 aio_stat $_
2358 and Carp::croak "$_: $!";
2359
2360 ($_, (stat _)[7,9])
2361 } @$src;
2362
2363 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we may need to process
2366
2367 my @data;
2368 my $md5;
2369
2370 for (0 .. $#$src) {
2371 0 <= aio_load $src->[$_], $data[$_]
2372 or Carp::croak "$src->[$_]: $!";
2373 }
2374
2375 # if processing is expensive, check
2376 # checksum first
2377 if (1) {
2378 $md5 =
2379 join "\x00",
2380 $processversion,
2381 map {
2382 Coro::cede;
2383 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2384 } 0.. $#$src;
2385
2386
2387 my $dbmd5 = db_get cache => "$id/md5";
2388 if ($dbmd5 eq $md5) {
2389 db_put cache => "$id/meta", $meta;
2390
2391 return db_get cache => "$id/data";
2392 }
2393 }
2394
2395 my $t1 = Time::HiRes::time;
2396 my $data = $process->(\@data);
2397 my $t2 = Time::HiRes::time;
2398
2399 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401 db_put cache => "$id/data", $data;
2402 db_put cache => "$id/md5" , $md5;
2403 db_put cache => "$id/meta", $meta;
2404
2405 return $data;
2406 }
2407
2408 db_get cache => "$id/data"
2409}
2410
2411=item fork_call { }, $args
2412
2413Executes the given code block with the given arguments in a seperate
2414process, returning the results. Everything must be serialisable with
2415Coro::Storable. May, of course, block. Note that the executed sub may
2416never block itself or use any form of Event handling.
2417
2418=cut
2419
2420sub fork_call(&@) {
2421 my ($cb, @args) = @_;
2422
2423# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424# or die "socketpair: $!";
2425 pipe my $fh1, my $fh2
2426 or die "pipe: $!";
2427
2428 if (my $pid = fork) {
2429 close $fh2;
2430
2431 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432 $res = Coro::Storable::thaw $res;
2433
2434 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436 die $$res unless "ARRAY" eq ref $res;
2437
2438 return wantarray ? @$res : $res->[-1];
2439 } else {
2440 reset_signals;
2441 local $SIG{__WARN__};
2442 local $SIG{__DIE__};
2443 eval {
2444 close $fh1;
2445
2446 my @res = eval { $cb->(@args) };
2447 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2448 };
2449
2450 warn $@ if $@;
2451 _exit 0;
2452 }
2453}
2454
2455
2456
2457#############################################################################
2458# the server's init and main functions 2951# the server's init and main functions
2459 2952
2460sub load_facedata($) { 2953sub load_facedata($) {
2461 my ($path) = @_; 2954 my ($path) = @_;
2955
2956 # HACK to clear player env face cache, we need some signal framework
2957 # for this (global event?)
2958 %ext::player_env::MUSIC_FACE_CACHE = ();
2959
2960 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2462 2961
2463 warn "loading facedata from $path\n"; 2962 warn "loading facedata from $path\n";
2464 2963
2465 my $facedata; 2964 my $facedata;
2466 0 < aio_load $path, $facedata 2965 0 < aio_load $path, $facedata
2469 $facedata = Coro::Storable::thaw $facedata; 2968 $facedata = Coro::Storable::thaw $facedata;
2470 2969
2471 $facedata->{version} == 2 2970 $facedata->{version} == 2
2472 or cf::cleanup "$path: version mismatch, cannot proceed."; 2971 or cf::cleanup "$path: version mismatch, cannot proceed.";
2473 2972
2973 # patch in the exptable
2974 $facedata->{resource}{"res/exp_table"} = {
2975 type => FT_RSRC,
2976 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2977 };
2978 cf::cede_to_tick;
2979
2474 { 2980 {
2475 my $faces = $facedata->{faceinfo}; 2981 my $faces = $facedata->{faceinfo};
2476 2982
2477 while (my ($face, $info) = each %$faces) { 2983 while (my ($face, $info) = each %$faces) {
2478 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2984 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2479 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2985 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap};
2480 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2481 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2482 Coro::cede; 2989
2990 cf::cede_to_tick;
2483 } 2991 }
2484 2992
2485 while (my ($face, $info) = each %$faces) { 2993 while (my ($face, $info) = each %$faces) {
2486 next unless $info->{smooth}; 2994 next unless $info->{smooth};
2487 my $idx = cf::face::find $face 2995 my $idx = cf::face::find $face
2488 or next; 2996 or next;
2489 if (my $smooth = cf::face::find $info->{smooth}) { 2997 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth;
2490 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2491 } else { 3000 } else {
2492 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3001 warn "smooth face '$info->{smooth}' not found for face '$face'";
2493 } 3002 }
2494 Coro::cede; 3003
3004 cf::cede_to_tick;
2495 } 3005 }
2496 } 3006 }
2497 3007
2498 { 3008 {
2499 my $anims = $facedata->{animinfo}; 3009 my $anims = $facedata->{animinfo};
2500 3010
2501 while (my ($anim, $info) = each %$anims) { 3011 while (my ($anim, $info) = each %$anims) {
2502 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3012 cf::anim::set $anim, $info->{frames}, $info->{facings};
2503 Coro::cede; 3013 cf::cede_to_tick;
2504 } 3014 }
2505 3015
2506 cf::anim::invalidate_all; # d'oh 3016 cf::anim::invalidate_all; # d'oh
2507 } 3017 }
2508 3018
3019 {
3020 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource};
3023
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data;
3029
3030 if ($info->{type} & 1) {
3031 # prepend meta info
3032
3033 my $meta = $enc->encode ({
3034 name => $name,
3035 %{ $info->{meta} || {} },
3036 });
3037
3038 $data = pack "(w/a*)*", $meta, $info->{data};
3039 } else {
3040 $data = $info->{data};
3041 }
3042
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
3046 cf::cede_to_tick;
3047 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
3066 }
3067
2509 1 3068 1
2510} 3069}
2511 3070
3071register_exticmd fx_want => sub {
3072 my ($ns, $want) = @_;
3073
3074 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v);
3076 }
3077};
3078
2512sub reload_regions { 3079sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = ();
3083
2513 load_resource_file "$MAPDIR/regions" 3084 load_resource_file "$MAPDIR/regions"
2514 or die "unable to load regions file\n"; 3085 or die "unable to load regions file\n";
3086
3087 for (cf::region::list) {
3088 $_->{match} = qr/$_->{match}/
3089 if exists $_->{match};
3090 }
2515} 3091}
2516 3092
2517sub reload_facedata { 3093sub reload_facedata {
2518 load_facedata "$DATADIR/facedata" 3094 load_facedata "$DATADIR/facedata"
2519 or die "unable to load facedata\n"; 3095 or die "unable to load facedata\n";
2520} 3096}
2521 3097
2522sub reload_archetypes { 3098sub reload_archetypes {
2523 load_resource_file "$DATADIR/archetypes" 3099 load_resource_file "$DATADIR/archetypes"
2524 or die "unable to load archetypes\n"; 3100 or die "unable to load archetypes\n";
3101 #d# NEED to laod twice to resolve forward references
3102 # this really needs to be done in an extra post-pass
3103 # (which needs to be synchronous, so solve it differently)
3104 load_resource_file "$DATADIR/archetypes"
3105 or die "unable to load archetypes\n";
2525} 3106}
2526 3107
2527sub reload_treasures { 3108sub reload_treasures {
2528 load_resource_file "$DATADIR/treasures" 3109 load_resource_file "$DATADIR/treasures"
2529 or die "unable to load treasurelists\n"; 3110 or die "unable to load treasurelists\n";
2532sub reload_resources { 3113sub reload_resources {
2533 warn "reloading resource files...\n"; 3114 warn "reloading resource files...\n";
2534 3115
2535 reload_regions; 3116 reload_regions;
2536 reload_facedata; 3117 reload_facedata;
3118 #reload_archetypes;#d#
2537 reload_archetypes; 3119 reload_archetypes;
2538 reload_treasures; 3120 reload_treasures;
2539 3121
2540 warn "finished reloading resource files\n"; 3122 warn "finished reloading resource files\n";
2541} 3123}
2542 3124
2543sub init { 3125sub init {
2544 reload_resources; 3126 reload_resources;
2545} 3127}
2546 3128
2547sub cfg_load { 3129sub reload_config {
2548 open my $fh, "<:utf8", "$CONFDIR/config" 3130 open my $fh, "<:utf8", "$CONFDIR/config"
2549 or return; 3131 or return;
2550 3132
2551 local $/; 3133 local $/;
2552 *CFG = YAML::Syck::Load <$fh>; 3134 *CFG = YAML::Syck::Load <$fh>;
2572 (async { 3154 (async {
2573 Event::one_event; 3155 Event::one_event;
2574 })->prio (Coro::PRIO_MAX); 3156 })->prio (Coro::PRIO_MAX);
2575 }; 3157 };
2576 3158
2577 cfg_load; 3159 reload_config;
2578 db_init; 3160 db_init;
2579 load_extensions; 3161 load_extensions;
2580 3162
2581 $TICK_WATCHER->start; 3163 $TICK_WATCHER->start;
2582 Event::loop; 3164 Event::loop;
2598 }, 3180 },
2599 ); 3181 );
2600 } 3182 }
2601} 3183}
2602 3184
3185sub write_runtime {
3186 my $runtime = "$LOCALDIR/runtime";
3187
3188 # first touch the runtime file to show we are still running:
3189 # the fsync below can take a very very long time.
3190
3191 IO::AIO::aio_utime $runtime, undef, undef;
3192
3193 my $guard = cf::lock_acquire "write_runtime";
3194
3195 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3196 or return;
3197
3198 my $value = $cf::RUNTIME + 90 + 10;
3199 # 10 is the runtime save interval, for a monotonic clock
3200 # 60 allows for the watchdog to kill the server.
3201
3202 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3203 and return;
3204
3205 # always fsync - this file is important
3206 aio_fsync $fh
3207 and return;
3208
3209 # touch it again to show we are up-to-date
3210 aio_utime $fh, undef, undef;
3211
3212 close $fh
3213 or return;
3214
3215 aio_rename "$runtime~", $runtime
3216 and return;
3217
3218 warn "runtime file written.\n";
3219
3220 1
3221}
3222
2603sub emergency_save() { 3223sub emergency_save() {
2604 my $freeze_guard = cf::freeze_mainloop; 3224 my $freeze_guard = cf::freeze_mainloop;
2605 3225
2606 warn "enter emergency perl save\n"; 3226 warn "enter emergency perl save\n";
2607 3227
2682 %EXT_CORO = (); 3302 %EXT_CORO = ();
2683 3303
2684 warn "removing commands"; 3304 warn "removing commands";
2685 %COMMAND = (); 3305 %COMMAND = ();
2686 3306
2687 warn "removing ext commands"; 3307 warn "removing ext/exti commands";
2688 %EXTCMD = (); 3308 %EXTCMD = ();
3309 %EXTICMD = ();
2689 3310
2690 warn "unloading/nuking all extensions"; 3311 warn "unloading/nuking all extensions";
2691 for my $pkg (@EXTS) { 3312 for my $pkg (@EXTS) {
2692 warn "... unloading $pkg"; 3313 warn "... unloading $pkg";
2693 3314
2736 warn "reloading cf.pm"; 3357 warn "reloading cf.pm";
2737 require cf; 3358 require cf;
2738 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2739 3360
2740 warn "loading config and database again"; 3361 warn "loading config and database again";
2741 cf::cfg_load; 3362 cf::reload_config;
2742 3363
2743 warn "loading extensions"; 3364 warn "loading extensions";
2744 cf::load_extensions; 3365 cf::load_extensions;
2745 3366
2746 warn "reattaching attachments to objects/players"; 3367 warn "reattaching attachments to objects/players";
2811 my $signal = new Coro::Signal; 3432 my $signal = new Coro::Signal;
2812 push @WAIT_FOR_TICK_BEGIN, $signal; 3433 push @WAIT_FOR_TICK_BEGIN, $signal;
2813 $signal->wait; 3434 $signal->wait;
2814} 3435}
2815 3436
3437 my $min = 1e6;#d#
3438 my $avg = 10;
2816$TICK_WATCHER = Event->timer ( 3439$TICK_WATCHER = Event->timer (
2817 reentrant => 0, 3440 reentrant => 0,
2818 parked => 1, 3441 parked => 1,
2819 prio => 0, 3442 prio => 0,
2820 at => $NEXT_TICK || $TICK, 3443 at => $NEXT_TICK || $TICK,
2824 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3447 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2825 unless ++$bug_warning > 10; 3448 unless ++$bug_warning > 10;
2826 return; 3449 return;
2827 } 3450 }
2828 3451
2829 $NOW = Event::time; 3452 $NOW = $tick_start = Event::time;
2830 3453
2831 cf::server_tick; # one server iteration 3454 cf::server_tick; # one server iteration
3455
3456 0 && sync_job {#d#
3457 for(1..10) {
3458 my $t = Event::time;
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3460 or die;
3461
3462 $map->width (50);
3463 $map->height (50);
3464 $map->alloc;
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3466 my $t = Event::time - $t;
3467
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 };
2832 3478
2833 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
2834 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
2835 3481
2836 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2842 } 3488 }
2843 3489
2844# my $AFTER = Event::time; 3490# my $AFTER = Event::time;
2845# warn $AFTER - $NOW;#d# 3491# warn $AFTER - $NOW;#d#
2846 3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send;
3495 }
3496 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send;
3498 }
3499
3500 $NOW = Event::time;
3501
2847 # if we are delayed by four ticks or more, skip them all 3502 # if we are delayed by four ticks or more, skip them all
2848 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2849 3504
2850 $TICK_WATCHER->at ($NEXT_TICK); 3505 $TICK_WATCHER->at ($NEXT_TICK);
2851 $TICK_WATCHER->start; 3506 $TICK_WATCHER->start;
2852 3507
2853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3508 $LOAD = ($NOW - $tick_start) / $TICK;
2854 $sig->send; 3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2855 }
2856 while (my $sig = shift @WAIT_FOR_TICK) {
2857 $sig->send;
2858 }
2859 3510
2860 _post_tick; 3511 _post_tick;
3512
3513
2861 }, 3514 },
2862); 3515);
2863 3516
2864{ 3517{
2865 BDB::max_poll_time $TICK * 0.1; 3518 BDB::max_poll_time $TICK * 0.1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines