ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines