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.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.396 by root, Wed Nov 14 08:09:46 2007 UTC

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

Diff Legend

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