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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.398 by root, Wed Dec 5 11:08:34 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS 2.01 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
34use Digest::MD5 (); 35use Digest::MD5 ();
35 36
36# configure various modules to our taste 37# configure various modules to our taste
37# 38#
38$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43 42
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
46 45
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
79our $NEXT_TICK; 78our $NEXT_TICK;
80our $NOW; 79our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
82 81
83our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 86our $DB_ENV;
85 87
86our %CFG; 88our %CFG;
87 89
88our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 91our $RUNTIME;
90 92
91our %PLAYER; # all users 93our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 94our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 95our $LINK_MAP; # the special {link} map, which is always available
94 96
95# used to convert map paths into valid unix filenames by replacing / by ∕ 97# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 99
158 160
159The raw value load value from the last tick. 161The raw value load value from the last tick.
160 162
161=item %cf::CFG 163=item %cf::CFG
162 164
163Configuration for the server, loaded from C</etc/crossfire/config>, or 165Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 166from wherever your confdir points to.
165 167
166=item cf::wait_for_tick, cf::wait_for_tick_begin 168=item cf::wait_for_tick, cf::wait_for_tick_begin
167 169
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 170These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 188 $msg .= "\n"
187 unless $msg =~ /\n$/; 189 unless $msg =~ /\n$/;
188 190
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 192
191 utf8::encode $msg;
192 LOG llevError, $msg; 193 LOG llevError, $msg;
193 }; 194 };
194} 195}
195 196
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212)) { 213)) {
213 no strict 'refs'; 214 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 216}
216 217
217$Event::DIED = sub { 218$EV::DIED = sub {
218 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
219}; 220};
220 221
221############################################################################# 222#############################################################################
222 223
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 247 $d
247 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
248} 249}
249 250
250=item $ref = cf::from_json $json 251=item $ref = cf::decode_json $json
251 252
252Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
253 254
254=item $json = cf::to_json $ref 255=item $json = cf::encode_json $ref
255 256
256Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
257 258
258=cut 259=cut
259 260
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 262
262sub to_json ($) { $json_coder->encode ($_[0]) } 263sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 264sub decode_json($) { $json_coder->decode ($_[0]) }
264 265
265=item cf::lock_wait $string 266=item cf::lock_wait $string
266 267
267Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
268 269
271Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
281Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
282 286
283=cut 287=cut
284 288
285our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
286 291
287sub lock_wait($) { 292sub lock_wait($) {
288 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
289 299
290 # wait for lock, if any 300 # wait for lock, if any
291 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 303 Coro::schedule;
299 309
300 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
301 lock_wait $key; 311 lock_wait $key;
302 312
303 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
304 315
305 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
308 } 320 }
309} 321}
310 322
322 }; 334 };
323 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
324 $guard 336 $guard
325} 337}
326 338
339=item cf::periodic $interval, $cb
340
341Like EV::periodic, but randomly selects a starting point so that the actions
342get spread over timer.
343
344=cut
345
346sub periodic($$) {
347 my ($interval, $cb) = @_;
348
349 my $start = rand List::Util::min 180, $interval;
350
351 EV::periodic $start, $interval, 0, $cb
352}
353
354=item cf::get_slot $time[, $priority[, $name]]
355
356Allocate $time seconds of blocking CPU time at priority C<$priority>:
357This call blocks and returns only when you have at least C<$time> seconds
358of cpu time till the next tick. The slot is only valid till the next cede.
359
360The optional C<$name> can be used to identify the job to run. It might be
361used for statistical purposes and should identify the same time-class.
362
363Useful for short background jobs.
364
365=cut
366
367our @SLOT_QUEUE;
368our $SLOT_QUEUE;
369
370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
374 my $signal = new Coro::Signal;
375
376 while () {
377 next_job:
378 my $avail = cf::till_tick;
379 if ($avail > 0.01) {
380 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) {
382 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send;
384 Coro::cede;
385 goto next_job;
386 }
387 }
388 }
389
390 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
392 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait;
394 } else {
395 Coro::schedule;
396 }
397 }
398};
399
400sub get_slot($;$$) {
401 my ($time, $pri, $name) = @_;
402
403 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal;
405
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready;
409 $sig->wait;
410}
411
327=item cf::async { BLOCK } 412=item cf::async { BLOCK }
328 413
329Currently the same as Coro::async_pool, meaning you cannot use 414Currently the same as Coro::async_pool, meaning you cannot use
330C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 415C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
331thing you are allowed to do is call C<prio> on it. 416thing you are allowed to do is call C<prio> on it.
334 419
335BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
336 421
337=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
338 423
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 426partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 427acceptable.
343 428
344If it must be done, put the blocking parts into C<sync_job>. This will run 429If it must be done, put the blocking parts into C<sync_job>. This will run
345the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
350 435
351sub sync_job(&) { 436sub sync_job(&) {
352 my ($job) = @_; 437 my ($job) = @_;
353 438
354 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 440 my $time = EV::time;
356 441
357 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
359 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
360 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
361 # (but this is cancel-safe) 448 # (but this is cancel-safe)
362 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
363 450
364 my $busy = 1; 451 my $busy = 1;
365 my @res; 452 my @res;
366 453
367 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 456 @res = eval { $job->() };
369 warn $@ if $@; 457 warn $@ if $@;
370 undef $busy; 458 undef $busy;
371 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
372 460
373 while ($busy) { 461 while ($busy) {
374 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
375 } 466 }
467 }
376 468
377 $time = Event::time - $time; 469 $time = EV::time - $time;
378 470
379 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381 473
382 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
412=item fork_call { }, $args 504=item fork_call { }, $args
413 505
414Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
418 510
419=cut 511=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 512
430sub fork_call(&@) { 513sub fork_call(&@) {
431 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
432 515
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 516 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 517 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 518 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 519
438 if (my $pid = fork) { 520 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 521 reset_signals;
452 local $SIG{__WARN__}; 522 &$cb
453 local $SIG{__DIE__}; 523 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 524
460 eval { 525 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 526}
473 527
474=item $value = cf::db_get $family => $key 528=item $value = cf::db_get $family => $key
475 529
476Returns a single value from the environment database. 530Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
479 533
480Stores the given C<$value> in the family. It can currently store binary 534Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 535data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 536
537=item $db = cf::db_table "name"
538
539Create and/or open a new database table. The string must not be "db" and must be unique
540within each server.
541
483=cut 542=cut
543
544sub db_table($) {
545 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV;
547
548 eval {
549 $db->set_flags (BDB::CHKSUM);
550
551 utf8::encode $name;
552 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
553 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
554 cf::cleanup "db_open(db): $!" if $!;
555 };
556 cf::cleanup "db_open(db): $@" if $@;
557
558 $db
559}
484 560
485our $DB; 561our $DB;
486 562
487sub db_init { 563sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 564 cf::sync_job {
492 eval { 565 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 566 };
502} 567}
503 568
504sub db_get($$) { 569sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
506 571
556 if (1) { 621 if (1) {
557 $md5 = 622 $md5 =
558 join "\x00", 623 join "\x00",
559 $processversion, 624 $processversion,
560 map { 625 map {
561 Coro::cede; 626 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 628 } 0.. $#$src;
564 629
565 630
566 my $dbmd5 = db_get cache => "$id/md5"; 631 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
612 677
613In the following description, CLASS can be any of C<global>, C<object> 678In the following description, CLASS can be any of C<global>, C<object>
614C<player>, C<client> or C<map> (i.e. the attachable objects in 679C<player>, C<client> or C<map> (i.e. the attachable objects in
615Crossfire TRT). 680Deliantra).
616 681
617=over 4 682=over 4
618 683
619=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
620 685
918 983
919=cut 984=cut
920 985
921############################################################################# 986#############################################################################
922# object support 987# object support
923#
924 988
989sub _object_equal($$);
990sub _object_equal($$) {
991 my ($a, $b) = @_;
992
993 return 0 unless (ref $a) eq (ref $b);
994
995 if ("HASH" eq ref $a) {
996 my @ka = keys %$a;
997 my @kb = keys %$b;
998
999 return 0 if @ka != @kb;
1000
1001 for (0 .. $#ka) {
1002 return 0 unless $ka[$_] eq $kb[$_];
1003 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1004 }
1005
1006 } elsif ("ARRAY" eq ref $a) {
1007
1008 return 0 if @$a != @$b;
1009
1010 for (0 .. $#$a) {
1011 return 0 unless _object_equal $a->[$_], $b->[$_];
1012 }
1013
1014 } elsif ($a ne $b) {
1015 return 0;
1016 }
1017
1018 1
1019}
1020
1021our $SLOW_MERGES;#d#
925sub _can_merge { 1022sub _can_merge {
926 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
927 1024
928 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1026
932 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
933} 1029}
934 1030
935sub reattach { 1031sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1033 my ($obj) = @_;
959cf::attachable->attach ( 1055cf::attachable->attach (
960 prio => -1000000, 1056 prio => -1000000,
961 on_instantiate => sub { 1057 on_instantiate => sub {
962 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
963 1059
964 $data = from_json $data; 1060 $data = decode_json $data;
965 1061
966 for (@$data) { 1062 for (@$data) {
967 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
968 1064
969 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
985sub object_freezer_save { 1081sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
987 1083
988 sync_job { 1084 sync_job {
989 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
992 1089
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1094 close $fh;
998 1095
999 if (@$objs) { 1096 if (@$objs) {
1000 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1001 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1102 close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1104 }
1015 } 1112 }
1016 } else { 1113 } else {
1017 aio_unlink $filename; 1114 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
1019 } 1116 }
1020 } 1117 };
1021} 1118}
1022 1119
1023sub object_freezer_as_string { 1120sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
1025 1122
1037 or return; 1134 or return;
1038 1135
1039 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1138 or return;
1139
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1043 } 1142 }
1044 1143
1144 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1147
1047 return ($data, $av); 1148 ($data, $av)
1048} 1149}
1049 1150
1050=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
1051 1152
1052=over 4 1153=over 4
1125 my ($pl, $buf) = @_; 1226 my ($pl, $buf) = @_;
1126 1227
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1229
1129 if (ref $msg) { 1230 if (ref $msg) {
1231 my ($type, $reply, @payload) =
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235
1236 my @reply;
1237
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1238 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1239 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1240 }
1241
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
1135 } else { 1245 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1247 }
1138 1248
1139 cf::override; 1249 cf::override;
1229 1339
1230=head3 cf::player 1340=head3 cf::player
1231 1341
1232=over 4 1342=over 4
1233 1343
1344=item cf::player::num_playing
1345
1346Returns the official number of playing players, as per the Crossfire metaserver rules.
1347
1348=cut
1349
1350sub num_playing {
1351 scalar grep
1352 $_->ob->map
1353 && !$_->hidden
1354 && !$_->ob->flag (cf::FLAG_WIZ),
1355 cf::player::list
1356}
1357
1234=item cf::player::find $login 1358=item cf::player::find $login
1235 1359
1236Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1237 1361
1238=cut 1362=cut
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1401
1278 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1403 or return;
1404
1405 my $pl = cf::player::load_pl $f
1406 or return;
1407 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1281 } 1410 }
1282 } 1411 }
1283} 1412}
1284 1413
1294 1423
1295 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1297 1426
1298 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1299 Coro::cede; 1428 cf::cede_to_tick;
1300} 1429}
1301 1430
1302sub new($) { 1431sub new($) {
1303 my ($login) = @_; 1432 my ($login) = @_;
1304 1433
1308 $self->{deny_save} = 1; 1437 $self->{deny_save} = 1;
1309 1438
1310 $cf::PLAYER{$login} = $self; 1439 $cf::PLAYER{$login} = $self;
1311 1440
1312 $self 1441 $self
1442}
1443
1444=item $player->send_msg ($channel, $msg, $color, [extra...])
1445
1446=cut
1447
1448sub send_msg {
1449 my $ns = shift->ns
1450 or return;
1451 $ns->send_msg (@_);
1313} 1452}
1314 1453
1315=item $pl->quit_character 1454=item $pl->quit_character
1316 1455
1317Nukes the player without looking back. If logged in, the connection will 1456Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1511 or return [];
1373 1512
1374 my @logins; 1513 my @logins;
1375 1514
1376 for my $login (@$dirs) { 1515 for my $login (@$dirs) {
1516 my $path = path $login;
1517
1518 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1380 1524
1381 utf8::decode $login; 1525 utf8::decode $login;
1382 push @logins, $login; 1526 push @logins, $login;
1383 } 1527 }
1384 1528
1417 1561
1418Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1419 1563
1420=cut 1564=cut
1421 1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1422sub expand_cfpod { 1577sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1424 1579
1425 # escape & and < 1580 my $xml;
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428 1581
1429 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1430 1585
1431 1 while 1586 $group =~ s/&/&amp;/g;
1432 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1436 # replace G<male|female> tags 1591 ([BCGHITU])
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1592 <
1438 $self->gender ? $2 : $1 1593 (?:
1439 }ge 1594 ([^<>]*) (?{ $group = $^N })
1440 # replace H<hint text> 1595 | < $interior >
1441 || s{H<([^\>]*)>} 1596 )
1597 >
1598 %gcsx
1442 { 1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "") 1619 "")
1446 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1447 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1448 1631
1632 for ($xml) {
1449 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1451 1635
1452 # compress some whitespace 1636 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1457 1642
1458 $_ 1643 $xml
1459} 1644}
1645
1646no re 'eval';
1460 1647
1461sub hintmode { 1648sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1650 $_[0]{hintmode}
1464} 1651}
1465 1652
1466=item $player->ext_reply ($msgid, %msg) 1653=item $player->ext_reply ($msgid, @msg)
1467 1654
1468Sends an ext reply to the player. 1655Sends an ext reply to the player.
1469 1656
1470=cut 1657=cut
1471 1658
1472sub ext_reply($$%) { 1659sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1660 my ($self, $id, @msg) = @_;
1474 1661
1475 $msg{msgid} = $id; 1662 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1663}
1478 1664
1479=item $player->ext_event ($type, %msg) 1665=item $player->ext_msg ($type, @msg)
1480 1666
1481Sends an ext event to the client. 1667Sends an ext event to the client.
1482 1668
1483=cut 1669=cut
1484 1670
1485sub ext_event($$%) { 1671sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1672 my ($self, $type, @msg) = @_;
1487 1673
1488 $self->ns->ext_event ($type, %msg); 1674 $self->ns->ext_msg ($type, @msg);
1489} 1675}
1490 1676
1491=head3 cf::region 1677=head3 cf::region
1492 1678
1493=over 4 1679=over 4
1709 1895
1710sub load_header_from($) { 1896sub load_header_from($) {
1711 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1712 1898
1713 utf8::encode $path; 1899 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1901 or return;
1902
1903 $self->_load_header ($f)
1904 or return;
1905
1906 local $MAP_LOADING{$self->{path}} = $self;
1907 $f->resolve_delayed_derefs;
1719 1908
1720 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1721 1910
1722 1 1911 1
1723} 1912}
1777sub find { 1966sub find {
1778 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1779 1968
1780 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1781 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1783 1973
1784 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path"; 1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1786 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1787 or return; 1979 or return;
1788 1980
1789 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1790 1982
1792 or return; 1984 or return;
1793 1985
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1797 $map->reset; 1991 $map->reset;
1798 undef $guard;
1799 return find $path; 1992 return find $path;
1800 } 1993 }
1801 1994
1802 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1803 } 1996 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1813 2006
1814 my $path = $self->{path}; 2007 my $path = $self->{path};
1815 2008
1816 { 2009 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1818 2011
2012 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 2014
1821 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1822 2016
1823 $self->alloc; 2017 $self->alloc;
1824 2018
1825 $self->pre_load; 2019 $self->pre_load;
1826 Coro::cede; 2020 cf::cede_to_tick;
1827 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1829 or return; 2025 or return;
1830 2026
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1833 2029
1834 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2031 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2034 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1839 } 2038 }
1840 } 2039 }
1841 2040
1842 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1843 # now do the right thing for maps 2044 # now do the right thing for maps
1844 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2047 unless $self->difficulty;
1847 Coro::cede; 2048 cf::cede_to_tick;
1848 2049
1849 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2051 $self->decay_objects;
1851 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1852 $self->update_buttons; 2053 $self->update_buttons;
1853 Coro::cede; 2054 cf::cede_to_tick;
1854 $self->set_darkness_map; 2055 $self->set_darkness_map;
1855 Coro::cede; 2056 cf::cede_to_tick;
1856 $self->activate; 2057 $self->activate;
1857 } 2058 }
2059
2060 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME);
1858 2062
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2063 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 2064 }
1861 2065
1862 $self->post_load; 2066 $self->post_load;
1873 2077
1874 $self 2078 $self
1875} 2079}
1876 2080
1877# find and load all maps in the 3x3 area around a map 2081# find and load all maps in the 3x3 area around a map
1878sub load_diag { 2082sub load_neighbours {
1879 my ($map) = @_; 2083 my ($map) = @_;
1880 2084
1881 my @diag; # diagonal neighbours 2085 my @neigh; # diagonal neighbours
1882 2086
1883 for (0 .. 3) { 2087 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2088 my $neigh = $map->tile_path ($_)
1885 or next; 2089 or next;
1886 $neigh = find $neigh, $map 2090 $neigh = find $neigh, $map
1887 or next; 2091 or next;
1888 $neigh->load; 2092 $neigh->load;
1889 2093
2094 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2097 }
1893 2098
1894 for (@diag) { 2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2101 my $neigh = find $path, $origin
1896 or next; 2102 or next;
1897 $neigh->load; 2103 $neigh->load;
1898 } 2104 }
1899} 2105}
1900 2106
1905} 2111}
1906 2112
1907sub do_load_sync { 2113sub do_load_sync {
1908 my ($map) = @_; 2114 my ($map) = @_;
1909 2115
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main;
2118
1910 cf::sync_job { $map->load }; 2119 cf::sync_job { $map->load };
1911} 2120}
1912 2121
1913our %MAP_PREFETCH; 2122our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2123our $MAP_PREFETCHER = undef;
1915 2124
1916sub find_async { 2125sub find_async {
1917 my ($path, $origin) = @_; 2126 my ($path, $origin, $load) = @_;
1918 2127
1919 $path = normalise $path, $origin && $origin->{path}; 2128 $path = normalise $path, $origin && $origin->{path};
1920 2129
1921 if (my $map = $cf::MAP{$path}) { 2130 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2132 }
1924 2133
1925 undef $MAP_PREFETCH{$path}; 2134 $MAP_PREFETCH{$path} |= $load;
2135
1926 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1927 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2141 if (my $map = find $k) {
1930 $map->load; 2142 $map->load if $v;
1931 } 2143 }
1932 2144
1933 delete $MAP_PREFETCH{$path}; 2145 delete $MAP_PREFETCH{$k};
1934 } 2146 }
1935 } 2147 }
1936 undef $MAP_PREFETCHER; 2148 undef $MAP_PREFETCHER;
1937 }; 2149 };
1938 $MAP_PREFETCHER->prio (6); 2150 $MAP_PREFETCHER->prio (6);
1941} 2153}
1942 2154
1943sub save { 2155sub save {
1944 my ($self) = @_; 2156 my ($self) = @_;
1945 2157
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2159
1948 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
1949 2161
1950 return unless $self->dirty; 2162 return unless $self->dirty;
1951 2163
1957 return if $self->{deny_save}; 2169 return if $self->{deny_save};
1958 2170
1959 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
1960 2172
1961 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
1963 }; 2176 };
1964 2177
1965 if ($uniq) { 2178 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1974 my ($self) = @_; 2187 my ($self) = @_;
1975 2188
1976 # save first because save cedes 2189 # save first because save cedes
1977 $self->save; 2190 $self->save;
1978 2191
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2193
1981 return if $self->players; 2194 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2196 return if $self->{deny_save};
1984 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2202 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2203}
1988 2204
1989sub reset_at { 2205sub reset_at {
1990 my ($self) = @_; 2206 my ($self) = @_;
1991 2207
2023 if $uniq; 2239 if $uniq;
2024 } 2240 }
2025 2241
2026 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
2027 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2246 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2247
2032 $self->unlink_save; 2248 $self->unlink_save;
2033 $self->destroy; 2249 $self->destroy;
2034} 2250}
2035 2251
2036my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
2037 2253
2038sub nuke { 2254sub nuke {
2039 my ($self) = @_; 2255 my ($self) = @_;
2040 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
2041 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
2042 2261
2043 $self->unlink_save; 2262 $self->unlink_save;
2044 2263
2045 bless $self, "cf::map"; 2264 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2269
2051 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
2052 2272
2053 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
2054} 2274}
2055 2275
2056=item $maps = cf::map::tmp_maps 2276=item $maps = cf::map::tmp_maps
2132 2352
2133sub inv_recursive { 2353sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
2135} 2355}
2136 2356
2357=item $ref = $ob->ref
2358
2359creates and returns a persistent reference to an objetc that can be stored as a string.
2360
2361=item $ob = cf::object::deref ($refstring)
2362
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block.
2365
2366=cut
2367
2368sub deref {
2369 my ($ref) = @_;
2370
2371 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2372 my ($uuid, $name) = ($1, $2);
2373 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2374 or return;
2375 $pl->ob->uuid eq $uuid
2376 or return;
2377
2378 $pl->ob
2379 } else {
2380 warn "$ref: cannot resolve object reference\n";
2381 undef
2382 }
2383}
2384
2137package cf; 2385package cf;
2138 2386
2139=back 2387=back
2140 2388
2141=head3 cf::object::player 2389=head3 cf::object::player
2163 2411
2164 } else { 2412 } else {
2165 my $pl = $self->contr; 2413 my $pl = $self->contr;
2166 2414
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2418
2176 } else { 2419 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2421 $self->message ($msg, $flags);
2179 } 2422 }
2180 } 2423 }
2424}
2425
2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2427
2428=cut
2429
2430sub cf::object::send_msg {
2431 my $pl = shift->contr
2432 or return;
2433 $pl->send_msg (@_);
2181} 2434}
2182 2435
2183=item $player_object->may ("access") 2436=item $player_object->may ("access")
2184 2437
2185Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2267 2520
2268 $map->load; 2521 $map->load;
2269 $map->load_diag; 2522 $map->load_neighbours;
2270 2523
2271 return unless $self->contr->active; 2524 return unless $self->contr->active;
2272 $self->activate_recursive; 2525 $self->activate_recursive;
2273 2526
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2548
2296 $self->enter_link; 2549 $self->enter_link;
2297 2550
2298 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2299 my $map = eval { 2573 my $map = eval {
2300 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2301 2575
2302 if ($map) { 2576 if ($map) {
2303 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2305 } else { 2579 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2581 }
2308 2582
2309 $map 2583 $map
2310 }; 2584 };
2311 2585
2364 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2365 } 2639 }
2366 2640
2367 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2368 2642
2369 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2370 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2372 2646
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2401 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2404 2678
2405 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2406 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2683 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2409 2685
2410 1; 2686 1;
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2721the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2447 2723
2448=cut 2724=cut
2449 2725
2726# non-persistent channels (usually the info channel)
2727our %CHANNEL = (
2728 "c/identify" => {
2729 id => "infobox",
2730 title => "Identify",
2731 reply => undef,
2732 tooltip => "Items recently identified",
2733 },
2734 "c/examine" => {
2735 id => "infobox",
2736 title => "Examine",
2737 reply => undef,
2738 tooltip => "Signs and other items you examined",
2739 },
2740 "c/book" => {
2741 id => "infobox",
2742 title => "Book",
2743 reply => undef,
2744 tooltip => "The contents of a note or book",
2745 },
2746 "c/lookat" => {
2747 id => "infobox",
2748 title => "Look",
2749 reply => undef,
2750 tooltip => "What you saw there",
2751 },
2752 "c/who" => {
2753 id => "infobox",
2754 title => "Players",
2755 reply => undef,
2756 tooltip => "Shows players who are currently online",
2757 },
2758 "c/body" => {
2759 id => "infobox",
2760 title => "Body Parts",
2761 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available",
2763 },
2764 "c/uptime" => {
2765 id => "infobox",
2766 title => "Uptime",
2767 reply => undef,
2768 tooltip => "How long the server has been running since last restart",
2769 },
2770 "c/mapinfo" => {
2771 id => "infobox",
2772 title => "Map Info",
2773 reply => undef,
2774 tooltip => "Information related to the maps",
2775 },
2776);
2777
2450sub cf::client::send_msg { 2778sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2780
2453 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2454 2782
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2784
2785 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel};
2788
2789 $self->ext_msg (channel_info => $channel)
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id};
2793
2457 if (ref $channel) { 2794 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2462 } 2800 }
2463 2801
2464 $channel = $channel->{id}; 2802 $channel = $channel->{id};
2465 } 2803 }
2466 2804
2467 return unless @extra || length $msg; 2805 return unless @extra || length $msg;
2468 2806
2469 if ($self->can_msg) { 2807 if ($self->can_msg) {
2808 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF;
2811
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2812 $self->send_packet ("msg " . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2814 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825
2826 $color &= cf::NDI_COLOR_MASK;
2827
2828 utf8::encode $msg;
2829
2483 if (0 && $msg =~ /\[/) { 2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2833 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2835 $self->send_packet ("drawinfo $color $msg")
2488 } 2836 }
2489 } 2837 }
2490 } 2838 }
2491} 2839}
2492 2840
2493=item $client->ext_event ($type, %msg) 2841=item $client->ext_msg ($type, @msg)
2494 2842
2495Sends an ext event to the client. 2843Sends an ext event to the client.
2496 2844
2497=cut 2845=cut
2498 2846
2499sub cf::client::ext_event($$%) { 2847sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2848 my ($self, $type, @msg) = @_;
2501 2849
2502 return unless $self->extcmd; 2850 if ($self->extcmd == 2) {
2503 2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2853 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 }
2856}
2857
2858=item $client->ext_reply ($msgid, @msg)
2859
2860Sends an ext reply to the client.
2861
2862=cut
2863
2864sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_;
2866
2867 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2506} 2874}
2507 2875
2508=item $success = $client->query ($flags, "text", \&cb) 2876=item $success = $client->query ($flags, "text", \&cb)
2509 2877
2510Queues a query to the client, calling the given callback with 2878Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 2933 my ($ns, $buf) = @_;
2566 2934
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2935 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2936
2569 if (ref $msg) { 2937 if (ref $msg) {
2938 my ($type, $reply, @payload) =
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942
2943 my @reply;
2944
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2945 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2946 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2947 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2576 } else { 2952 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2954 }
2579 2955
2580 cf::override; 2956 cf::override;
2627our $safe = new Safe "safe"; 3003our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3004our $safe_hole = new Safe::Hole;
2629 3005
2630$SIG{FPE} = 'IGNORE'; 3006$SIG{FPE} = 'IGNORE';
2631 3007
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3008$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math
3010 grepstart grepwhile mapstart mapwhile
3011 sort time
3012));
2633 3013
2634# here we export the classes and methods available to script code 3014# here we export the classes and methods available to script code
2635 3015
2636=pod 3016=pod
2637 3017
2638The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2639 3019
2640 cf::object 3020 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 3021 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 3022 insert remove name archname title slaying race decrease_ob_nr
2643 3023
2644 cf::object::player 3024 cf::object::player
2645 player 3025 player
2646 3026
2647 cf::player 3027 cf::player
2652 3032
2653=cut 3033=cut
2654 3034
2655for ( 3035for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race
2657 insert remove)], 3038 decrease_ob_nr destroy)],
2658 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2661) { 3042) {
2662 no strict 'refs'; 3043 no strict 'refs';
2738# the server's init and main functions 3119# the server's init and main functions
2739 3120
2740sub load_facedata($) { 3121sub load_facedata($) {
2741 my ($path) = @_; 3122 my ($path) = @_;
2742 3123
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129
2743 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2744 3131
2745 my $facedata; 3132 my $facedata;
2746 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3134 or die "$path: $!";
2748 3135
2749 $facedata = Coro::Storable::thaw $facedata; 3136 $facedata = Coro::Storable::thaw $facedata;
2750 3137
2751 $facedata->{version} == 2 3138 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3139 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140
3141 # patch in the exptable
3142 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC,
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3145 };
3146 cf::cede_to_tick;
2753 3147
2754 { 3148 {
2755 my $faces = $facedata->{faceinfo}; 3149 my $faces = $facedata->{faceinfo};
2756 3150
2757 while (my ($face, $info) = each %$faces) { 3151 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3152 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 3153 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3154 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3157
2764 cf::cede_to_tick; 3158 cf::cede_to_tick;
2765 } 3159 }
2766 3160
2767 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2792 3186
2793 { 3187 {
2794 # TODO: for gcfclient pleasure, we should give resources 3188 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3189 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3190 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3191
3192 my $soundconf = delete $res->{"res/sound.conf"};
2798 3193
2799 while (my ($name, $info) = each %$res) { 3194 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3195 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
2807 3197
2808 if ($name =~ /\.jpg$/) { 3198 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3199 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3200
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3207 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3208 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3209 }
2818 3210
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
2819 cf::cede_to_tick; 3214 cf::cede_to_tick;
2820 } 3215 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
2821 } 3234 }
2822 3235
2823 1 3236 1
2824} 3237}
2825 3238
3239register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_;
3241
3242 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v);
3244 }
3245};
3246
2826sub reload_regions { 3247sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
2827 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3253 or die "unable to load regions file\n";
2829 3254
2830 for (cf::region::list) { 3255 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3256 $_->{match} = qr/$_->{match}/
2867 3292
2868sub init { 3293sub init {
2869 reload_resources; 3294 reload_resources;
2870} 3295}
2871 3296
2872sub cfg_load { 3297sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3299 or return;
2875 3300
2876 local $/; 3301 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
2893sub main { 3318sub main {
2894 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3322 (async {
2898 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
2900 }; 3326 };
2901 3327
2902 cfg_load; 3328 reload_config;
2903 db_init; 3329 db_init;
2904 load_extensions; 3330 load_extensions;
2905 3331
2906 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2907 Event::loop; 3334 EV::loop;
2908} 3335}
2909 3336
2910############################################################################# 3337#############################################################################
2911# initialisation and cleanup 3338# initialisation and cleanup
2912 3339
2913# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
2914BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
2923 },
2924 ); 3346 };
2925 } 3347 }
2926} 3348}
2927 3349
2928sub write_runtime { 3350sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
2974 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
2976 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3402 $pl->save;
2980 } 3403 }
2981 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
2982 3405
2983 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
3022 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3447
3025 # if anything goes wrong in here, we should simply crash as we already saved 3448 # if anything goes wrong in here, we should simply crash as we already saved
3026 3449
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031
3032 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3033 for (;;) { 3451 for (;;) {
3034 BDB::flush; 3452 BDB::flush;
3035 IO::AIO::flush; 3453 IO::AIO::flush;
3036 Coro::cede; 3454 Coro::cede_notself;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3038 warn "iterate..."; 3456 warn "iterate...";
3039 } 3457 }
3040 3458
3041 ++$RELOAD; 3459 ++$RELOAD;
3100 warn "reloading cf.pm"; 3518 warn "reloading cf.pm";
3101 require cf; 3519 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3521
3104 warn "loading config and database again"; 3522 warn "loading config and database again";
3105 cf::cfg_load; 3523 cf::reload_config;
3106 3524
3107 warn "loading extensions"; 3525 warn "loading extensions";
3108 cf::load_extensions; 3526 cf::load_extensions;
3109 3527
3110 warn "reattaching attachments to objects/players"; 3528 warn "reattaching attachments to objects/players";
3130 3548
3131sub reload_perl() { 3549sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3134 3552
3135 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3136 reentrant => 0,
3137 after => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => sub {
3140 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3142 }, 3555 do_reload_perl;
3143 ); 3556 };
3144} 3557}
3145 3558
3146register_command "reload" => sub { 3559register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3148 3561
3149 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3566 reload_perl;
3567 };
3152 } 3568 }
3153}; 3569};
3154 3570
3155unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
3156 3572
3175 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3593 $signal->wait;
3178} 3594}
3179 3595
3180 my $min = 1e6;#d# 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3191 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3192 return; 3600 return;
3193 } 3601 }
3194 3602
3195 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3196 3604
3197 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3198 3606
3199 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
3200 for(1..10) { 3608 $NEXT_TICK += $TICK;
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204 3609
3205 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3206 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3207 $map->alloc; 3612 Coro::async_pool {
3208 $map->_load_objects ("/tmp/x.map", 1); 3613 $Coro::current->{desc} = "runtime saver";
3209 my $t = Event::time - $t; 3614 write_runtime
3210 3615 or warn "ERROR: unable to write runtime file: $!";
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3616 };
3617 }
3221 3618
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3620 $sig->send;
3238 } 3621 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3623 $sig->send;
3241 } 3624 }
3242 3625
3243 $NOW = Event::time;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3628
3254 _post_tick; 3629 _post_tick;
3255 3630};
3256 3631$TICK_WATCHER->priority (EV::MAXPRI);
3257 },
3258);
3259 3632
3260{ 3633{
3634 BDB::min_parallel 8;
3261 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3262 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8;
3271 3637
3272 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3273 my $status; 3639 my $status;
3274 my $current = $Coro::current; 3640 my $current = $Coro::current;
3275 ( 3641 (
3284 ) 3650 )
3285 }; 3651 };
3286 3652
3287 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3659
3290 cf::sync_job { 3660 cf::sync_job {
3291 eval { 3661 eval {
3292 BDB::db_env_open 3662 BDB::db_env_open
3293 $DB_ENV, 3663 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3667 0666;
3298 3668
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3670 };
3304 3671
3305 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3673 };
3307 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3308} 3685}
3309 3686
3310{ 3687{
3311 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3312 3689
3313 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3693}
3324 3694
3325my $_log_backtrace; 3695my $_log_backtrace;
3326 3696
3327sub _log_backtrace { 3697sub _log_backtrace {
3331 3701
3332 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3704 ++$_log_backtrace;
3335 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3336 my @bt = fork_call { 3708 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines