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.280 by root, Sat Jun 16 14:35:41 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines