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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC vs.
Revision 1.395 by root, Sat Nov 10 22:41:59 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines