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.270 by root, Sat May 26 15:44:06 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
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.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
155 162
156The raw value load value from the last tick. 163The raw value load value from the last tick.
157 164
158=item %cf::CFG 165=item %cf::CFG
159 166
160Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 168from wherever your confdir points to.
162 169
163=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 206
194# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 208# within the Safe compartment.
196for my $pkg (qw( 209for my $pkg (qw(
197 cf::global cf::attachable 210 cf::global cf::attachable
205} 218}
206 219
207$Event::DIED = sub { 220$Event::DIED = sub {
208 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
209}; 222};
223
224#############################################################################
210 225
211=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
212 227
213=over 4 228=over 4
214 229
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 249 $d
235 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
236} 251}
237 252
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
241 254
242Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
243 256
244=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
245 258
246Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
247 267
248=item cf::lock_wait $string 268=item cf::lock_wait $string
249 269
250Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
251 271
254Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
257returned. 277returned.
258 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
259Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
261 284
262=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
263 286
264Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
265 288
266=cut 289=cut
267 290
268our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
269 293
270sub lock_wait($) { 294sub lock_wait($) {
271 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
272 301
273 # wait for lock, if any 302 # wait for lock, if any
274 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 305 Coro::schedule;
282 311
283 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
284 lock_wait $key; 313 lock_wait $key;
285 314
286 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
287 317
288 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
291 } 322 }
292} 323}
293 324
305 }; 336 };
306 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
307 $guard 338 $guard
308} 339}
309 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
310=item cf::async { BLOCK } 399=item cf::async { BLOCK }
311 400
312Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
317 406
318BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
319 408
320=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
321 410
322The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Deliantra is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
325 415
326If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
329fast or be very important. 419fast or be very important.
337 my $time = Event::time; 427 my $time = Event::time;
338 428
339 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
341 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
342 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
343 # (but this is cancel-safe) 435 # (but this is cancel-safe)
344 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
345 437
346 my $busy = 1; 438 my $busy = 1;
347 my @res; 439 my @res;
348 440
349 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 443 @res = eval { $job->() };
351 warn $@ if $@; 444 warn $@ if $@;
352 undef $busy; 445 undef $busy;
353 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
354 447
355 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
356 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
357 } 454 }
358 455
359 $time = Event::time - $time; 456 $time = Event::time - $time;
360 457
361 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
389 $EXT_CORO{$coro+0} = $coro; 486 $EXT_CORO{$coro+0} = $coro;
390 487
391 $coro 488 $coro
392} 489}
393 490
394sub write_runtime { 491=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 492
397 # first touch the runtime file to show we are still running: 493Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 494process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling.
399 497
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 498=cut
401 utime undef, undef, $fh; 499
500sub fork_call(&@) {
501 my ($cb, @args) = @_;
502
503 # we seemingly have to make a local copy of the whole thing,
504 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious)
506
507 my @res = Coro::Util::fork_eval {
508 reset_signals;
509 &$cb
510 }, @args;
511
512 wantarray ? @res : $res[-1]
513}
514
515=item $value = cf::db_get $family => $key
516
517Returns a single value from the environment database.
518
519=item cf::db_put $family => $key => $value
520
521Stores the given C<$value> in the family. It can currently store binary
522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
402 } 542 };
543 cf::cleanup "db_open(db): $@" if $@;
403 544
404 my $guard = cf::lock_acquire "write_runtime"; 545 $db
546}
405 547
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 548our $DB;
407 or return;
408 549
409 my $value = $cf::RUNTIME + 90 + 10; 550sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 551 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 552 $DB ||= db_table "db";
553 };
554}
412 555
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 556sub db_get($$) {
414 and return; 557 my $key = "$_[0]/$_[1]";
415 558
416 # always fsync - this file is important 559 cf::sync_job {
417 aio_fsync $fh 560 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 561
420 # touch it again to show we are up-to-date 562 $! ? ()
421 utime undef, undef, $fh; 563 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 1 564 }
565}
566
567sub db_put($$$) {
568 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
570}
571
572=item cf::cache $id => [$paths...], $processversion => $process
573
574Generic caching function that returns the value of the resource $id,
575caching and regenerating as required.
576
577This function can block.
578
579=cut
580
581sub cache {
582 my ($id, $src, $processversion, $process) = @_;
583
584 my $meta =
585 join "\x00",
586 $processversion,
587 map {
588 aio_stat $_
589 and Carp::croak "$_: $!";
590
591 ($_, (stat _)[7,9])
592 } @$src;
593
594 my $dbmeta = db_get cache => "$id/meta";
595 if ($dbmeta ne $meta) {
596 # changed, we may need to process
597
598 my @data;
599 my $md5;
600
601 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_]
603 or Carp::croak "$src->[$_]: $!";
604 }
605
606 # if processing is expensive, check
607 # checksum first
608 if (1) {
609 $md5 =
610 join "\x00",
611 $processversion,
612 map {
613 cf::cede_to_tick;
614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
615 } 0.. $#$src;
616
617
618 my $dbmd5 = db_get cache => "$id/md5";
619 if ($dbmd5 eq $md5) {
620 db_put cache => "$id/meta", $meta;
621
622 return db_get cache => "$id/data";
623 }
624 }
625
626 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time;
629
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
631
632 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta;
635
636 return $data;
637 }
638
639 db_get cache => "$id/data"
432} 640}
433 641
434=item cf::datalog type => key => value, ... 642=item cf::datalog type => key => value, ...
435 643
436Log a datalog packet of the given type with the given key-value pairs. 644Log a datalog packet of the given type with the given key-value pairs.
454attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
456 664
457In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 667Deliantra).
460 668
461=over 4 669=over 4
462 670
463=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
464 672
666 _attach $registry, $klass, @attach; 874 _attach $registry, $klass, @attach;
667 } 875 }
668 876
669 $obj->{$name} = \%arg; 877 $obj->{$name} = \%arg;
670 } else { 878 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 879 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 880 }
673 881
674 $obj->{_attachment}{$name} = undef; 882 $obj->{_attachment}{$name} = undef;
675} 883}
676 884
716 "; 924 ";
717 die if $@; 925 die if $@;
718} 926}
719 927
720our $override; 928our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 930
723sub override { 931sub override {
724 $override = 1; 932 $override = 1;
725 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
726} 934}
727 935
728sub do_invoke { 936sub do_invoke {
729 my $event = shift; 937 my $event = shift;
730 my $callbacks = shift; 938 my $callbacks = shift;
731 939
732 @invoke_results = (); 940 @INVOKE_RESULTS = ();
733 941
734 local $override; 942 local $override;
735 943
736 for (@$callbacks) { 944 for (@$callbacks) {
737 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
754 962
755Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
756 964
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
758removed in future versions), and there is no public API to access override 966removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 968
761=back 969=back
762 970
763=cut 971=cut
764 972
765############################################################################# 973#############################################################################
766# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
767 1017
768sub reattach { 1018sub reattach {
769 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 1020 my ($obj) = @_;
771 1021
818sub object_freezer_save { 1068sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
820 1070
821 sync_job { 1071 sync_job {
822 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
825 1076
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
830 close $fh; 1081 close $fh;
831 1082
832 if (@$objs) { 1083 if (@$objs) {
833 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
834 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
835 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
836 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
837 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
838 close $fh; 1089 close $fh;
839 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
840 } 1091 }
848 } 1099 }
849 } else { 1100 } else {
850 aio_unlink $filename; 1101 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
852 } 1103 }
853 } 1104 };
854} 1105}
855 1106
856sub object_freezer_as_string { 1107sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
858 1109
870 or return; 1121 or return;
871 1122
872 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
874 or return; 1125 or return;
1126
875 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
876 } 1129 }
877 1130
1131 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1133 $decname, length $data, scalar @{$av || []};
1134
880 return ($data, $av); 1135 ($data, $av)
881} 1136}
1137
1138=head2 COMMAND CALLBACKS
1139
1140=over 4
1141
1142=cut
882 1143
883############################################################################# 1144#############################################################################
884# command handling &c 1145# command handling &c
885 1146
886=item cf::register_command $name => \&callback($ob,$args); 1147=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1160 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1161}
901 1162
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1163=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1164
904Register a callbackf ro execution when the client sends an extcmd packet. 1165Register a callback for execution when the client sends an (synchronous)
1166extcmd packet. Ext commands will be processed in the order they are
1167received by the server, like other user commands. The first argument is
1168the logged-in player. Ext commands can only be processed after a player
1169has logged in successfully.
905 1170
906If the callback returns something, it is sent back as if reply was being 1171If the callback returns something, it is sent back as if reply was being
907called. 1172called.
908 1173
1174=item cf::register_exticmd $name => \&callback($ns,$packet);
1175
1176Register a callback for execution when the client sends an (asynchronous)
1177exticmd packet. Exti commands are processed by the server as soon as they
1178are received, i.e. out of order w.r.t. other commands. The first argument
1179is a client socket. Exti commands can be received anytime, even before
1180log-in.
1181
1182If the callback returns something, it is sent back as if reply was being
1183called.
1184
909=cut 1185=cut
910 1186
911sub register_extcmd { 1187sub register_extcmd {
912 my ($name, $cb) = @_; 1188 my ($name, $cb) = @_;
913 1189
914 $EXTCMD{$name} = $cb; 1190 $EXTCMD{$name} = $cb;
1191}
1192
1193sub register_exticmd {
1194 my ($name, $cb) = @_;
1195
1196 $EXTICMD{$name} = $cb;
915} 1197}
916 1198
917cf::player->attach ( 1199cf::player->attach (
918 on_command => sub { 1200 on_command => sub {
919 my ($pl, $name, $params) = @_; 1201 my ($pl, $name, $params) = @_;
928 cf::override; 1210 cf::override;
929 }, 1211 },
930 on_extcmd => sub { 1212 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
932 1214
933 my $msg = eval { from_json $buf }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1216
935 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
941 } else { 1232 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1234 }
944 1235
945 cf::override; 1236 cf::override;
946 }, 1237 },
947); 1238);
948 1239
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 1240sub load_extensions {
1241 cf::sync_job {
1242 my %todo;
1243
984 for my $ext (<$LIBDIR/*.ext>) { 1244 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1245 next unless -r $path;
986 eval { 1246
987 load_extension $ext; 1247 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1248 my $base = $1;
1249 my $pkg = $1;
1250 $pkg =~ s/[^[:word:]]/_/g;
1251 $pkg = "ext::$pkg";
1252
1253 open my $fh, "<:utf8", $path
1254 or die "$path: $!";
1255
1256 my $source = do { local $/; <$fh> };
1257
1258 my %ext = (
1259 path => $path,
1260 base => $base,
1261 pkg => $pkg,
1262 );
1263
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266
1267 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n"
1270 . $source
1271 . "\n};\n1";
1272
1273 $todo{$base} = \%ext;
1274 }
1275
1276 my %done;
1277 while (%todo) {
1278 my $progress;
1279
1280 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip
1283 unless exists $done{$_};
1284 }
1285
1286 warn "... loading '$k' into '$v->{pkg}'\n";
1287
1288 unless (eval $v->{source}) {
1289 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n";
1291
1292 if (exists $v->{meta}{mandatory}) {
1293 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n";
1295 exit 1;
1296 }
1297
1298 warn $msg;
1299 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
988 1 1304 }
989 } or warn "$ext not loaded: $@"; 1305
1306 skip:
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1308 unless $progress;
1309 }
990 } 1310 };
991} 1311}
992 1312
993############################################################################# 1313#############################################################################
994 1314
1315=back
1316
995=head2 CORE EXTENSIONS 1317=head2 CORE EXTENSIONS
996 1318
997Functions and methods that extend core crossfire objects. 1319Functions and methods that extend core crossfire objects.
998 1320
999=cut 1321=cut
1003use Coro::AIO; 1325use Coro::AIO;
1004 1326
1005=head3 cf::player 1327=head3 cf::player
1006 1328
1007=over 4 1329=over 4
1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1008 1344
1009=item cf::player::find $login 1345=item cf::player::find $login
1010 1346
1011Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1012 1348
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1388
1053 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1056 } 1397 }
1057 } 1398 }
1058} 1399}
1059 1400
1069 1410
1070 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1072 1413
1073 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1074 Coro::cede; 1415 cf::cede_to_tick;
1075} 1416}
1076 1417
1077sub new($) { 1418sub new($) {
1078 my ($login) = @_; 1419 my ($login) = @_;
1079 1420
1083 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1084 1425
1085 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1086 1427
1087 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1088} 1439}
1089 1440
1090=item $pl->quit_character 1441=item $pl->quit_character
1091 1442
1092Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1498 or return [];
1148 1499
1149 my @logins; 1500 my @logins;
1150 1501
1151 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1155 1511
1156 utf8::decode $login; 1512 utf8::decode $login;
1157 push @logins, $login; 1513 push @logins, $login;
1158 } 1514 }
1159 1515
1186 } 1542 }
1187 1543
1188 \@paths 1544 \@paths
1189} 1545}
1190 1546
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1548
1549Expand crossfire pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639
1191=item $player->ext_reply ($msgid, %msg) 1640=item $player->ext_reply ($msgid, @msg)
1192 1641
1193Sends an ext reply to the player. 1642Sends an ext reply to the player.
1194 1643
1195=cut 1644=cut
1196 1645
1197sub ext_reply($$%) { 1646sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1647 my ($self, $id, @msg) = @_;
1199 1648
1200 $msg{msgid} = $id; 1649 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1650}
1204 1651
1205=item $player->ext_event ($type, %msg) 1652=item $player->ext_msg ($type, @msg)
1206 1653
1207Sends an ext event to the client. 1654Sends an ext event to the client.
1208 1655
1209=cut 1656=cut
1210 1657
1211sub ext_event($$%) { 1658sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1659 my ($self, $type, @msg) = @_;
1213 1660
1214 $self->ns->ext_event ($type, %msg); 1661 $self->ns->ext_msg ($type, @msg);
1215} 1662}
1216 1663
1217=head3 cf::region 1664=head3 cf::region
1218 1665
1219=over 4 1666=over 4
1222 1669
1223package cf::region; 1670package cf::region;
1224 1671
1225=item cf::region::find_by_path $path 1672=item cf::region::find_by_path $path
1226 1673
1227Tries to decuce the probable region for a map knowing only its path. 1674Tries to decuce the likely region for a map knowing only its path.
1228 1675
1229=cut 1676=cut
1230 1677
1231sub find_by_path($) { 1678sub find_by_path($) {
1232 my ($path) = @_; 1679 my ($path) = @_;
1233 1680
1234 my ($match, $specificity); 1681 my ($match, $specificity);
1235 1682
1236 for my $region (list) { 1683 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1684 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1685 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1686 if $region->specificity > $specificity;
1240 } 1687 }
1241 } 1688 }
1242 1689
1306 my ($self, $merge) = @_; 1753 my ($self, $merge) = @_;
1307 1754
1308 # we have to keep some variables in memory intact 1755 # we have to keep some variables in memory intact
1309 local $self->{path}; 1756 local $self->{path};
1310 local $self->{load_path}; 1757 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1758
1314 $self->SUPER::thawer_merge ($merge); 1759 $self->SUPER::thawer_merge ($merge);
1315} 1760}
1316 1761
1317sub normalise { 1762sub normalise {
1364 $self->init; # pass $1 etc. 1809 $self->init; # pass $1 etc.
1365 return $self; 1810 return $self;
1366 } 1811 }
1367 } 1812 }
1368 1813
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1814 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1815 ()
1371} 1816}
1372 1817
1373sub init { 1818sub init {
1374 my ($self) = @_; 1819 my ($self) = @_;
1417 1862
1418 $_->change_map_light ($change) 1863 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1864 for grep $_->outdoor, values %cf::MAP;
1420} 1865}
1421 1866
1867sub decay_objects {
1868 my ($self) = @_;
1869
1870 return if $self->{deny_reset};
1871
1872 $self->do_decay_objects;
1873}
1874
1422sub unlink_save { 1875sub unlink_save {
1423 my ($self) = @_; 1876 my ($self) = @_;
1424 1877
1425 utf8::encode (my $save = $self->save_path); 1878 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1879 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1882
1430sub load_header_from($) { 1883sub load_header_from($) {
1431 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1432 1885
1433 utf8::encode $path; 1886 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1439 1895
1440 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1441 1897
1442 1 1898 1
1443} 1899}
1482 $self->load_header_orig 1938 $self->load_header_orig
1483 or return; 1939 or return;
1484 $self->prepare_orig; 1940 $self->prepare_orig;
1485 } 1941 }
1486 1942
1943 $self->{deny_reset} = 1
1944 if $self->no_reset;
1945
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1946 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1947 unless $self->default_region;
1489 1948
1490 1 1949 1
1491} 1950}
1494sub find { 1953sub find {
1495 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1496 1955
1497 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1498 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1500 1960
1501 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1503 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1504 or return; 1966 or return;
1505 1967
1506 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1507 1969
1508 $map->load_header 1970 $map->load_header
1509 or return; 1971 or return;
1510 1972
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1514 $map->reset; 1978 $map->reset;
1515 undef $guard;
1516 return find $path; 1979 return find $path;
1517 } 1980 }
1518 1981
1519 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1520 } 1983 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1530 1993
1531 my $path = $self->{path}; 1994 my $path = $self->{path};
1532 1995
1533 { 1996 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1535 1998
1999 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 2001
1538 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1539 2003
1540 $self->alloc; 2004 $self->alloc;
1541 2005
1542 $self->pre_load; 2006 $self->pre_load;
1543 Coro::cede; 2007 cf::cede_to_tick;
1544 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1546 or return; 2012 or return;
1547 2013
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1550 2016
1551 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 2018 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 2021 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1556 } 2025 }
1557 } 2026 }
1558 2027
1559 Coro::cede; 2028 $f->resolve_delayed_derefs;
2029
2030 cf::cede_to_tick;
1560 # now do the right thing for maps 2031 # now do the right thing for maps
1561 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 2034 unless $self->difficulty;
1564 Coro::cede; 2035 cf::cede_to_tick;
1565 2036
1566 unless ($self->{deny_activate}) { 2037 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 2038 $self->decay_objects;
1568 $self->fix_auto_apply; 2039 $self->fix_auto_apply;
1569 $self->update_buttons; 2040 $self->update_buttons;
1570 Coro::cede; 2041 cf::cede_to_tick;
1571 $self->set_darkness_map; 2042 $self->set_darkness_map;
1572 Coro::cede; 2043 cf::cede_to_tick;
1573 $self->activate; 2044 $self->activate;
1574 } 2045 }
2046
2047 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME);
1575 2049
1576 $self->in_memory (cf::MAP_IN_MEMORY); 2050 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 2051 }
1578 2052
1579 $self->post_load; 2053 $self->post_load;
1583 my ($self, $ob) = @_; 2057 my ($self, $ob) = @_;
1584 2058
1585 return find "~" . $ob->name . "/" . $self->{path} 2059 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 2060 if $self->per_player;
1587 2061
2062# return find "?party/" . $ob->name . "/" . $self->{path}
2063# if $self->per_party;
2064
1588 $self 2065 $self
1589} 2066}
1590 2067
1591# find and load all maps in the 3x3 area around a map 2068# find and load all maps in the 3x3 area around a map
1592sub load_diag { 2069sub load_neighbours {
1593 my ($map) = @_; 2070 my ($map) = @_;
1594 2071
1595 my @diag; # diagonal neighbours 2072 my @neigh; # diagonal neighbours
1596 2073
1597 for (0 .. 3) { 2074 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 2075 my $neigh = $map->tile_path ($_)
1599 or next; 2076 or next;
1600 $neigh = find $neigh, $map 2077 $neigh = find $neigh, $map
1601 or next; 2078 or next;
1602 $neigh->load; 2079 $neigh->load;
1603 2080
2081 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2082 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2083 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2084 }
1607 2085
1608 for (@diag) { 2086 for (grep defined $_->[0], @neigh) {
2087 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2088 my $neigh = find $path, $origin
1610 or next; 2089 or next;
1611 $neigh->load; 2090 $neigh->load;
1612 } 2091 }
1613} 2092}
1614 2093
1619} 2098}
1620 2099
1621sub do_load_sync { 2100sub do_load_sync {
1622 my ($map) = @_; 2101 my ($map) = @_;
1623 2102
2103 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2104 if $Coro::current == $Coro::main;
2105
1624 cf::sync_job { $map->load }; 2106 cf::sync_job { $map->load };
1625} 2107}
1626 2108
1627our %MAP_PREFETCH; 2109our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2110our $MAP_PREFETCHER = undef;
1629 2111
1630sub find_async { 2112sub find_async {
1631 my ($path, $origin) = @_; 2113 my ($path, $origin, $load) = @_;
1632 2114
1633 $path = normalise $path, $origin && $origin->{path}; 2115 $path = normalise $path, $origin && $origin->{path};
1634 2116
1635 if (my $map = $cf::MAP{$path}) { 2117 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2119 }
1638 2120
1639 undef $MAP_PREFETCH{$path}; 2121 $MAP_PREFETCH{$path} |= $load;
2122
1640 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1641 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2128 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2129 $map->load if $v;
2130 }
1646 2131
1647 delete $MAP_PREFETCH{$path}; 2132 delete $MAP_PREFETCH{$k};
1648 } 2133 }
1649 } 2134 }
1650 undef $MAP_PREFETCHER; 2135 undef $MAP_PREFETCHER;
1651 }; 2136 };
1652 $MAP_PREFETCHER->prio (6); 2137 $MAP_PREFETCHER->prio (6);
1655} 2140}
1656 2141
1657sub save { 2142sub save {
1658 my ($self) = @_; 2143 my ($self) = @_;
1659 2144
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2146
1662 $self->{last_save} = $cf::RUNTIME; 2147 $self->{last_save} = $cf::RUNTIME;
1663 2148
1664 return unless $self->dirty; 2149 return unless $self->dirty;
1665 2150
1671 return if $self->{deny_save}; 2156 return if $self->{deny_save};
1672 2157
1673 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
1674 2159
1675 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
1677 }; 2163 };
1678 2164
1679 if ($uniq) { 2165 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1688 my ($self) = @_; 2174 my ($self) = @_;
1689 2175
1690 # save first because save cedes 2176 # save first because save cedes
1691 $self->save; 2177 $self->save;
1692 2178
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2180
1695 return if $self->players; 2181 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1698 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2189 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2190}
1702 2191
1703sub reset_at { 2192sub reset_at {
1704 my ($self) = @_; 2193 my ($self) = @_;
1705 2194
1706 # TODO: safety, remove and allow resettable per-player maps 2195 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2196 return 1e99 if $self->{deny_reset};
1709 2197
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2200
1723 my ($self) = @_; 2211 my ($self) = @_;
1724 2212
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2214
1727 return if $self->players; 2215 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2216
1730 warn "resetting map ", $self->path;#d# 2217 warn "resetting map ", $self->path;
1731 2218
1732 $self->in_memory (cf::MAP_SWAPPED); 2219 $self->in_memory (cf::MAP_SWAPPED);
1733 2220
1734 # need to save uniques path 2221 # need to save uniques path
1735 unless ($self->{deny_save}) { 2222 unless ($self->{deny_save}) {
1739 if $uniq; 2226 if $uniq;
1740 } 2227 }
1741 2228
1742 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
1743 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2233 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2234
1748 $self->unlink_save; 2235 $self->unlink_save;
1749 $self->destroy; 2236 $self->destroy;
1750} 2237}
1751 2238
1752my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
1753 2240
1754sub nuke { 2241sub nuke {
1755 my ($self) = @_; 2242 my ($self) = @_;
1756 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
1757 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
1758 2248
1759 $self->unlink_save; 2249 $self->unlink_save;
1760 2250
1761 bless $self, "cf::map"; 2251 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2256
1767 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
1768 2259
1769 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2261}
2262
2263=item $maps = cf::map::tmp_maps
2264
2265Returns an arrayref with all map paths of currently instantiated and saved
2266maps. May block.
2267
2268=cut
2269
2270sub tmp_maps() {
2271 [
2272 map {
2273 utf8::decode $_;
2274 /\.map$/
2275 ? normalise $_
2276 : ()
2277 } @{ aio_readdir $TMPDIR or [] }
2278 ]
2279}
2280
2281=item $maps = cf::map::random_maps
2282
2283Returns an arrayref with all map paths of currently instantiated and saved
2284random maps. May block.
2285
2286=cut
2287
2288sub random_maps() {
2289 [
2290 map {
2291 utf8::decode $_;
2292 /\.map$/
2293 ? normalise "?random/$_"
2294 : ()
2295 } @{ aio_readdir $RANDOMDIR or [] }
2296 ]
1770} 2297}
1771 2298
1772=item cf::map::unique_maps 2299=item cf::map::unique_maps
1773 2300
1774Returns an arrayref of paths of all shared maps that have 2301Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2302instantiated unique items. May block.
1776 2303
1777=cut 2304=cut
1778 2305
1779sub unique_maps() { 2306sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2307 [
1781 or return; 2308 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2309 utf8::decode $_;
1787 next if /\.pst$/; 2310 /\.map$/
1788 next unless /^$PATH_SEP/o; 2311 ? normalise $_
1789 2312 : ()
1790 push @paths, cf::map::normalise $_; 2313 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2314 ]
1792
1793 \@paths
1794} 2315}
1795 2316
1796package cf; 2317package cf;
1797 2318
1798=back 2319=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2337 map { $_, inv_recursive_ $_->inv } @_
1817} 2338}
1818 2339
1819sub inv_recursive { 2340sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2342}
2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
1821} 2370}
1822 2371
1823package cf; 2372package cf;
1824 2373
1825=back 2374=back
1844 2393
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2394 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2395
1847 if ($self->{record_replies}) { 2396 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2397 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2398
1849 } else { 2399 } else {
2400 my $pl = $self->contr;
2401
2402 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2403 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405
2406 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2407 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2408 $self->message ($msg, $flags);
2409 }
1852 } 2410 }
2411}
2412
2413=item $object->send_msg ($channel, $msg, $color, [extra...])
2414
2415=cut
2416
2417sub cf::object::send_msg {
2418 my $pl = shift->contr
2419 or return;
2420 $pl->send_msg (@_);
1853} 2421}
1854 2422
1855=item $player_object->may ("access") 2423=item $player_object->may ("access")
1856 2424
1857Returns wether the given player is authorized to access resource "access" 2425Returns wether the given player is authorized to access resource "access"
1936 # use -1 or undef as default coordinates, not 0, 0 2504 # use -1 or undef as default coordinates, not 0, 0
1937 ($x, $y) = ($map->enter_x, $map->enter_y) 2505 ($x, $y) = ($map->enter_x, $map->enter_y)
1938 if $x <=0 && $y <= 0; 2506 if $x <=0 && $y <= 0;
1939 2507
1940 $map->load; 2508 $map->load;
1941 $map->load_diag; 2509 $map->load_neighbours;
1942 2510
1943 return unless $self->contr->active; 2511 return unless $self->contr->active;
1944 $self->activate_recursive; 2512 $self->activate_recursive;
1945 2513
1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1947 $self->enter_map ($map, $x, $y); 2515 $self->enter_map ($map, $x, $y);
1948} 2516}
1949 2517
1950=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1951 2519
1952Moves the player to the given map-path and coordinates by first freezing 2520Moves the player to the given map-path and coordinates by first freezing
1953her, loading and preparing them map, calling the provided $check callback 2521her, loading and preparing them map, calling the provided $check callback
1954that has to return the map if sucecssful, and then unfreezes the player on 2522that has to return the map if sucecssful, and then unfreezes the player on
1955the new (success) or old (failed) map position. 2523the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process.
1956 2525
1957=cut 2526=cut
1958 2527
1959our $GOTOGEN; 2528our $GOTOGEN;
1960 2529
1961sub cf::object::player::goto { 2530sub cf::object::player::goto {
1962 my ($self, $path, $x, $y, $check) = @_; 2531 my ($self, $path, $x, $y, $check, $done) = @_;
1963 2532
1964 # do generation counting so two concurrent goto's will be executed in-order 2533 # do generation counting so two concurrent goto's will be executed in-order
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1966 2535
1967 $self->enter_link; 2536 $self->enter_link;
1968 2537
1969 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
1970 my $map = eval { 2560 my $map = eval {
1971 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
1972 2562
1973 if ($map) { 2563 if ($map) {
1974 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
1975 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
1976 } else { 2566 } else {
1977 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1978 } 2568 }
1979 2569
1980 $map 2570 $map
1981 }; 2571 };
1982 2572
1987 2577
1988 if ($gen == $self->{_goto_generation}) { 2578 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation}; 2579 delete $self->{_goto_generation};
1990 $self->leave_link ($map, $x, $y); 2580 $self->leave_link ($map, $x, $y);
1991 } 2581 }
2582
2583 $done->() if $done;
1992 })->prio (1); 2584 })->prio (1);
1993} 2585}
1994 2586
1995=item $player_object->enter_exit ($exit_object) 2587=item $player_object->enter_exit ($exit_object)
1996 2588
2065 my $hp = $exit->stats->hp; 2657 my $hp = $exit->stats->hp;
2066 my $sp = $exit->stats->sp; 2658 my $sp = $exit->stats->sp;
2067 2659
2068 $self->enter_link; 2660 $self->enter_link;
2069 2661
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2070 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2071 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2072 unless (eval { 2670 unless (eval {
2073 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2074 2672
2075 1; 2673 1;
2101 2699
2102 utf8::encode $text; 2700 utf8::encode $text;
2103 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2104} 2702}
2105 2703
2704=item $client->send_msg ($channel, $msg, $color, [extra...])
2705
2706Send a drawinfo or msg packet to the client, formatting the msg for the
2707client if neccessary. C<$type> should be a string identifying the type of
2708the message, with C<log> being the default. If C<$color> is negative, suppress
2709the message unless the client supports the msg packet.
2710
2711=cut
2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2765sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_;
2767
2768 $msg = $self->pl->expand_cfpod ($msg);
2769
2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2781 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2787 }
2788
2789 $channel = $channel->{id};
2790 }
2791
2792 return unless @extra || length $msg;
2793
2794 if ($self->can_msg) {
2795 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF;
2798
2799 $self->send_packet ("msg " . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2801 } else {
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812
2813 $color &= cf::NDI_COLOR_MASK;
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826}
2827
2106=item $client->ext_event ($type, %msg) 2828=item $client->ext_msg ($type, @msg)
2107 2829
2108Sends an exti event to the client. 2830Sends an ext event to the client.
2109 2831
2110=cut 2832=cut
2111 2833
2112sub cf::client::ext_event($$%) { 2834sub cf::client::ext_msg($$@) {
2113 my ($self, $type, %msg) = @_; 2835 my ($self, $type, @msg) = @_;
2114 2836
2837 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove
2115 $msg{msgtype} = "event_$type"; 2840 push @msg, msgtype => "event_$type";
2116 $self->send_packet ("ext " . cf::to_json \%msg); 2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 }
2843}
2844
2845=item $client->ext_reply ($msgid, @msg)
2846
2847Sends an ext reply to the client.
2848
2849=cut
2850
2851sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_;
2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 }
2117} 2861}
2118 2862
2119=item $success = $client->query ($flags, "text", \&cb) 2863=item $success = $client->query ($flags, "text", \&cb)
2120 2864
2121Queues a query to the client, calling the given callback with 2865Queues a query to the client, calling the given callback with
2122the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2866the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2123C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2867C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2124 2868
2125Queries can fail, so check the return code. Or don't, as queries will become 2869Queries can fail, so check the return code. Or don't, as queries will
2126reliable at some point in the future. 2870become reliable at some point in the future.
2127 2871
2128=cut 2872=cut
2129 2873
2130sub cf::client::query { 2874sub cf::client::query {
2131 my ($self, $flags, $text, $cb) = @_; 2875 my ($self, $flags, $text, $cb) = @_;
2139 utf8::encode $text; 2883 utf8::encode $text;
2140 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2884 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2141 2885
2142 $self->send_packet ($self->{query_queue}[0][0]) 2886 $self->send_packet ($self->{query_queue}[0][0])
2143 if @{ $self->{query_queue} } == 1; 2887 if @{ $self->{query_queue} } == 1;
2888
2889 1
2144} 2890}
2145 2891
2146cf::client->attach ( 2892cf::client->attach (
2893 on_connect => sub {
2894 my ($ns) = @_;
2895
2896 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2897 },
2147 on_reply => sub { 2898 on_reply => sub {
2148 my ($ns, $msg) = @_; 2899 my ($ns, $msg) = @_;
2149 2900
2150 # this weird shuffling is so that direct followup queries 2901 # this weird shuffling is so that direct followup queries
2151 # get handled first 2902 # get handled first
2163 } else { 2914 } else {
2164 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2915 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2165 } 2916 }
2166 } 2917 }
2167 }, 2918 },
2919 on_exticmd => sub {
2920 my ($ns, $buf) = @_;
2921
2922 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2923
2924 if (ref $msg) {
2925 my ($type, $reply, @payload) =
2926 "ARRAY" eq ref $msg
2927 ? @$msg
2928 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2929
2930 my @reply;
2931
2932 if (my $cb = $EXTICMD{$type}) {
2933 @reply = $cb->($ns, @payload);
2934 }
2935
2936 $ns->ext_reply ($reply, @reply)
2937 if $reply;
2938
2939 } else {
2940 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2941 }
2942
2943 cf::override;
2944 },
2168); 2945);
2169 2946
2170=item $client->async (\&cb) 2947=item $client->async (\&cb)
2171 2948
2172Create a new coroutine, running the specified callback. The coroutine will 2949Create a new coroutine, running the specified callback. The coroutine will
2213our $safe = new Safe "safe"; 2990our $safe = new Safe "safe";
2214our $safe_hole = new Safe::Hole; 2991our $safe_hole = new Safe::Hole;
2215 2992
2216$SIG{FPE} = 'IGNORE'; 2993$SIG{FPE} = 'IGNORE';
2217 2994
2218$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2995$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math
2997 grepstart grepwhile mapstart mapwhile
2998 sort time
2999));
2219 3000
2220# here we export the classes and methods available to script code 3001# here we export the classes and methods available to script code
2221 3002
2222=pod 3003=pod
2223 3004
2224The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2225 3006
2226 cf::object contr pay_amount pay_player map 3007 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr
3010
2227 cf::object::player player 3011 cf::object::player
2228 cf::player peaceful 3012 player
2229 cf::map trigger 3013
3014 cf::player
3015 peaceful
3016
3017 cf::map
3018 trigger
2230 3019
2231=cut 3020=cut
2232 3021
2233for ( 3022for (
2234 ["cf::object" => qw(contr pay_amount pay_player map)], 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race
3025 decrease_ob_nr destroy)],
2235 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2236 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2237 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2238) { 3029) {
2239 no strict 'refs'; 3030 no strict 'refs';
2310=back 3101=back
2311 3102
2312=cut 3103=cut
2313 3104
2314############################################################################# 3105#############################################################################
2315
2316=head2 EXTENSION DATABASE SUPPORT
2317
2318Crossfire maintains a very simple database for extension use. It can
2319currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2320convert to/from binary).
2321
2322The parameter C<$family> should best start with the name of the extension
2323using it, it should be unique.
2324
2325=over 4
2326
2327=item $value = cf::db_get $family => $key
2328
2329Returns a single value from the database.
2330
2331=item cf::db_put $family => $key => $value
2332
2333Stores the given C<$value> in the family.
2334
2335=cut
2336
2337our $DB;
2338
2339sub db_init {
2340 unless ($DB) {
2341 $DB = BDB::db_create $DB_ENV;
2342
2343 cf::sync_job {
2344 eval {
2345 $DB->set_flags (BDB::CHKSUM);
2346
2347 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2348 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2349 cf::cleanup "db_open(db): $!" if $!;
2350 };
2351 cf::cleanup "db_open(db): $@" if $@;
2352 };
2353 }
2354}
2355
2356sub db_get($$) {
2357 my $key = "$_[0]/$_[1]";
2358
2359 cf::sync_job {
2360 BDB::db_get $DB, undef, $key, my $data;
2361
2362 $! ? ()
2363 : $data
2364 }
2365}
2366
2367sub db_put($$$) {
2368 BDB::dbreq_pri 4;
2369 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2370}
2371
2372=item cf::cache $id => [$paths...], $processversion => $process
2373
2374Generic caching function that returns the value of the resource $id,
2375caching and regenerating as required.
2376
2377This function can block.
2378
2379=cut
2380
2381sub cache {
2382 my ($id, $src, $processversion, $process) = @_;
2383
2384 my $meta =
2385 join "\x00",
2386 $processversion,
2387 map {
2388 aio_stat $_
2389 and Carp::croak "$_: $!";
2390
2391 ($_, (stat _)[7,9])
2392 } @$src;
2393
2394 my $dbmeta = db_get cache => "$id/meta";
2395 if ($dbmeta ne $meta) {
2396 # changed, we may need to process
2397
2398 my @data;
2399 my $md5;
2400
2401 for (0 .. $#$src) {
2402 0 <= aio_load $src->[$_], $data[$_]
2403 or Carp::croak "$src->[$_]: $!";
2404 }
2405
2406 # if processing is expensive, check
2407 # checksum first
2408 if (1) {
2409 $md5 =
2410 join "\x00",
2411 $processversion,
2412 map {
2413 Coro::cede;
2414 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2415 } 0.. $#$src;
2416
2417
2418 my $dbmd5 = db_get cache => "$id/md5";
2419 if ($dbmd5 eq $md5) {
2420 db_put cache => "$id/meta", $meta;
2421
2422 return db_get cache => "$id/data";
2423 }
2424 }
2425
2426 my $t1 = Time::HiRes::time;
2427 my $data = $process->(\@data);
2428 my $t2 = Time::HiRes::time;
2429
2430 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2431
2432 db_put cache => "$id/data", $data;
2433 db_put cache => "$id/md5" , $md5;
2434 db_put cache => "$id/meta", $meta;
2435
2436 return $data;
2437 }
2438
2439 db_get cache => "$id/data"
2440}
2441
2442=item fork_call { }, $args
2443
2444Executes the given code block with the given arguments in a seperate
2445process, returning the results. Everything must be serialisable with
2446Coro::Storable. May, of course, block. Note that the executed sub may
2447never block itself or use any form of Event handling.
2448
2449=cut
2450
2451sub fork_call(&@) {
2452 my ($cb, @args) = @_;
2453
2454# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2455# or die "socketpair: $!";
2456 pipe my $fh1, my $fh2
2457 or die "pipe: $!";
2458
2459 if (my $pid = fork) {
2460 close $fh2;
2461
2462 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2463 $res = Coro::Storable::thaw $res;
2464
2465 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2466
2467 die $$res unless "ARRAY" eq ref $res;
2468
2469 return wantarray ? @$res : $res->[-1];
2470 } else {
2471 reset_signals;
2472 local $SIG{__WARN__};
2473 local $SIG{__DIE__};
2474 eval {
2475 close $fh1;
2476
2477 my @res = eval { $cb->(@args) };
2478 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2479 };
2480
2481 warn $@ if $@;
2482 _exit 0;
2483 }
2484}
2485
2486
2487
2488#############################################################################
2489# the server's init and main functions 3106# the server's init and main functions
2490 3107
2491sub load_facedata($) { 3108sub load_facedata($) {
2492 my ($path) = @_; 3109 my ($path) = @_;
3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
3114
3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2493 3116
2494 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2495 3118
2496 my $facedata; 3119 my $facedata;
2497 0 < aio_load $path, $facedata 3120 0 < aio_load $path, $facedata
2500 $facedata = Coro::Storable::thaw $facedata; 3123 $facedata = Coro::Storable::thaw $facedata;
2501 3124
2502 $facedata->{version} == 2 3125 $facedata->{version} == 2
2503 or cf::cleanup "$path: version mismatch, cannot proceed."; 3126 or cf::cleanup "$path: version mismatch, cannot proceed.";
2504 3127
3128 # patch in the exptable
3129 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3132 };
3133 cf::cede_to_tick;
3134
2505 { 3135 {
2506 my $faces = $facedata->{faceinfo}; 3136 my $faces = $facedata->{faceinfo};
2507 3137
2508 while (my ($face, $info) = each %$faces) { 3138 while (my ($face, $info) = each %$faces) {
2509 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3139 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2510 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3140 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap};
2511 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2512 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2513 Coro::cede; 3144
3145 cf::cede_to_tick;
2514 } 3146 }
2515 3147
2516 while (my ($face, $info) = each %$faces) { 3148 while (my ($face, $info) = each %$faces) {
2517 next unless $info->{smooth}; 3149 next unless $info->{smooth};
2518 my $idx = cf::face::find $face 3150 my $idx = cf::face::find $face
2519 or next; 3151 or next;
2520 if (my $smooth = cf::face::find $info->{smooth}) { 3152 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth;
2521 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2522 } else { 3155 } else {
2523 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3156 warn "smooth face '$info->{smooth}' not found for face '$face'";
2524 } 3157 }
2525 Coro::cede; 3158
3159 cf::cede_to_tick;
2526 } 3160 }
2527 } 3161 }
2528 3162
2529 { 3163 {
2530 my $anims = $facedata->{animinfo}; 3164 my $anims = $facedata->{animinfo};
2531 3165
2532 while (my ($anim, $info) = each %$anims) { 3166 while (my ($anim, $info) = each %$anims) {
2533 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3167 cf::anim::set $anim, $info->{frames}, $info->{facings};
2534 Coro::cede; 3168 cf::cede_to_tick;
2535 } 3169 }
2536 3170
2537 cf::anim::invalidate_all; # d'oh 3171 cf::anim::invalidate_all; # d'oh
2538 } 3172 }
2539 3173
3174 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource};
3178
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184
3185 if ($info->{type} & 1) {
3186 # prepend meta info
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else {
3195 $data = $info->{data};
3196 }
3197
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick;
3202 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 }
3222
2540 1 3223 1
2541} 3224}
2542 3225
3226register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_;
3228
3229 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v);
3231 }
3232};
3233
2543sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2544 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2545 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
3241
3242 for (cf::region::list) {
3243 $_->{match} = qr/$_->{match}/
3244 if exists $_->{match};
3245 }
2546} 3246}
2547 3247
2548sub reload_facedata { 3248sub reload_facedata {
2549 load_facedata "$DATADIR/facedata" 3249 load_facedata "$DATADIR/facedata"
2550 or die "unable to load facedata\n"; 3250 or die "unable to load facedata\n";
2551} 3251}
2552 3252
2553sub reload_archetypes { 3253sub reload_archetypes {
2554 load_resource_file "$DATADIR/archetypes" 3254 load_resource_file "$DATADIR/archetypes"
2555 or die "unable to load archetypes\n"; 3255 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
2556} 3261}
2557 3262
2558sub reload_treasures { 3263sub reload_treasures {
2559 load_resource_file "$DATADIR/treasures" 3264 load_resource_file "$DATADIR/treasures"
2560 or die "unable to load treasurelists\n"; 3265 or die "unable to load treasurelists\n";
2563sub reload_resources { 3268sub reload_resources {
2564 warn "reloading resource files...\n"; 3269 warn "reloading resource files...\n";
2565 3270
2566 reload_regions; 3271 reload_regions;
2567 reload_facedata; 3272 reload_facedata;
3273 #reload_archetypes;#d#
2568 reload_archetypes; 3274 reload_archetypes;
2569 reload_treasures; 3275 reload_treasures;
2570 3276
2571 warn "finished reloading resource files\n"; 3277 warn "finished reloading resource files\n";
2572} 3278}
2573 3279
2574sub init { 3280sub init {
2575 reload_resources; 3281 reload_resources;
2576} 3282}
2577 3283
2578sub cfg_load { 3284sub reload_config {
2579 open my $fh, "<:utf8", "$CONFDIR/config" 3285 open my $fh, "<:utf8", "$CONFDIR/config"
2580 or return; 3286 or return;
2581 3287
2582 local $/; 3288 local $/;
2583 *CFG = YAML::Syck::Load <$fh>; 3289 *CFG = YAML::Syck::Load <$fh>;
2599sub main { 3305sub main {
2600 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
2601 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
2602 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2603 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
2604 Event::one_event; 3311 Event::one_event;
2605 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
2606 }; 3313 };
2607 3314
2608 cfg_load; 3315 reload_config;
2609 db_init; 3316 db_init;
2610 load_extensions; 3317 load_extensions;
2611 3318
2612 $TICK_WATCHER->start; 3319 $TICK_WATCHER->start;
2613 Event::loop; 3320 Event::loop;
2629 }, 3336 },
2630 ); 3337 );
2631 } 3338 }
2632} 3339}
2633 3340
3341sub write_runtime {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time.
3346
3347 IO::AIO::aio_utime $runtime, undef, undef;
3348
3349 my $guard = cf::lock_acquire "write_runtime";
3350
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3352 or return;
3353
3354 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server.
3357
3358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3359 and return;
3360
3361 # always fsync - this file is important
3362 aio_fsync $fh
3363 and return;
3364
3365 # touch it again to show we are up-to-date
3366 aio_utime $fh, undef, undef;
3367
3368 close $fh
3369 or return;
3370
3371 aio_rename "$runtime~", $runtime
3372 and return;
3373
3374 warn "runtime file written.\n";
3375
3376 1
3377}
3378
2634sub emergency_save() { 3379sub emergency_save() {
2635 my $freeze_guard = cf::freeze_mainloop; 3380 my $freeze_guard = cf::freeze_mainloop;
2636 3381
2637 warn "enter emergency perl save\n"; 3382 warn "enter emergency perl save\n";
2638 3383
2642 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
2643 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
2644 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
2645 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
2646 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2647 $pl->save; 3393 $pl->save;
2648 } 3394 }
2649 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
2650 3396
2651 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
2699 3445
2700 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
2701 for (;;) { 3447 for (;;) {
2702 BDB::flush; 3448 BDB::flush;
2703 IO::AIO::flush; 3449 IO::AIO::flush;
2704 Coro::cede; 3450 Coro::cede_notself;
2705 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
2706 warn "iterate..."; 3452 warn "iterate...";
2707 } 3453 }
2708 3454
2709 ++$RELOAD; 3455 ++$RELOAD;
2713 %EXT_CORO = (); 3459 %EXT_CORO = ();
2714 3460
2715 warn "removing commands"; 3461 warn "removing commands";
2716 %COMMAND = (); 3462 %COMMAND = ();
2717 3463
2718 warn "removing ext commands"; 3464 warn "removing ext/exti commands";
2719 %EXTCMD = (); 3465 %EXTCMD = ();
3466 %EXTICMD = ();
2720 3467
2721 warn "unloading/nuking all extensions"; 3468 warn "unloading/nuking all extensions";
2722 for my $pkg (@EXTS) { 3469 for my $pkg (@EXTS) {
2723 warn "... unloading $pkg"; 3470 warn "... unloading $pkg";
2724 3471
2767 warn "reloading cf.pm"; 3514 warn "reloading cf.pm";
2768 require cf; 3515 require cf;
2769 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2770 3517
2771 warn "loading config and database again"; 3518 warn "loading config and database again";
2772 cf::cfg_load; 3519 cf::reload_config;
2773 3520
2774 warn "loading extensions"; 3521 warn "loading extensions";
2775 cf::load_extensions; 3522 cf::load_extensions;
2776 3523
2777 warn "reattaching attachments to objects/players"; 3524 warn "reattaching attachments to objects/players";
2813register_command "reload" => sub { 3560register_command "reload" => sub {
2814 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
2815 3562
2816 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
2817 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
2818 async { reload_perl }; 3567 reload_perl;
3568 };
2819 } 3569 }
2820}; 3570};
2821 3571
2822unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
2823 3573
2842 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
2843 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
2844 $signal->wait; 3594 $signal->wait;
2845} 3595}
2846 3596
2847 my $min = 1e6;#d#
2848 my $avg = 10;
2849$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
2850 reentrant => 0, 3598 reentrant => 0,
2851 parked => 1, 3599 parked => 1,
2852 prio => 0, 3600 prio => 0,
2853 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
2861 3609
2862 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
2863 3611
2864 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
2865 3613
2866 0 && sync_job {#d#
2867 for(1..10) {
2868 my $t = Event::time;
2869 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2870 or die;
2871
2872 $map->width (50);
2873 $map->height (50);
2874 $map->alloc;
2875 $map->_load_objects ("/tmp/x.map", 1);
2876 my $t = Event::time - $t;
2877
2878 #next unless $t < 0.0013;#d#
2879 if ($t < $min) {
2880 $min = $t;
2881 }
2882 $avg = $avg * 0.99 + $t * 0.01;
2883 }
2884 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2885 exit 0;
2886 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2887 };
2888
2889 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
2890 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
2891 3616
2892 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2893 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
2894 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
2895 write_runtime 3621 write_runtime
2896 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
2897 }; 3623 };
2898 } 3624 }
2899 3625
2900# my $AFTER = Event::time;
2901# warn $AFTER - $NOW;#d#
2902
2903 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2904 $sig->send; 3627 $sig->send;
2905 } 3628 }
2906 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
2907 $sig->send; 3630 $sig->send;
2917 3640
2918 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
2919 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2920 3643
2921 _post_tick; 3644 _post_tick;
2922
2923
2924 }, 3645 },
2925); 3646);
2926 3647
2927{ 3648{
3649 BDB::min_parallel 8;
2928 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
2929 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
2930 reentrant => 0, 3652 reentrant => 0,
2931 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
2932 poll => 'r', 3654 poll => 'r',
2933 prio => 0, 3655 prio => 0,
2934 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
2935 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
2936 ); 3658 );
2937 BDB::min_parallel 8;
2938 3659
2939 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
2940 my $status; 3661 my $status;
2941 my $current = $Coro::current; 3662 my $current = $Coro::current;
2942 ( 3663 (
2951 ) 3672 )
2952 }; 3673 };
2953 3674
2954 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
2955 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2956 3681
2957 cf::sync_job { 3682 cf::sync_job {
2958 eval { 3683 eval {
2959 BDB::db_env_open 3684 BDB::db_env_open
2960 $DB_ENV, 3685 $DB_ENV,
2962 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2963 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2964 0666; 3689 0666;
2965 3690
2966 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2967
2968 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2969 $DB_ENV->set_lk_detect;
2970 }; 3692 };
2971 3693
2972 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
2973 }; 3695 };
2974 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
2975} 3728}
2976 3729
2977{ 3730{
2978 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
2979 3732
2982 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
2983 reentrant => 0, 3736 reentrant => 0,
2984 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
2985 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
2986 poll => 'r', 3739 poll => 'r',
2987 prio => 6, 3740 prio => 0,
2988 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
2989 ); 3742 );
2990} 3743}
2991 3744
2992my $_log_backtrace; 3745my $_log_backtrace;
2998 3751
2999 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3000 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3001 ++$_log_backtrace; 3754 ++$_log_backtrace;
3002 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3003 my @bt = fork_call { 3758 my @bt = fork_call {
3004 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3005 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3006 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3007 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines