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.315 by root, Mon Jul 23 17:53:55 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
327=item cf::get_slot $time[, $priority[, $name]] 354=item cf::get_slot $time[, $priority[, $name]]
328 355
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 356Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 357This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 358of cpu time till the next tick. The slot is only valid till the next cede.
340our @SLOT_QUEUE; 367our @SLOT_QUEUE;
341our $SLOT_QUEUE; 368our $SLOT_QUEUE;
342 369
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 370$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 371$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager");
373
345 my $signal = new Coro::Signal; 374 my $signal = new Coro::Signal;
346 375
347 while () { 376 while () {
348 next_job: 377 next_job:
349 my $avail = cf::till_tick; 378 my $avail = cf::till_tick;
357 } 386 }
358 } 387 }
359 } 388 }
360 389
361 if (@SLOT_QUEUE) { 390 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 391 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 392 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 393 $signal->wait;
365 } else { 394 } else {
366 Coro::schedule; 395 Coro::schedule;
367 } 396 }
390 419
391BEGIN { *async = \&Coro::async_pool } 420BEGIN { *async = \&Coro::async_pool }
392 421
393=item cf::sync_job { BLOCK } 422=item cf::sync_job { BLOCK }
394 423
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 424The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 425is always able to handle events or runnable, as Deliantra is only
397partly 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
398acceptable. 427acceptable.
399 428
400If 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
401the given BLOCK in another coroutine while waiting for the result. The 430the given BLOCK in another coroutine while waiting for the result. The
406 435
407sub sync_job(&) { 436sub sync_job(&) {
408 my ($job) = @_; 437 my ($job) = @_;
409 438
410 if ($Coro::current == $Coro::main) { 439 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 440 my $time = EV::time;
412 441
413 # this is the main coro, too bad, we have to block 442 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 443 # till the operation succeeds, freezing the server :/
415 444
445 LOG llevError, Carp::longmess "sync job";#d#
446
416 # TODO: use suspend/resume instead 447 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 448 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 449 my $freeze_guard = freeze_mainloop;
419 450
420 my $busy = 1; 451 my $busy = 1;
421 my @res; 452 my @res;
422 453
423 (async { 454 (async {
455 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 456 @res = eval { $job->() };
425 warn $@ if $@; 457 warn $@ if $@;
426 undef $busy; 458 undef $busy;
427 })->prio (Coro::PRIO_MAX); 459 })->prio (Coro::PRIO_MAX);
428 460
429 while ($busy) { 461 while ($busy) {
430 Coro::cede or Event::one_event; 462 if (Coro::nready) {
463 Coro::cede_notself;
464 } else {
465 EV::loop EV::LOOP_ONESHOT;
431 } 466 }
467 }
432 468
433 $time = Event::time - $time; 469 $time = EV::time - $time;
434 470
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 473
438 $tick_start += $time; # do not account sync jobs to server load 474 $tick_start += $time; # do not account sync jobs to server load
468=item fork_call { }, $args 504=item fork_call { }, $args
469 505
470Executes the given code block with the given arguments in a seperate 506Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 507process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 508Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 509never block itself or use any form of event handling.
474 510
475=cut 511=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 512
486sub fork_call(&@) { 513sub fork_call(&@) {
487 my ($cb, @args) = @_; 514 my ($cb, @args) = @_;
488 515
489# 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,
490# or die "socketpair: $!"; 517 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 518 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 519
494 if (my $pid = fork) { 520 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 521 reset_signals;
508 local $SIG{__WARN__}; 522 &$cb
509 local $SIG{__DIE__}; 523 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 524
516 eval { 525 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 526}
529 527
530=item $value = cf::db_get $family => $key 528=item $value = cf::db_get $family => $key
531 529
532Returns a single value from the environment database. 530Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 532=item cf::db_put $family => $key => $value
535 533
536Stores 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
537data 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).
538 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
539=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}
540 560
541our $DB; 561our $DB;
542 562
543sub db_init { 563sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 564 cf::sync_job {
548 eval { 565 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 566 };
558} 567}
559 568
560sub db_get($$) { 569sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 570 my $key = "$_[0]/$_[1]";
562 571
612 if (1) { 621 if (1) {
613 $md5 = 622 $md5 =
614 join "\x00", 623 join "\x00",
615 $processversion, 624 $processversion,
616 map { 625 map {
617 Coro::cede; 626 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 627 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 628 } 0.. $#$src;
620 629
621 630
622 my $dbmd5 = db_get cache => "$id/md5"; 631 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 675attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 676to it. All such attachable objects support the following methods.
668 677
669In 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>
670C<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
671Crossfire TRT). 680Deliantra).
672 681
673=over 4 682=over 4
674 683
675=item $attachable->attach ($attachment, key => $value...) 684=item $attachable->attach ($attachment, key => $value...)
676 685
974 983
975=cut 984=cut
976 985
977############################################################################# 986#############################################################################
978# object support 987# object support
979#
980 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#
981sub _can_merge { 1022sub _can_merge {
982 my ($ob1, $ob2) = @_; 1023 my ($ob1, $ob2) = @_;
983 1024
984 local $Storable::canonical = 1; 1025 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1026
988 $fob1 eq $fob2 1027 # we do the slow way here
1028 return _object_equal $ob1, $ob2
989} 1029}
990 1030
991sub reattach { 1031sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1032 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1033 my ($obj) = @_;
1015cf::attachable->attach ( 1055cf::attachable->attach (
1016 prio => -1000000, 1056 prio => -1000000,
1017 on_instantiate => sub { 1057 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1058 my ($obj, $data) = @_;
1019 1059
1020 $data = from_json $data; 1060 $data = decode_json $data;
1021 1061
1022 for (@$data) { 1062 for (@$data) {
1023 my ($name, $args) = @$_; 1063 my ($name, $args) = @$_;
1024 1064
1025 $obj->attach ($name, %{$args || {} }); 1065 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1081sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1082 my ($filename, $rdata, $objs) = @_;
1043 1083
1044 sync_job { 1084 sync_job {
1045 if (length $$rdata) { 1085 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1087 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1088 $decname, length $$rdata, scalar @$objs;
1048 1089
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1091 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1093 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1094 close $fh;
1054 1095
1055 if (@$objs) { 1096 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1098 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1100 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1101 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1102 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1103 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1104 }
1071 } 1112 }
1072 } else { 1113 } else {
1073 aio_unlink $filename; 1114 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1115 aio_unlink "$filename.pst";
1075 } 1116 }
1076 } 1117 };
1077} 1118}
1078 1119
1079sub object_freezer_as_string { 1120sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1121 my ($rdata, $objs) = @_;
1081 1122
1093 or return; 1134 or return;
1094 1135
1095 unless (aio_stat "$filename.pst") { 1136 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1137 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1138 or return;
1139
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1140 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs};
1099 } 1142 }
1100 1143
1144 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1145 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1146 $decname, length $data, scalar @{$av || []};
1147
1103 return ($data, $av); 1148 ($data, $av)
1104} 1149}
1105 1150
1106=head2 COMMAND CALLBACKS 1151=head2 COMMAND CALLBACKS
1107 1152
1108=over 4 1153=over 4
1181 my ($pl, $buf) = @_; 1226 my ($pl, $buf) = @_;
1182 1227
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1229
1185 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
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1238 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1239 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1240 }
1241
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
1191 } else { 1245 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1247 }
1194 1248
1195 cf::override; 1249 cf::override;
1285 1339
1286=head3 cf::player 1340=head3 cf::player
1287 1341
1288=over 4 1342=over 4
1289 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
1290=item cf::player::find $login 1358=item cf::player::find $login
1291 1359
1292Returns the given player object, loading it if necessary (might block). 1360Returns the given player object, loading it if necessary (might block).
1293 1361
1294=cut 1362=cut
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1397 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1398 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1399 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1400 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1401
1334 my $pl = load_pl path $login 1402 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1409 $cf::PLAYER{$login} = $pl
1337 } 1410 }
1338 } 1411 }
1339} 1412}
1340 1413
1350 1423
1351 aio_mkdir playerdir $pl, 0770; 1424 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1425 $pl->{last_save} = $cf::RUNTIME;
1353 1426
1354 $pl->save_pl ($path); 1427 $pl->save_pl ($path);
1355 Coro::cede; 1428 cf::cede_to_tick;
1356} 1429}
1357 1430
1358sub new($) { 1431sub new($) {
1359 my ($login) = @_; 1432 my ($login) = @_;
1360 1433
1364 $self->{deny_save} = 1; 1437 $self->{deny_save} = 1;
1365 1438
1366 $cf::PLAYER{$login} = $self; 1439 $cf::PLAYER{$login} = $self;
1367 1440
1368 $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 (@_);
1369} 1452}
1370 1453
1371=item $pl->quit_character 1454=item $pl->quit_character
1372 1455
1373Nukes the player without looking back. If logged in, the connection will 1456Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1511 or return [];
1429 1512
1430 my @logins; 1513 my @logins;
1431 1514
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1521 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1522 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 }
1436 1524
1437 utf8::decode $login; 1525 utf8::decode $login;
1438 push @logins, $login; 1526 push @logins, $login;
1439 } 1527 }
1440 1528
1473 1561
1474Expand crossfire pod fragments into protocol xml. 1562Expand crossfire pod fragments into protocol xml.
1475 1563
1476=cut 1564=cut
1477 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
1478sub expand_cfpod { 1577sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1578 my ($self, $pod) = @_;
1480 1579
1481 # escape & and < 1580 my $xml;
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484 1581
1485 # this is buggy, it needs to properly take care of nested <'s 1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1486 1585
1487 1 while 1586 $group =~ s/&/&amp;/g;
1488 # replace B<>, I<>, U<> etc. 1587 $group =~ s/</&lt;/g;
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1588
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1589 $xml .= $group;
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1590 } elsif ($pod =~ m%\G
1492 # replace G<male|female> tags 1591 ([BCGHITU])
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1592 <
1494 $self->gender ? $2 : $1 1593 (?:
1495 }ge 1594 ([^<>]*) (?{ $group = $^N })
1496 # replace H<hint text> 1595 | < $interior >
1497 || s{H<([^\>]*)>} 1596 )
1597 >
1598 %gcsx
1498 { 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") {
1499 ("<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>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "") 1619 "")
1502 [$self->{hintmode}] 1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1503 }ge; 1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1504 1631
1632 for ($xml) {
1505 # create single paragraphs (very hackish) 1633 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g; 1634 s/(?<=\S)\n(?=\w)/ /g;
1507 1635
1508 # compress some whitespace 1636 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends 1637 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines 1638 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines 1639 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines 1640 s/\n+$//; # ending lines
1641 }
1513 1642
1514 $_ 1643 $xml
1515} 1644}
1645
1646no re 'eval';
1516 1647
1517sub hintmode { 1648sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1650 $_[0]{hintmode}
1520} 1651}
1521 1652
1522=item $player->ext_reply ($msgid, %msg) 1653=item $player->ext_reply ($msgid, @msg)
1523 1654
1524Sends an ext reply to the player. 1655Sends an ext reply to the player.
1525 1656
1526=cut 1657=cut
1527 1658
1528sub ext_reply($$%) { 1659sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1660 my ($self, $id, @msg) = @_;
1530 1661
1531 $msg{msgid} = $id; 1662 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1663}
1534 1664
1535=item $player->ext_event ($type, %msg) 1665=item $player->ext_msg ($type, @msg)
1536 1666
1537Sends an ext event to the client. 1667Sends an ext event to the client.
1538 1668
1539=cut 1669=cut
1540 1670
1541sub ext_event($$%) { 1671sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1672 my ($self, $type, @msg) = @_;
1543 1673
1544 $self->ns->ext_event ($type, %msg); 1674 $self->ns->ext_msg ($type, @msg);
1545} 1675}
1546 1676
1547=head3 cf::region 1677=head3 cf::region
1548 1678
1549=over 4 1679=over 4
1765 1895
1766sub load_header_from($) { 1896sub load_header_from($) {
1767 my ($self, $path) = @_; 1897 my ($self, $path) = @_;
1768 1898
1769 utf8::encode $path; 1899 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1900 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 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;
1775 1908
1776 $self->{load_path} = $path; 1909 $self->{load_path} = $path;
1777 1910
1778 1 1911 1
1779} 1912}
1833sub find { 1966sub find {
1834 my ($path, $origin) = @_; 1967 my ($path, $origin) = @_;
1835 1968
1836 $path = normalise $path, $origin && $origin->path; 1969 $path = normalise $path, $origin && $origin->path;
1837 1970
1971 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1972 cf::lock_wait "map_find:$path";
1839 1973
1840 $cf::MAP{$path} || do { 1974 $cf::MAP{$path} || do {
1841 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
1842 my $map = new_from_path cf::map $path 1978 my $map = new_from_path cf::map $path
1843 or return; 1979 or return;
1844 1980
1845 $map->{last_save} = $cf::RUNTIME; 1981 $map->{last_save} = $cf::RUNTIME;
1846 1982
1848 or return; 1984 or return;
1849 1985
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1987 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1988 #$cf::WAIT_FOR_TICK->wait;
1989 undef $guard1;
1990 undef $guard2;
1853 $map->reset; 1991 $map->reset;
1854 undef $guard;
1855 return find $path; 1992 return find $path;
1856 } 1993 }
1857 1994
1858 $cf::MAP{$path} = $map 1995 $cf::MAP{$path} = $map
1859 } 1996 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 2005 local $self->{deny_reset} = 1; # loading can take a long time
1869 2006
1870 my $path = $self->{path}; 2007 my $path = $self->{path};
1871 2008
1872 { 2009 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2010 my $guard = cf::lock_acquire "map_data:$path";
1874 2011
2012 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2013 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2014
1877 $self->in_memory (cf::MAP_LOADING); 2015 $self->in_memory (cf::MAP_LOADING);
1878 2016
1879 $self->alloc; 2017 $self->alloc;
1880 2018
1881 $self->pre_load; 2019 $self->pre_load;
1882 Coro::cede; 2020 cf::cede_to_tick;
1883 2021
2022 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2024 $self->_load_objects ($f)
1885 or return; 2025 or return;
1886 2026
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 2028 if delete $self->{load_original};
1889 2029
1890 if (my $uniq = $self->uniq_path) { 2030 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2031 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2032 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2034 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2035 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs;
2037 }
1895 } 2038 }
1896 } 2039 }
1897 2040
1898 Coro::cede; 2041 $f->resolve_delayed_derefs;
2042
2043 cf::cede_to_tick;
1899 # now do the right thing for maps 2044 # now do the right thing for maps
1900 $self->link_multipart_objects; 2045 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2046 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2047 unless $self->difficulty;
1903 Coro::cede; 2048 cf::cede_to_tick;
1904 2049
1905 unless ($self->{deny_activate}) { 2050 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2051 $self->decay_objects;
1907 $self->fix_auto_apply; 2052 $self->fix_auto_apply;
1908 $self->update_buttons; 2053 $self->update_buttons;
1909 Coro::cede; 2054 cf::cede_to_tick;
1910 $self->set_darkness_map; 2055 $self->set_darkness_map;
1911 Coro::cede; 2056 cf::cede_to_tick;
1912 $self->activate; 2057 $self->activate;
1913 } 2058 }
2059
2060 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME);
1914 2062
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2063 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 2064 }
1917 2065
1918 $self->post_load; 2066 $self->post_load;
1929 2077
1930 $self 2078 $self
1931} 2079}
1932 2080
1933# 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
1934sub load_diag { 2082sub load_neighbours {
1935 my ($map) = @_; 2083 my ($map) = @_;
1936 2084
1937 my @diag; # diagonal neighbours 2085 my @neigh; # diagonal neighbours
1938 2086
1939 for (0 .. 3) { 2087 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2088 my $neigh = $map->tile_path ($_)
1941 or next; 2089 or next;
1942 $neigh = find $neigh, $map 2090 $neigh = find $neigh, $map
1943 or next; 2091 or next;
1944 $neigh->load; 2092 $neigh->load;
1945 2093
2094 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2097 }
1949 2098
1950 for (@diag) { 2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2101 my $neigh = find $path, $origin
1952 or next; 2102 or next;
1953 $neigh->load; 2103 $neigh->load;
1954 } 2104 }
1955} 2105}
1956 2106
1961} 2111}
1962 2112
1963sub do_load_sync { 2113sub do_load_sync {
1964 my ($map) = @_; 2114 my ($map) = @_;
1965 2115
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main;
2118
1966 cf::sync_job { $map->load }; 2119 cf::sync_job { $map->load };
1967} 2120}
1968 2121
1969our %MAP_PREFETCH; 2122our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2123our $MAP_PREFETCHER = undef;
1971 2124
1972sub find_async { 2125sub find_async {
1973 my ($path, $origin) = @_; 2126 my ($path, $origin, $load) = @_;
1974 2127
1975 $path = normalise $path, $origin && $origin->{path}; 2128 $path = normalise $path, $origin && $origin->{path};
1976 2129
1977 if (my $map = $cf::MAP{$path}) { 2130 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2132 }
1980 2133
1981 undef $MAP_PREFETCH{$path}; 2134 $MAP_PREFETCH{$path} |= $load;
2135
1982 $MAP_PREFETCHER ||= cf::async { 2136 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher";
2138
1983 while (%MAP_PREFETCH) { 2139 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2140 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2141 if (my $map = find $k) {
1986 $map->load; 2142 $map->load if $v;
1987 } 2143 }
1988 2144
1989 delete $MAP_PREFETCH{$path}; 2145 delete $MAP_PREFETCH{$k};
1990 } 2146 }
1991 } 2147 }
1992 undef $MAP_PREFETCHER; 2148 undef $MAP_PREFETCHER;
1993 }; 2149 };
1994 $MAP_PREFETCHER->prio (6); 2150 $MAP_PREFETCHER->prio (6);
1997} 2153}
1998 2154
1999sub save { 2155sub save {
2000 my ($self) = @_; 2156 my ($self) = @_;
2001 2157
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2159
2004 $self->{last_save} = $cf::RUNTIME; 2160 $self->{last_save} = $cf::RUNTIME;
2005 2161
2006 return unless $self->dirty; 2162 return unless $self->dirty;
2007 2163
2013 return if $self->{deny_save}; 2169 return if $self->{deny_save};
2014 2170
2015 local $self->{last_access} = $self->last_access;#d# 2171 local $self->{last_access} = $self->last_access;#d#
2016 2172
2017 cf::async { 2173 cf::async {
2174 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2175 $_->contr->save for $self->players;
2019 }; 2176 };
2020 2177
2021 if ($uniq) { 2178 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2187 my ($self) = @_;
2031 2188
2032 # save first because save cedes 2189 # save first because save cedes
2033 $self->save; 2190 $self->save;
2034 2191
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2192 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2193
2037 return if $self->players; 2194 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2195 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2196 return if $self->{deny_save};
2040 2197
2198 $self->in_memory (cf::MAP_SWAPPED);
2199
2200 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2202 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2203}
2044 2204
2045sub reset_at { 2205sub reset_at {
2046 my ($self) = @_; 2206 my ($self) = @_;
2047 2207
2079 if $uniq; 2239 if $uniq;
2080 } 2240 }
2081 2241
2082 delete $cf::MAP{$self->path}; 2242 delete $cf::MAP{$self->path};
2083 2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2246 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2247
2088 $self->unlink_save; 2248 $self->unlink_save;
2089 $self->destroy; 2249 $self->destroy;
2090} 2250}
2091 2251
2092my $nuke_counter = "aaaa"; 2252my $nuke_counter = "aaaa";
2093 2253
2094sub nuke { 2254sub nuke {
2095 my ($self) = @_; 2255 my ($self) = @_;
2096 2256
2257 {
2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259
2097 delete $cf::MAP{$self->path}; 2260 delete $cf::MAP{$self->path};
2098 2261
2099 $self->unlink_save; 2262 $self->unlink_save;
2100 2263
2101 bless $self, "cf::map"; 2264 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2265 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2266 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2267 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2269
2107 $cf::MAP{$self->path} = $self; 2270 $cf::MAP{$self->path} = $self;
2271 }
2108 2272
2109 $self->reset; # polite request, might not happen 2273 $self->reset; # polite request, might not happen
2110} 2274}
2111 2275
2112=item $maps = cf::map::tmp_maps 2276=item $maps = cf::map::tmp_maps
2188 2352
2189sub inv_recursive { 2353sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2354 inv_recursive_ inv $_[0]
2191} 2355}
2192 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
2193package cf; 2385package cf;
2194 2386
2195=back 2387=back
2196 2388
2197=head3 cf::object::player 2389=head3 cf::object::player
2219 2411
2220 } else { 2412 } else {
2221 my $pl = $self->contr; 2413 my $pl = $self->contr;
2222 2414
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2418
2232 } else { 2419 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2421 $self->message ($msg, $flags);
2235 } 2422 }
2236 } 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 (@_);
2237} 2434}
2238 2435
2239=item $player_object->may ("access") 2436=item $player_object->may ("access")
2240 2437
2241Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2323 2520
2324 $map->load; 2521 $map->load;
2325 $map->load_diag; 2522 $map->load_neighbours;
2326 2523
2327 return unless $self->contr->active; 2524 return unless $self->contr->active;
2328 $self->activate_recursive; 2525 $self->activate_recursive;
2329 2526
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2548
2352 $self->enter_link; 2549 $self->enter_link;
2353 2550
2354 (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
2355 my $map = eval { 2573 my $map = eval {
2356 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2357 2575
2358 if ($map) { 2576 if ($map) {
2359 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2361 } else { 2579 } else {
2362 $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);
2363 } 2581 }
2364 2582
2365 $map 2583 $map
2366 }; 2584 };
2367 2585
2420 $rmp->{origin_y} = $exit->y; 2638 $rmp->{origin_y} = $exit->y;
2421 } 2639 }
2422 2640
2423 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2424 2642
2425 my $data = cf::to_json $rmp; 2643 my $data = cf::encode_json $rmp;
2426 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2428 2646
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2457 # if exit is damned, update players death & WoR home-position 2675 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2676 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2677 if $exit->flag (FLAG_DAMNED);
2460 2678
2461 (async { 2679 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2681
2462 $self->deactivate_recursive; # just to be sure 2682 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2683 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2684 $self->goto ($slaying, $hp, $sp);
2465 2685
2466 1; 2686 1;
2501the 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
2502the message unless the client supports the msg packet. 2722the message unless the client supports the msg packet.
2503 2723
2504=cut 2724=cut
2505 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
2506sub cf::client::send_msg { 2778sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2779 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2780
2509 $msg = $self->pl->expand_cfpod ($msg); 2781 $msg = $self->pl->expand_cfpod ($msg);
2510 2782
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2783 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 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
2513 if (ref $channel) { 2794 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2795 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2796 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2797 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2518 } 2800 }
2519 2801
2520 $channel = $channel->{id}; 2802 $channel = $channel->{id};
2521 } 2803 }
2522 2804
2523 return unless @extra || length $msg; 2805 return unless @extra || length $msg;
2524 2806
2525 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
2526 $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]));
2527 } else { 2814 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 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
2539 if (0 && $msg =~ /\[/) { 2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2833 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2835 $self->send_packet ("drawinfo $color $msg")
2544 } 2836 }
2545 } 2837 }
2546 } 2838 }
2547} 2839}
2548 2840
2549=item $client->ext_event ($type, %msg) 2841=item $client->ext_msg ($type, @msg)
2550 2842
2551Sends an ext event to the client. 2843Sends an ext event to the client.
2552 2844
2553=cut 2845=cut
2554 2846
2555sub cf::client::ext_event($$%) { 2847sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2848 my ($self, $type, @msg) = @_;
2557 2849
2558 return unless $self->extcmd; 2850 if ($self->extcmd == 2) {
2559 2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2853 push @msg, msgtype => "event_$type";
2561 $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 }
2562} 2874}
2563 2875
2564=item $success = $client->query ($flags, "text", \&cb) 2876=item $success = $client->query ($flags, "text", \&cb)
2565 2877
2566Queues a query to the client, calling the given callback with 2878Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2933 my ($ns, $buf) = @_;
2622 2934
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2935 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2936
2625 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
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2945 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2946 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2947 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2632 } else { 2952 } else {
2633 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";
2634 } 2954 }
2635 2955
2636 cf::override; 2956 cf::override;
2683our $safe = new Safe "safe"; 3003our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3004our $safe_hole = new Safe::Hole;
2685 3005
2686$SIG{FPE} = 'IGNORE'; 3006$SIG{FPE} = 'IGNORE';
2687 3007
2688$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));
2689 3013
2690# here we export the classes and methods available to script code 3014# here we export the classes and methods available to script code
2691 3015
2692=pod 3016=pod
2693 3017
2694The following functions and methods are available within a safe environment: 3018The following functions and methods are available within a safe environment:
2695 3019
2696 cf::object 3020 cf::object
2697 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
2698 insert remove 3022 insert remove name archname title slaying race decrease_ob_nr
2699 3023
2700 cf::object::player 3024 cf::object::player
2701 player 3025 player
2702 3026
2703 cf::player 3027 cf::player
2708 3032
2709=cut 3033=cut
2710 3034
2711for ( 3035for (
2712 ["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
2713 insert remove)], 3038 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 3039 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3040 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 3041 ["cf::map" => qw(trigger)],
2717) { 3042) {
2718 no strict 'refs'; 3043 no strict 'refs';
2794# the server's init and main functions 3119# the server's init and main functions
2795 3120
2796sub load_facedata($) { 3121sub load_facedata($) {
2797 my ($path) = @_; 3122 my ($path) = @_;
2798 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
2799 warn "loading facedata from $path\n"; 3130 warn "loading facedata from $path\n";
2800 3131
2801 my $facedata; 3132 my $facedata;
2802 0 < aio_load $path, $facedata 3133 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3134 or die "$path: $!";
2804 3135
2805 $facedata = Coro::Storable::thaw $facedata; 3136 $facedata = Coro::Storable::thaw $facedata;
2806 3137
2807 $facedata->{version} == 2 3138 $facedata->{version} == 2
2808 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;
2809 3147
2810 { 3148 {
2811 my $faces = $facedata->{faceinfo}; 3149 my $faces = $facedata->{faceinfo};
2812 3150
2813 while (my ($face, $info) = each %$faces) { 3151 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3152 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 3153 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3154 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3157
2820 cf::cede_to_tick; 3158 cf::cede_to_tick;
2821 } 3159 }
2822 3160
2823 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2848 3186
2849 { 3187 {
2850 # TODO: for gcfclient pleasure, we should give resources 3188 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3189 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3190 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 3191
3192 my $soundconf = delete $res->{"res/sound.conf"};
2854 3193
2855 while (my ($name, $info) = each %$res) { 3194 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3195 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
2863 3197
2864 if ($name =~ /\.jpg$/) { 3198 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3199 # prepend meta info
2866 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};
2867 } else { 3207 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3208 $data = $info->{data};
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3209 }
2874 3210
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
2875 cf::cede_to_tick; 3214 cf::cede_to_tick;
2876 } 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 }
2877 } 3234 }
2878 3235
2879 1 3236 1
2880} 3237}
2881 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
2882sub 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
2883 load_resource_file "$MAPDIR/regions" 3252 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3253 or die "unable to load regions file\n";
2885 3254
2886 for (cf::region::list) { 3255 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3256 $_->{match} = qr/$_->{match}/
2923 3292
2924sub init { 3293sub init {
2925 reload_resources; 3294 reload_resources;
2926} 3295}
2927 3296
2928sub cfg_load { 3297sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3298 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3299 or return;
2931 3300
2932 local $/; 3301 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3302 *CFG = YAML::Syck::Load <$fh>;
2949sub main { 3318sub main {
2950 # we must not ever block the main coroutine 3319 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3320 local $Coro::idle = sub {
2952 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#
2953 (async { 3322 (async {
2954 Event::one_event; 3323 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3325 })->prio (Coro::PRIO_MAX);
2956 }; 3326 };
2957 3327
2958 cfg_load; 3328 reload_config;
2959 db_init; 3329 db_init;
2960 load_extensions; 3330 load_extensions;
2961 3331
2962 $TICK_WATCHER->start; 3332 $TICK_WATCHER->start;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2963 Event::loop; 3334 EV::loop;
2964} 3335}
2965 3336
2966############################################################################# 3337#############################################################################
2967# initialisation and cleanup 3338# initialisation and cleanup
2968 3339
2969# install some emergency cleanup handlers 3340# install some emergency cleanup handlers
2970BEGIN { 3341BEGIN {
3342 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3343 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3344 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3345 cf::cleanup "SIG$signal";
2979 },
2980 ); 3346 };
2981 } 3347 }
2982} 3348}
2983 3349
2984sub write_runtime { 3350sub write_runtime {
2985 my $runtime = "$LOCALDIR/runtime"; 3351 my $runtime = "$LOCALDIR/runtime";
3030 # and maps saved/destroyed asynchronously. 3396 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3397 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3398 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3399 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3400 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3402 $pl->save;
3036 } 3403 }
3037 warn "end emergency player save\n"; 3404 warn "end emergency player save\n";
3038 3405
3039 warn "begin emergency map save\n"; 3406 warn "begin emergency map save\n";
3078 warn "syncing database to disk"; 3445 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3446 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3447
3081 # 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
3082 3449
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3450 warn "flushing outstanding aio requests";
3089 for (;;) { 3451 for (;;) {
3090 BDB::flush; 3452 BDB::flush;
3091 IO::AIO::flush; 3453 IO::AIO::flush;
3092 Coro::cede; 3454 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3455 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3456 warn "iterate...";
3095 } 3457 }
3096 3458
3097 ++$RELOAD; 3459 ++$RELOAD;
3156 warn "reloading cf.pm"; 3518 warn "reloading cf.pm";
3157 require cf; 3519 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3521
3160 warn "loading config and database again"; 3522 warn "loading config and database again";
3161 cf::cfg_load; 3523 cf::reload_config;
3162 3524
3163 warn "loading extensions"; 3525 warn "loading extensions";
3164 cf::load_extensions; 3526 cf::load_extensions;
3165 3527
3166 warn "reattaching attachments to objects/players"; 3528 warn "reattaching attachments to objects/players";
3186 3548
3187sub reload_perl() { 3549sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3550 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3551 # coro crashes during coro_state_free->destroy here.
3190 3552
3191 $RELOAD_WATCHER ||= Event->timer ( 3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3192 reentrant => 0,
3193 after => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => sub {
3196 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3554 undef $RELOAD_WATCHER;
3198 }, 3555 do_reload_perl;
3199 ); 3556 };
3200} 3557}
3201 3558
3202register_command "reload" => sub { 3559register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3560 my ($who, $arg) = @_;
3204 3561
3205 if ($who->flag (FLAG_WIZ)) { 3562 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3563 $who->message ("reloading server.");
3564 async {
3565 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3566 reload_perl;
3567 };
3208 } 3568 }
3209}; 3569};
3210 3570
3211unshift @INC, $LIBDIR; 3571unshift @INC, $LIBDIR;
3212 3572
3231 my $signal = new Coro::Signal; 3591 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3592 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3593 $signal->wait;
3234} 3594}
3235 3595
3236 my $min = 1e6;#d# 3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3597 if ($Coro::current != $Coro::main) {
3246 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"
3247 unless ++$bug_warning > 10; 3599 unless ++$bug_warning > 10;
3248 return; 3600 return;
3249 } 3601 }
3250 3602
3251 $NOW = $tick_start = Event::time; 3603 $NOW = $tick_start = EV::now;
3252 3604
3253 cf::server_tick; # one server iteration 3605 cf::server_tick; # one server iteration
3254 3606
3255 0 && sync_job {#d# 3607 $RUNTIME += $TICK;
3256 for(1..10) { 3608 $NEXT_TICK += $TICK;
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260 3609
3261 $map->width (50); 3610 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3262 $map->height (50); 3611 $NEXT_RUNTIME_WRITE = $NOW + 10;
3263 $map->alloc; 3612 Coro::async_pool {
3264 $map->_load_objects ("/tmp/x.map", 1); 3613 $Coro::current->{desc} = "runtime saver";
3265 my $t = Event::time - $t; 3614 write_runtime
3266 3615 or warn "ERROR: unable to write runtime file: $!";
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3616 };
3617 }
3277 3618
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3620 $sig->send;
3294 } 3621 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3622 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3623 $sig->send;
3297 } 3624 }
3298 3625
3299 $NOW = Event::time;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK; 3626 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3628
3310 _post_tick; 3629 _post_tick;
3311 3630};
3312 3631$TICK_WATCHER->priority (EV::MAXPRI);
3313 },
3314);
3315 3632
3316{ 3633{
3634 BDB::min_parallel 8;
3317 BDB::max_poll_time $TICK * 0.1; 3635 BDB::max_poll_time $TICK * 0.1;
3318 $BDB_POLL_WATCHER = Event->io ( 3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb;
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8;
3327 3637
3328 BDB::set_sync_prepare { 3638 BDB::set_sync_prepare {
3329 my $status; 3639 my $status;
3330 my $current = $Coro::current; 3640 my $current = $Coro::current;
3331 ( 3641 (
3340 ) 3650 )
3341 }; 3651 };
3342 3652
3343 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3344 $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);
3345 3659
3346 cf::sync_job { 3660 cf::sync_job {
3347 eval { 3661 eval {
3348 BDB::db_env_open 3662 BDB::db_env_open
3349 $DB_ENV, 3663 $DB_ENV,
3351 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
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3667 0666;
3354 3668
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3670 };
3360 3671
3361 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3673 };
3363 } 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 };
3364} 3685}
3365 3686
3366{ 3687{
3367 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3368 3689
3369 undef $Coro::AIO::WATCHER; 3690 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3693}
3380 3694
3381my $_log_backtrace; 3695my $_log_backtrace;
3382 3696
3383sub _log_backtrace { 3697sub _log_backtrace {
3387 3701
3388 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3704 ++$_log_backtrace;
3391 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3392 my @bt = fork_call { 3708 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 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 |"
3396 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines