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.265 by root, Fri May 11 08:00:00 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines