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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.435 by root, Thu May 29 03:33:20 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
25use JSON::XS 1.4 (); 49use JSON::XS 2.01 ();
26use BDB (); 50use BDB ();
27use Data::Dumper; 51use Data::Dumper;
28use Digest::MD5; 52use Digest::MD5;
29use Fcntl; 53use Fcntl;
30use YAML::Syck (); 54use YAML ();
31use IO::AIO 2.32 (); 55use IO::AIO ();
32use Time::HiRes; 56use Time::HiRes;
33use Compress::LZF; 57use Compress::LZF;
34use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
35 61
36# configure various modules to our taste 62# configure various modules to our taste
37# 63#
38$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::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 66Compress::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
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 67
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 69
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 71
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 90our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 93our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
74 96
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 99our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
82 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 105our $DB_ENV;
85 106
86our %CFG; 107our %CFG;
87 108
88our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 110our $RUNTIME;
111our $NOW;
90 112
91our %PLAYER; # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 114our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
94 116
95# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 119
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 123our $TICK_START; # for load detecting purposes
101 124
102binmode STDOUT; 125binmode STDOUT;
103binmode STDERR; 126binmode STDERR;
104 127
105# read virtual server time, if available 128# read virtual server time, if available
158 181
159The raw value load value from the last tick. 182The raw value load value from the last tick.
160 183
161=item %cf::CFG 184=item %cf::CFG
162 185
163Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 187from wherever your confdir points to.
165 188
166=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
167 190
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 209 $msg .= "\n"
187 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
188 211
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 213
191 utf8::encode $msg;
192 LOG llevError, $msg; 214 LOG llevError, $msg;
193 }; 215 };
194} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
195 232
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 249)) {
213 no strict 'refs'; 250 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 252}
216 253
217$Event::DIED = sub { 254$EV::DIED = sub {
218 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
219}; 256};
220 257
221############################################################################# 258#############################################################################
222 259
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 283 $d
247 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
248} 285}
249 286
250=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
251 288
252Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
253 290
254=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
255 292
256Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
257 294
258=cut 295=cut
259 296
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 298
262sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
264 301
265=item cf::lock_wait $string 302=item cf::lock_wait $string
266 303
267Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
268 305
271Wait until the given lock is available and then acquires it and returns 308Wait 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, 309a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 310for example when the coroutine gets canceled), the lock is automatically
274returned. 311returned.
275 312
313Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro.
315
276Lock names should begin with a unique identifier (for example, cf::map::find 316Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 317uses map_find and cf::map::load uses map_load).
278 318
279=item $locked = cf::lock_active $string 319=item $locked = cf::lock_active $string
280 320
281Return true if the lock is currently active, i.e. somebody has locked it. 321Return true if the lock is currently active, i.e. somebody has locked it.
282 322
283=cut 323=cut
284 324
285our %LOCK; 325our %LOCK;
326our %LOCKER;#d#
286 327
287sub lock_wait($) { 328sub lock_wait($) {
288 my ($key) = @_; 329 my ($key) = @_;
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
289 335
290 # wait for lock, if any 336 # wait for lock, if any
291 while ($LOCK{$key}) { 337 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 338 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 339 Coro::schedule;
299 345
300 # wait, to be sure we are not locked 346 # wait, to be sure we are not locked
301 lock_wait $key; 347 lock_wait $key;
302 348
303 $LOCK{$key} = []; 349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
304 351
305 Coro::guard { 352 Coro::guard {
353 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 354 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 355 $_->ready for @{ delete $LOCK{$key} };
308 } 356 }
309} 357}
310 358
313 361
314 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
315} 363}
316 364
317sub freeze_mainloop { 365sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
319 367
320 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 369}
322 }; 370
323 $TICK_WATCHER->stop; 371=item cf::periodic $interval, $cb
324 $guard 372
373Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer.
375
376=cut
377
378sub periodic($$) {
379 my ($interval, $cb) = @_;
380
381 my $start = rand List::Util::min 180, $interval;
382
383 EV::periodic $start, $interval, 0, $cb
325} 384}
326 385
327=item cf::get_slot $time[, $priority[, $name]] 386=item cf::get_slot $time[, $priority[, $name]]
328 387
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 388Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 399our @SLOT_QUEUE;
341our $SLOT_QUEUE; 400our $SLOT_QUEUE;
342 401
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 402$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 403$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager");
405
345 my $signal = new Coro::Signal; 406 my $signal = new Coro::Signal;
346 407
347 while () { 408 while () {
348 next_job: 409 next_job:
349 my $avail = cf::till_tick; 410 my $avail = cf::till_tick;
357 } 418 }
358 } 419 }
359 } 420 }
360 421
361 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 425 $signal->wait;
365 } else { 426 } else {
366 Coro::schedule; 427 Coro::schedule;
367 } 428 }
368 } 429 }
369}; 430};
370 431
371sub get_slot($;$$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
372 my ($time, $pri, $name) = @_; 435 my ($time, $pri, $name) = @_;
373 436
374 $time = $TICK * .6 if $time > $TICK * .6; 437 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 438 my $sig = new Coro::Signal;
376 439
390 453
391BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
392 455
393=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
394 457
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 459is 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 460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 461acceptable.
399 462
400If it must be done, put the blocking parts into C<sync_job>. This will run 463If 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 464the given BLOCK in another coroutine while waiting for the result. The
406 469
407sub sync_job(&) { 470sub sync_job(&) {
408 my ($job) = @_; 471 my ($job) = @_;
409 472
410 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 474 my $time = EV::time;
412 475
413 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
415 478
416 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 480
418 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
419 482
420 my $busy = 1; 483 my $busy = 1;
421 my @res; 484 my @res;
422 485
423 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 488 @res = eval { $job->() };
425 warn $@ if $@; 489 warn $@ if $@;
426 undef $busy; 490 undef $busy;
427 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
428 492
429 while ($busy) { 493 while ($busy) {
430 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
431 } 498 }
499 }
432 500
433 $time = Event::time - $time; 501 my $time = EV::time - $time;
434 502
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
439 504
440 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
441 } else { 506 } else {
442 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
443 508
468=item fork_call { }, $args 533=item fork_call { }, $args
469 534
470Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
474 539
475=cut 540=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 541
486sub fork_call(&@) { 542sub fork_call(&@) {
487 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
488 544
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 545 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 546 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 547 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 548
494 if (my $pid = fork) { 549 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; 550 reset_signals;
508 local $SIG{__WARN__}; 551 &$cb
509 local $SIG{__DIE__}; 552 }, @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 553
516 eval { 554 wantarray ? @res : $res[-1]
517 close $fh1; 555}
518 556
519 my @res = eval { $cb->(@args) }; 557=item $coin = coin_from_name $name
520 558
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 559=cut
522 close $fh2;
523 };
524 560
525 warn $@ if $@; 561our %coin_alias = (
526 _exit 0; 562 "silver" => "silvercoin",
527 } 563 "silvercoin" => "silvercoin",
564 "silvercoins" => "silvercoin",
565 "gold" => "goldcoin",
566 "goldcoin" => "goldcoin",
567 "goldcoins" => "goldcoin",
568 "platinum" => "platinacoin",
569 "platinumcoin" => "platinacoin",
570 "platinumcoins" => "platinacoin",
571 "platina" => "platinacoin",
572 "platinacoin" => "platinacoin",
573 "platinacoins" => "platinacoin",
574 "royalty" => "royalty",
575 "royalties" => "royalty",
576);
577
578sub coin_from_name($) {
579 $coin_alias{$_[0]}
580 ? cf::arch::find $coin_alias{$_[0]}
581 : undef
528} 582}
529 583
530=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
531 585
532Returns a single value from the environment database. 586Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 588=item cf::db_put $family => $key => $value
535 589
536Stores the given C<$value> in the family. It can currently store binary 590Stores 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). 591data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 592
593=item $db = cf::db_table "name"
594
595Create and/or open a new database table. The string must not be "db" and must be unique
596within each server.
597
539=cut 598=cut
599
600sub db_table($) {
601 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV;
603
604 eval {
605 $db->set_flags (BDB::CHKSUM);
606
607 utf8::encode $name;
608 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
609 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
610 cf::cleanup "db_open(db): $!" if $!;
611 };
612 cf::cleanup "db_open(db): $@" if $@;
613
614 $db
615}
540 616
541our $DB; 617our $DB;
542 618
543sub db_init { 619sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 620 cf::sync_job {
548 eval { 621 $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 } 622 };
558} 623}
559 624
560sub db_get($$) { 625sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 626 my $key = "$_[0]/$_[1]";
562 627
612 if (1) { 677 if (1) {
613 $md5 = 678 $md5 =
614 join "\x00", 679 join "\x00",
615 $processversion, 680 $processversion,
616 map { 681 map {
617 Coro::cede; 682 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 683 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 684 } 0.. $#$src;
620 685
621 686
622 my $dbmd5 = db_get cache => "$id/md5"; 687 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
668 733
669In the following description, CLASS can be any of C<global>, C<object> 734In 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 735C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 736Deliantra).
672 737
673=over 4 738=over 4
674 739
675=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
676 741
958 } 1023 }
959 1024
960 0 1025 0
961} 1026}
962 1027
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1029
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1031
967Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
968 1033
974 1039
975=cut 1040=cut
976 1041
977############################################################################# 1042#############################################################################
978# object support 1043# object support
979#
980 1044
1045sub _object_equal($$);
1046sub _object_equal($$) {
1047 my ($a, $b) = @_;
1048
1049 return 0 unless (ref $a) eq (ref $b);
1050
1051 if ("HASH" eq ref $a) {
1052 my @ka = keys %$a;
1053 my @kb = keys %$b;
1054
1055 return 0 if @ka != @kb;
1056
1057 for (0 .. $#ka) {
1058 return 0 unless $ka[$_] eq $kb[$_];
1059 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1060 }
1061
1062 } elsif ("ARRAY" eq ref $a) {
1063
1064 return 0 if @$a != @$b;
1065
1066 for (0 .. $#$a) {
1067 return 0 unless _object_equal $a->[$_], $b->[$_];
1068 }
1069
1070 } elsif ($a ne $b) {
1071 return 0;
1072 }
1073
1074 1
1075}
1076
1077our $SLOW_MERGES;#d#
981sub _can_merge { 1078sub _can_merge {
982 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
983 1080
984 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1082
988 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
989} 1085}
990 1086
991sub reattach { 1087sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1089 my ($obj) = @_;
1015cf::attachable->attach ( 1111cf::attachable->attach (
1016 prio => -1000000, 1112 prio => -1000000,
1017 on_instantiate => sub { 1113 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1019 1115
1020 $data = from_json $data; 1116 $data = decode_json $data;
1021 1117
1022 for (@$data) { 1118 for (@$data) {
1023 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1024 1120
1025 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1137sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
1043 1139
1044 sync_job { 1140 sync_job {
1045 if (length $$rdata) { 1141 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1048 1145
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1150 aio_close $fh;
1054 1151
1055 if (@$objs) { 1152 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1158 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1160 }
1064 } else { 1161 } else {
1065 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1066 } 1163 }
1071 } 1168 }
1072 } else { 1169 } else {
1073 aio_unlink $filename; 1170 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1075 } 1172 }
1076 } 1173 };
1077} 1174}
1078 1175
1079sub object_freezer_as_string { 1176sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
1081 1178
1093 or return; 1190 or return;
1094 1191
1095 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1194 or return;
1195
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1099 } 1198 }
1100 1199
1200 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1203
1103 return ($data, $av); 1204 ($data, $av)
1104} 1205}
1105 1206
1106=head2 COMMAND CALLBACKS 1207=head2 COMMAND CALLBACKS
1107 1208
1108=over 4 1209=over 4
1186 my ($type, $reply, @payload) = 1287 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1288 "ARRAY" eq ref $msg
1188 ? @$msg 1289 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1290 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1291
1292 my @reply;
1293
1191 if (my $cb = $EXTCMD{$type}) { 1294 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1295 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1296 }
1297
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1197 } else { 1301 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1303 }
1200 1304
1201 cf::override; 1305 cf::override;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1256 1360
1257 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1362 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1364 }
1262 1365
1263 warn $msg; 1366 warn $msg;
1264 } 1367 }
1265 1368
1290use Coro::AIO; 1393use Coro::AIO;
1291 1394
1292=head3 cf::player 1395=head3 cf::player
1293 1396
1294=over 4 1397=over 4
1398
1399=item cf::player::num_playing
1400
1401Returns the official number of playing players, as per the Crossfire metaserver rules.
1402
1403=cut
1404
1405sub num_playing {
1406 scalar grep
1407 $_->ob->map
1408 && !$_->hidden
1409 && !$_->ob->flag (cf::FLAG_WIZ),
1410 cf::player::list
1411}
1295 1412
1296=item cf::player::find $login 1413=item cf::player::find $login
1297 1414
1298Returns the given player object, loading it if necessary (might block). 1415Returns the given player object, loading it if necessary (might block).
1299 1416
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1452 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1453 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1454 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1456
1340 my $pl = load_pl path $login 1457 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1458 or return;
1459
1460 my $pl = cf::player::load_pl $f
1461 or return;
1462
1463 local $cf::PLAYER_LOADING{$login} = $pl;
1464 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1343 } 1466 }
1344 } 1467 }
1345} 1468}
1346 1469
1355 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1356 1479
1357 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1359 1482
1483 cf::get_slot 0.01;
1484
1360 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1361 Coro::cede; 1486 cf::cede_to_tick;
1362} 1487}
1363 1488
1364sub new($) { 1489sub new($) {
1365 my ($login) = @_; 1490 my ($login) = @_;
1366 1491
1399 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1400 $pl->password ("*"); # this should lock out the player until we nuked the dir 1525 $pl->password ("*"); # this should lock out the player until we nuked the dir
1401 1526
1402 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1403 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1404 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1405 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1406 1533
1407 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1408 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1444 or return []; 1571 or return [];
1445 1572
1446 my @logins; 1573 my @logins;
1447 1574
1448 for my $login (@$dirs) { 1575 for my $login (@$dirs) {
1576 my $path = path $login;
1577
1578 # a .pst is a dead give-away for a valid player
1579 # if no pst file found, open and chekc for blocked users
1580 if (aio_stat "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1584 }
1452 1585
1453 utf8::decode $login; 1586 utf8::decode $login;
1454 push @logins, $login; 1587 push @logins, $login;
1455 } 1588 }
1456 1589
1489 1622
1490Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1491 1624
1492=cut 1625=cut
1493 1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1494sub expand_cfpod { 1638sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1496 1640
1497 # escape & and < 1641 my $xml;
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500 1642
1501 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1502 1646
1503 1 while 1647 $group =~ s/&/&amp;/g;
1504 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1508 # replace G<male|female> tags 1652 ([BCGHITU])
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1653 <
1510 $self->gender ? $2 : $1 1654 (?:
1511 }ge 1655 ([^<>]*) (?{ $group = $^N })
1512 # replace H<hint text> 1656 | < $interior >
1513 || s{H<([^\>]*)>} 1657 )
1658 >
1659 %gcsx
1514 { 1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "") 1680 "")
1518 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1519 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1520 1692
1693 for ($xml) {
1521 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1523 1696
1524 # compress some whitespace 1697 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1529 1703
1530 $_ 1704 $xml
1531} 1705}
1706
1707no re 'eval';
1532 1708
1533sub hintmode { 1709sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode} 1711 $_[0]{hintmode}
1536} 1712}
1542=cut 1718=cut
1543 1719
1544sub ext_reply($$@) { 1720sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1721 my ($self, $id, @msg) = @_;
1546 1722
1547 if ($self->ns->extcmd == 2) { 1723 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1724}
1555 1725
1556=item $player->ext_msg ($type, @msg) 1726=item $player->ext_msg ($type, @msg)
1557 1727
1558Sends an ext event to the client. 1728Sends an ext event to the client.
1614our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1615our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1616 1786
1617sub generate_random_map { 1787sub generate_random_map {
1618 my ($self, $rmp) = @_; 1788 my ($self, $rmp) = @_;
1789
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791
1619 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1620 $self->_create_random_map ( 1793 $self->_create_random_map (
1621 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1622 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1623 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1745 1918
1746# the temporary/swap location 1919# the temporary/swap location
1747sub save_path { 1920sub save_path {
1748 my ($self) = @_; 1921 my ($self) = @_;
1749 1922
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1752} 1925}
1753 1926
1754# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1755sub uniq_path { 1928sub uniq_path {
1756 my ($self) = @_; 1929 my ($self) = @_;
1757 1930
1758 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1759 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1760} 1933}
1761 1934
1762# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1763# all maps in C++... 1936# all maps in C++...
1786 1959
1787sub load_header_from($) { 1960sub load_header_from($) {
1788 my ($self, $path) = @_; 1961 my ($self, $path) = @_;
1789 1962
1790 utf8::encode $path; 1963 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1964 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1965 or return;
1966
1967 $self->_load_header ($f)
1968 or return;
1969
1970 local $MAP_LOADING{$self->{path}} = $self;
1971 $f->resolve_delayed_derefs;
1796 1972
1797 $self->{load_path} = $path; 1973 $self->{load_path} = $path;
1798 1974
1799 1 1975 1
1800} 1976}
1854sub find { 2030sub find {
1855 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1856 2032
1857 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1858 2034
2035 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1860 2037
1861 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1862 my $guard = cf::lock_acquire "map_find:$path"; 2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
1863 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1864 or return; 2043 or return;
1865 2044
1866 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1867 2046
1869 or return; 2048 or return;
1870 2049
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2054 undef $guard1;
1874 $map->reset; 2055 $map->reset;
1875 undef $guard;
1876 return find $path; 2056 return find $path;
1877 } 2057 }
1878 2058
1879 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1880 } 2060 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1890 2070
1891 my $path = $self->{path}; 2071 my $path = $self->{path};
1892 2072
1893 { 2073 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2074 my $guard = cf::lock_acquire "map_data:$path";
1895 2075
2076 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2077 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2078
1898 $self->in_memory (cf::MAP_LOADING); 2079 $self->in_memory (cf::MAP_LOADING);
1899 2080
1900 $self->alloc; 2081 $self->alloc;
1901 2082
1902 $self->pre_load; 2083 $self->pre_load;
1903 Coro::cede; 2084 cf::cede_to_tick;
1904 2085
2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2088 $self->_load_objects ($f)
1906 or return; 2089 or return;
1907 2090
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1910 2093
1911 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2095 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2096 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2098 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2099 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs;
2101 }
1916 } 2102 }
1917 } 2103 }
1918 2104
1919 Coro::cede; 2105 $f->resolve_delayed_derefs;
2106
2107 cf::cede_to_tick;
1920 # now do the right thing for maps 2108 # now do the right thing for maps
1921 $self->link_multipart_objects; 2109 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2110 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2111 unless $self->difficulty;
1924 Coro::cede; 2112 cf::cede_to_tick;
1925 2113
1926 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2115 $self->decay_objects;
1928 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
1929 $self->update_buttons; 2117 $self->update_buttons;
1930 Coro::cede; 2118 cf::cede_to_tick;
1931 $self->set_darkness_map; 2119 $self->set_darkness_map;
1932 Coro::cede; 2120 cf::cede_to_tick;
1933 $self->activate; 2121 $self->activate;
1934 } 2122 }
1935 2123
1936 $self->{last_save} = $cf::RUNTIME; 2124 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2125 $self->last_access ($cf::RUNTIME);
1938 2126
1939 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1940 } 2128 }
1941 2129
1942 $self->post_load; 2130 $self->post_load;
1943} 2131}
1944 2132
1953 2141
1954 $self 2142 $self
1955} 2143}
1956 2144
1957# find and load all maps in the 3x3 area around a map 2145# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2146sub load_neighbours {
1959 my ($map) = @_; 2147 my ($map) = @_;
1960 2148
1961 my @diag; # diagonal neighbours 2149 my @neigh; # diagonal neighbours
1962 2150
1963 for (0 .. 3) { 2151 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2152 my $neigh = $map->tile_path ($_)
1965 or next; 2153 or next;
1966 $neigh = find $neigh, $map 2154 $neigh = find $neigh, $map
1967 or next; 2155 or next;
1968 $neigh->load; 2156 $neigh->load;
1969 2157
2158 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2161 }
1973 2162
1974 for (@diag) { 2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2165 my $neigh = find $path, $origin
1976 or next; 2166 or next;
1977 $neigh->load; 2167 $neigh->load;
1978 } 2168 }
1979} 2169}
1980 2170
1985} 2175}
1986 2176
1987sub do_load_sync { 2177sub do_load_sync {
1988 my ($map) = @_; 2178 my ($map) = @_;
1989 2179
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main;
2182
1990 cf::sync_job { $map->load }; 2183 cf::sync_job { $map->load };
1991} 2184}
1992 2185
1993our %MAP_PREFETCH; 2186our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2187our $MAP_PREFETCHER = undef;
1995 2188
1996sub find_async { 2189sub find_async {
1997 my ($path, $origin) = @_; 2190 my ($path, $origin, $load) = @_;
1998 2191
1999 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
2000 2193
2001 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2196 }
2004 2197
2005 undef $MAP_PREFETCH{$path}; 2198 $MAP_PREFETCH{$path} |= $load;
2199
2006 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
2007 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2205 if (my $map = find $k) {
2010 $map->load; 2206 $map->load if $v;
2011 } 2207 }
2012 2208
2013 delete $MAP_PREFETCH{$path}; 2209 delete $MAP_PREFETCH{$k};
2014 } 2210 }
2015 } 2211 }
2016 undef $MAP_PREFETCHER; 2212 undef $MAP_PREFETCHER;
2017 }; 2213 };
2018 $MAP_PREFETCHER->prio (6); 2214 $MAP_PREFETCHER->prio (6);
2021} 2217}
2022 2218
2023sub save { 2219sub save {
2024 my ($self) = @_; 2220 my ($self) = @_;
2025 2221
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2223
2028 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2029 2225
2030 return unless $self->dirty; 2226 return unless $self->dirty;
2031 2227
2037 return if $self->{deny_save}; 2233 return if $self->{deny_save};
2038 2234
2039 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
2040 2236
2041 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2043 }; 2240 };
2241
2242 cf::get_slot 0.02;
2044 2243
2045 if ($uniq) { 2244 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2047 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2048 } else { 2247 } else {
2054 my ($self) = @_; 2253 my ($self) = @_;
2055 2254
2056 # save first because save cedes 2255 # save first because save cedes
2057 $self->save; 2256 $self->save;
2058 2257
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2259
2061 return if $self->players; 2260 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2063 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2064 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2268 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2269}
2068 2270
2069sub reset_at { 2271sub reset_at {
2070 my ($self) = @_; 2272 my ($self) = @_;
2071 2273
2103 if $uniq; 2305 if $uniq;
2104 } 2306 }
2105 2307
2106 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
2107 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2312 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2313
2112 $self->unlink_save; 2314 $self->unlink_save;
2113 $self->destroy; 2315 $self->destroy;
2114} 2316}
2115 2317
2116my $nuke_counter = "aaaa"; 2318my $nuke_counter = "aaaa";
2117 2319
2118sub nuke { 2320sub nuke {
2119 my ($self) = @_; 2321 my ($self) = @_;
2120 2322
2323 {
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2121 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
2122 2327
2123 $self->unlink_save; 2328 $self->unlink_save;
2124 2329
2125 bless $self, "cf::map"; 2330 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2331 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2332 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2333 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2335
2131 $cf::MAP{$self->path} = $self; 2336 $cf::MAP{$self->path} = $self;
2337 }
2132 2338
2133 $self->reset; # polite request, might not happen 2339 $self->reset; # polite request, might not happen
2134} 2340}
2135 2341
2136=item $maps = cf::map::tmp_maps 2342=item $maps = cf::map::tmp_maps
2178 2384
2179sub unique_maps() { 2385sub unique_maps() {
2180 [ 2386 [
2181 map { 2387 map {
2182 utf8::decode $_; 2388 utf8::decode $_;
2183 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2184 ? normalise $_ 2392 : normalise $_
2185 : ()
2186 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2187 ] 2394 ]
2188} 2395}
2189 2396
2190package cf;
2191
2192=back 2397=back
2193 2398
2194=head3 cf::object 2399=head3 cf::object
2195 2400
2196=cut 2401=cut
2199 2404
2200=over 4 2405=over 4
2201 2406
2202=item $ob->inv_recursive 2407=item $ob->inv_recursive
2203 2408
2204Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2205 2411
2206=cut 2412=cut
2207 2413
2208sub inv_recursive_; 2414sub inv_recursive_;
2209sub inv_recursive_ { 2415sub inv_recursive_ {
2212 2418
2213sub inv_recursive { 2419sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2215} 2421}
2216 2422
2423=item $ref = $ob->ref
2424
2425Creates and returns a persistent reference to an object that can be stored as a string.
2426
2427=item $ob = cf::object::deref ($refstring)
2428
2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2430even if the object actually exists. May block.
2431
2432=cut
2433
2434sub deref {
2435 my ($ref) = @_;
2436
2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2438 my ($uuid, $name) = ($1, $2);
2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2440 or return;
2441 $pl->ob->uuid eq $uuid
2442 or return;
2443
2444 $pl->ob
2445 } else {
2446 warn "$ref: cannot resolve object reference\n";
2447 undef
2448 }
2449}
2450
2217package cf; 2451package cf;
2218 2452
2219=back 2453=back
2220 2454
2221=head3 cf::object::player 2455=head3 cf::object::player
2227Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2461Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2228can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2229dialogue with the given NPC character. 2463dialogue with the given NPC character.
2230 2464
2231=cut 2465=cut
2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2232 2480
2233# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2234# with dialog boxes. 2482# with dialog boxes.
2235#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2236sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2248 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2250 2498
2251 } else { 2499 } else {
2252 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2253 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2254 } 2502 }
2255 } 2503 }
2256} 2504}
2257 2505
2258=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2349 # use -1 or undef as default coordinates, not 0, 0 2597 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2598 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2599 if $x <=0 && $y <= 0;
2352 2600
2353 $map->load; 2601 $map->load;
2354 $map->load_diag; 2602 $map->load_neighbours;
2355 2603
2356 return unless $self->contr->active; 2604 return unless $self->contr->active;
2357 $self->activate_recursive; 2605 $self->activate_recursive;
2358 2606
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2628
2381 $self->enter_link; 2629 $self->enter_link;
2382 2630
2383 (async { 2631 (async {
2632 $Coro::current->{desc} = "player::goto $path $x $y";
2633
2634 # *tag paths override both path and x|y
2635 if ($path =~ /^\*(.*)$/) {
2636 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2637 my $ob = $obs[rand @obs];
2638
2639 # see if we actually can go there
2640 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2641 $ob = $obs[rand @obs];
2642 } else {
2643 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2644 }
2645 # else put us there anyways for now #d#
2646
2647 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2648 } else {
2649 ($path, $x, $y) = (undef, undef, undef);
2650 }
2651 }
2652
2384 my $map = eval { 2653 my $map = eval {
2385 my $map = cf::map::find $path; 2654 my $map = defined $path ? cf::map::find $path : undef;
2386 2655
2387 if ($map) { 2656 if ($map) {
2388 $map = $map->customise_for ($self); 2657 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2658 $map = $check->($map) if $check && $map;
2390 } else { 2659 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2661 }
2393 2662
2394 $map 2663 $map
2395 }; 2664 };
2396 2665
2432} 2701}
2433 2702
2434sub prepare_random_map { 2703sub prepare_random_map {
2435 my ($exit) = @_; 2704 my ($exit) = @_;
2436 2705
2437 my $guard = cf::lock_acquire "exit_prepare:$exit";
2438
2439 # all this does is basically replace the /! path by 2706 # all this does is basically replace the /! path by
2440 # a new random map path (?random/...) with a seed 2707 # a new random map path (?random/...) with a seed
2441 # that depends on the exit object 2708 # that depends on the exit object
2442 2709
2443 my $rmp = parse_random_map_params $exit->msg; 2710 my $rmp = parse_random_map_params $exit->msg;
2445 if ($exit->map) { 2712 if ($exit->map) {
2446 $rmp->{region} = $exit->region->name; 2713 $rmp->{region} = $exit->region->name;
2447 $rmp->{origin_map} = $exit->map->path; 2714 $rmp->{origin_map} = $exit->map->path;
2448 $rmp->{origin_x} = $exit->x; 2715 $rmp->{origin_x} = $exit->x;
2449 $rmp->{origin_y} = $exit->y; 2716 $rmp->{origin_y} = $exit->y;
2717
2718 $exit->map->touch;
2450 } 2719 }
2451 2720
2452 $rmp->{random_seed} ||= $exit->random_seed; 2721 $rmp->{random_seed} ||= $exit->random_seed;
2453 2722
2454 my $data = cf::to_json $rmp; 2723 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2455 my $md5 = Digest::MD5::md5_hex $data; 2724 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2725 my $meta = "$RANDOMDIR/$md5.meta";
2457 2726
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2727 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2728 aio_write $fh, 0, (length $data), $data, 0;
2460 undef $fh; 2729 undef $fh;
2461 aio_rename "$meta~", $meta; 2730 aio_rename "$meta~", $meta;
2462 2731
2732 my $slaying = "?random/$md5";
2733
2734 if ($exit->valid) {
2463 $exit->slaying ("?random/$md5"); 2735 $exit->slaying ("?random/$md5");
2464 $exit->msg (undef); 2736 $exit->msg (undef);
2737 }
2465 } 2738 }
2466} 2739}
2467 2740
2468sub cf::object::player::enter_exit { 2741sub cf::object::player::enter_exit {
2469 my ($self, $exit) = @_; 2742 my ($self, $exit) = @_;
2470 2743
2471 return unless $self->type == cf::PLAYER; 2744 return unless $self->type == cf::PLAYER;
2472 2745
2473 if ($exit->slaying eq "/!") {
2474 #TODO: this should de-fi-ni-te-ly not be a sync-job
2475 # the problem is that $exit might not survive long enough
2476 # so it needs to be done right now, right here
2477 cf::sync_job { prepare_random_map $exit };
2478 }
2479
2480 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2481 my $hp = $exit->stats->hp;
2482 my $sp = $exit->stats->sp;
2483
2484 $self->enter_link; 2746 $self->enter_link;
2485 2747
2486 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED);
2489
2490 (async { 2748 (async {
2491 $self->deactivate_recursive; # just to be sure 2749 $Coro::current->{desc} = "enter_exit";
2750
2492 unless (eval { 2751 unless (eval {
2752 $self->deactivate_recursive; # just to be sure
2753
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2763 my $x = $exit->stats->hp;
2764 my $y = $exit->stats->sp;
2765
2493 $self->goto ($slaying, $hp, $sp); 2766 $self->goto ($map, $x, $y);
2494 2767
2768 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED);
2771
2495 1; 2772 1
2496 }) { 2773 }) {
2497 $self->message ("Something went wrong deep within the crossfire server. " 2774 $self->message ("Something went wrong deep within the crossfire server. "
2498 . "I'll try to bring you back to the map you were before. " 2775 . "I'll try to bring you back to the map you were before. "
2499 . "Please report this to the dungeon master!", 2776 . "Please report this to the dungeon master!",
2500 cf::NDI_UNIQUE | cf::NDI_RED); 2777 cf::NDI_UNIQUE | cf::NDI_RED);
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2807the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2808the message unless the client supports the msg packet.
2532 2809
2533=cut 2810=cut
2534 2811
2812# non-persistent channels (usually the info channel)
2813our %CHANNEL = (
2814 "c/identify" => {
2815 id => "infobox",
2816 title => "Identify",
2817 reply => undef,
2818 tooltip => "Items recently identified",
2819 },
2820 "c/examine" => {
2821 id => "infobox",
2822 title => "Examine",
2823 reply => undef,
2824 tooltip => "Signs and other items you examined",
2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/uptime" => {
2851 id => "infobox",
2852 title => "Uptime",
2853 reply => undef,
2854 tooltip => "How long the server has been running since last restart",
2855 },
2856 "c/mapinfo" => {
2857 id => "infobox",
2858 title => "Map Info",
2859 reply => undef,
2860 tooltip => "Information related to the maps",
2861 },
2862 "c/party" => {
2863 id => "party",
2864 title => "Party",
2865 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party",
2867 },
2868);
2869
2535sub cf::client::send_msg { 2870sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2872
2538 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg);
2539 2874
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2876
2877 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel};
2880
2881 $self->ext_msg (channel_info => $channel)
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id};
2885
2542 if (ref $channel) { 2886 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2887 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2888 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2889 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2890 $self->ext_msg (channel_info => $channel)
2891 if $self->can_msg;
2547 } 2892 }
2548 2893
2549 $channel = $channel->{id}; 2894 $channel = $channel->{id};
2550 } 2895 }
2551 2896
2573 $color &= cf::NDI_COLOR_MASK; 2918 $color &= cf::NDI_COLOR_MASK;
2574 2919
2575 utf8::encode $msg; 2920 utf8::encode $msg;
2576 2921
2577 if (0 && $msg =~ /\[/) { 2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2925 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2927 $self->send_packet ("drawinfo $color $msg")
2582 } 2928 }
2583 } 2929 }
2591=cut 2937=cut
2592 2938
2593sub cf::client::ext_msg($$@) { 2939sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2940 my ($self, $type, @msg) = @_;
2595 2941
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2942 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2944 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2945 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 }
2948}
2949
2950=item $client->ext_reply ($msgid, @msg)
2951
2952Sends an ext reply to the client.
2953
2954=cut
2955
2956sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_;
2958
2959 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2965 }
2604} 2966}
2605 2967
2606=item $success = $client->query ($flags, "text", \&cb) 2968=item $success = $client->query ($flags, "text", \&cb)
2668 my ($type, $reply, @payload) = 3030 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 3031 "ARRAY" eq ref $msg
2670 ? @$msg 3032 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3033 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 3034
3035 my @reply;
3036
2673 if (my $cb = $EXTICMD{$type}) { 3037 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 3038 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 3039 }
3040
3041 $ns->ext_reply ($reply, @reply)
3042 if $reply;
3043
2679 } else { 3044 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3045 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 3046 }
2682 3047
2683 cf::override; 3048 cf::override;
2743=pod 3108=pod
2744 3109
2745The following functions and methods are available within a safe environment: 3110The following functions and methods are available within a safe environment:
2746 3111
2747 cf::object 3112 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 3113 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove 3114 insert remove name archname title slaying race decrease split
2750 3115
2751 cf::object::player 3116 cf::object::player
2752 player 3117 player
2753 3118
2754 cf::player 3119 cf::player
2759 3124
2760=cut 3125=cut
2761 3126
2762for ( 3127for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv)], 3129 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)],
2765 ["cf::object::player" => qw(player)], 3131 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 3132 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 3133 ["cf::map" => qw(trigger)],
2768) { 3134) {
2769 no strict 'refs'; 3135 no strict 'refs';
2845# the server's init and main functions 3211# the server's init and main functions
2846 3212
2847sub load_facedata($) { 3213sub load_facedata($) {
2848 my ($path) = @_; 3214 my ($path) = @_;
2849 3215
3216 # HACK to clear player env face cache, we need some signal framework
3217 # for this (global event?)
3218 %ext::player_env::MUSIC_FACE_CACHE = ();
3219
3220 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3221
2850 warn "loading facedata from $path\n"; 3222 warn "loading facedata from $path\n";
2851 3223
2852 my $facedata; 3224 my $facedata;
2853 0 < aio_load $path, $facedata 3225 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3226 or die "$path: $!";
2856 $facedata = Coro::Storable::thaw $facedata; 3228 $facedata = Coro::Storable::thaw $facedata;
2857 3229
2858 $facedata->{version} == 2 3230 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3231 or cf::cleanup "$path: version mismatch, cannot proceed.";
2860 3232
3233 # patch in the exptable
3234 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3237 };
3238 cf::cede_to_tick;
3239
2861 { 3240 {
2862 my $faces = $facedata->{faceinfo}; 3241 my $faces = $facedata->{faceinfo};
2863 3242
2864 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3244 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245
2866 cf::face::set_visibility $idx, $info->{visibility}; 3246 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3247 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3250
2871 cf::cede_to_tick; 3251 cf::cede_to_tick;
2872 } 3252 }
2873 3253
2874 while (my ($face, $info) = each %$faces) { 3254 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3255 next unless $info->{smooth};
3256
2876 my $idx = cf::face::find $face 3257 my $idx = cf::face::find $face
2877 or next; 3258 or next;
3259
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3260 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3261 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3263 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3264 warn "smooth face '$info->{smooth}' not found for face '$face'";
2899 3281
2900 { 3282 {
2901 # TODO: for gcfclient pleasure, we should give resources 3283 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3284 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3285 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907 3286
2908 while (my ($name, $info) = each %$res) { 3287 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({ 3288 if (defined $info->{type}) {
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3289 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
2915 3291
2916 if ($info->{type} & 1) { 3292 if ($info->{type} & 1) {
2917 # prepend meta info 3293 # prepend meta info
2918 3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3300 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3301 } else {
3302 $data = $info->{data};
3303 }
2921 3304
2922 cf::face::set_data $idx, 0, $data, $chk; 3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type};
2923 } else { 3307 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3308 $RESOURCE{$name} = $info;
2925 } 3309 }
2926 3310
2927 cf::face::set_type $idx, $info->{type};
2928
2929 cf::cede_to_tick; 3311 cf::cede_to_tick;
2930 } 3312 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2949 } 3313 }
3314
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2950 3316
2951 1 3317 1
2952} 3318}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
2953 3339
2954register_exticmd fx_want => sub { 3340register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_; 3341 my ($ns, $want) = @_;
2956 3342
2957 while (my ($k, $v) = each %$want) { 3343 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v); 3344 $ns->fx_want ($k, $v);
2959 } 3345 }
2960}; 3346};
2961 3347
3348sub load_resource_file($) {
3349 my $guard = lock_acquire "load_resource_file";
3350
3351 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100;
3353 cf::arch::commit_load;
3354
3355 $status
3356}
3357
2962sub reload_regions { 3358sub reload_regions {
3359 # HACK to clear player env face cache, we need some signal framework
3360 # for this (global event?)
3361 %ext::player_env::MUSIC_FACE_CACHE = ();
3362
2963 load_resource_file "$MAPDIR/regions" 3363 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3364 or die "unable to load regions file\n";
2965 3365
2966 for (cf::region::list) { 3366 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3367 $_->{match} = qr/$_->{match}/
2975} 3375}
2976 3376
2977sub reload_archetypes { 3377sub reload_archetypes {
2978 load_resource_file "$DATADIR/archetypes" 3378 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n"; 3379 or die "unable to load archetypes\n";
2980 #d# NEED to laod twice to resolve forward references
2981 # this really needs to be done in an extra post-pass
2982 # (which needs to be synchronous, so solve it differently)
2983 load_resource_file "$DATADIR/archetypes"
2984 or die "unable to load archetypes\n";
2985} 3380}
2986 3381
2987sub reload_treasures { 3382sub reload_treasures {
2988 load_resource_file "$DATADIR/treasures" 3383 load_resource_file "$DATADIR/treasures"
2989 or die "unable to load treasurelists\n"; 3384 or die "unable to load treasurelists\n";
2990} 3385}
2991 3386
2992sub reload_resources { 3387sub reload_resources {
2993 warn "reloading resource files...\n"; 3388 warn "reloading resource files...\n";
2994 3389
3390 reload_facedata;
3391 reload_archetypes;
2995 reload_regions; 3392 reload_regions;
2996 reload_facedata;
2997 #reload_archetypes;#d#
2998 reload_archetypes;
2999 reload_treasures; 3393 reload_treasures;
3000 3394
3001 warn "finished reloading resource files\n"; 3395 warn "finished reloading resource files\n";
3002} 3396}
3003 3397
3004sub init { 3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3005 reload_resources; 3403 reload_resources;
3006} 3404}
3007 3405
3008sub cfg_load { 3406sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3408 or return;
3011 3409
3012 local $/; 3410 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3014 3412
3015 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3016 3414
3017 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3018 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3029sub main { 3427sub main {
3030 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3431 (async {
3034 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
3035 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3036 }; 3435 };
3037 3436
3038 cfg_load; 3437 {
3438 my $guard = freeze_mainloop;
3439 reload_config;
3039 db_init; 3440 db_init;
3040 load_extensions; 3441 load_extensions;
3041 3442
3042 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3043 Event::loop; 3446 EV::loop;
3044} 3447}
3045 3448
3046############################################################################# 3449#############################################################################
3047# initialisation and cleanup 3450# initialisation and cleanup
3048 3451
3049# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3050BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3051 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3052 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3053 reentrant => 0,
3054 data => WF_AUTOCANCEL,
3055 signal => $signal,
3056 prio => 0,
3057 cb => sub {
3058 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
3059 },
3060 ); 3458 };
3061 } 3459 }
3062} 3460}
3063 3461
3064sub write_runtime { 3462sub write_runtime_sync {
3065 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3066 3464
3067 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3068 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3069 3467
3095 and return; 3493 and return;
3096 3494
3097 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3098 3496
3099 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3100} 3541}
3101 3542
3102sub emergency_save() { 3543sub emergency_save() {
3103 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3104 3545
3110 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
3112 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3557 $pl->save;
3116 } 3558 }
3117 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
3118 3560
3119 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
3125 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3126 3568
3127 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3128 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3129 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3130 }; 3576 };
3131 3577
3132 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3133} 3579}
3134 3580
3149 warn "reloading..."; 3595 warn "reloading...";
3150 3596
3151 warn "entering sync_job"; 3597 warn "entering sync_job";
3152 3598
3153 cf::sync_job { 3599 cf::sync_job {
3154 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3155 cf::emergency_save; 3601 cf::emergency_save;
3156 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3157 3603
3158 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3159 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3160 3606
3161 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
3162
3163 warn "cancelling all WF_AUTOCANCEL watchers";
3164 for (Event::all_watchers) {
3165 $_->cancel if $_->data & WF_AUTOCANCEL;
3166 }
3167 3608
3168 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3169 for (;;) { 3610 for (;;) {
3170 BDB::flush; 3611 BDB::flush;
3171 IO::AIO::flush; 3612 IO::AIO::flush;
3172 Coro::cede; 3613 Coro::cede_notself;
3173 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3174 warn "iterate..."; 3615 warn "iterate...";
3175 } 3616 }
3176 3617
3177 ++$RELOAD; 3618 ++$RELOAD;
3236 warn "reloading cf.pm"; 3677 warn "reloading cf.pm";
3237 require cf; 3678 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3680
3240 warn "loading config and database again"; 3681 warn "loading config and database again";
3241 cf::cfg_load; 3682 cf::reload_config;
3242 3683
3243 warn "loading extensions"; 3684 warn "loading extensions";
3244 cf::load_extensions; 3685 cf::load_extensions;
3245 3686
3246 warn "reattaching attachments to objects/players"; 3687 warn "reattaching attachments to objects/players";
3253 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3254 3695
3255 1 3696 1
3256 } or do { 3697 } or do {
3257 warn $@; 3698 warn $@;
3258 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3259 exit 1;
3260 }; 3700 };
3261 3701
3262 warn "reloaded"; 3702 warn "reloaded";
3263}; 3703};
3264 3704
3266 3706
3267sub reload_perl() { 3707sub reload_perl() {
3268 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3269 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3270 3710
3271 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3272 reentrant => 0,
3273 after => 0,
3274 data => WF_AUTOCANCEL,
3275 cb => sub {
3276 do_reload_perl; 3712 do_reload_perl;
3277 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3278 },
3279 ); 3714 };
3280} 3715}
3281 3716
3282register_command "reload" => sub { 3717register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3284 3719
3285 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3724 reload_perl;
3725 };
3288 } 3726 }
3289}; 3727};
3290 3728
3291unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3292 3730
3294 3732
3295our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3296our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3297 3735
3298sub wait_for_tick { 3736sub wait_for_tick {
3299 return unless $TICK_WATCHER->is_active;
3300 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3301 3738
3302 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3304 $signal->wait; 3741 $signal->wait;
3305} 3742}
3306 3743
3307sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3308 return unless $TICK_WATCHER->is_active;
3309 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3310 3746
3311 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3749 $signal->wait;
3314} 3750}
3315 3751
3316 my $min = 1e6;#d# 3752sub tick {
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer (
3319 reentrant => 0,
3320 parked => 1,
3321 prio => 0,
3322 at => $NEXT_TICK || $TICK,
3323 data => WF_AUTOCANCEL,
3324 cb => sub {
3325 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3326 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3327 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3328 return; 3756 return;
3329 } 3757 }
3330 3758
3331 $NOW = $tick_start = Event::time;
3332
3333 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3334 3760
3335 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3337 my $t = Event::time; 3763 Coro::async_pool {
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3339 or die; 3765 write_runtime_sync
3340 3766 or warn "ERROR: unable to write runtime file: $!";
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 }; 3767 };
3768 }
3357 3769
3358 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK;
3360
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool {
3364 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!";
3366 };
3367 }
3368
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3771 $sig->send;
3374 } 3772 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3774 $sig->send;
3377 } 3775 }
3378 3776
3379 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3380
3381 # if we are delayed by four ticks or more, skip them all
3382 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3383
3384 $TICK_WATCHER->at ($NEXT_TICK);
3385 $TICK_WATCHER->start;
3386
3387 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3779
3390 _post_tick; 3780 if (0) {
3391 3781 if ($NEXT_TICK) {
3392 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3393 }, 3786 }
3394); 3787}
3395 3788
3396{ 3789{
3397 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3398 $BDB_POLL_WATCHER = Event->io ( 3791
3399 reentrant => 0,
3400 fd => BDB::poll_fileno,
3401 poll => 'r',
3402 prio => 0,
3403 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb,
3405 );
3406 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3407 3793 BDB::max_poll_reqs $TICK * 0.1;
3408 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3409 my $status;
3410 my $current = $Coro::current;
3411 (
3412 sub {
3413 $status = $!;
3414 $current->ready; undef $current;
3415 },
3416 sub {
3417 Coro::schedule while defined $current;
3418 $! = $status;
3419 },
3420 )
3421 };
3422 3795
3423 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3802
3426 cf::sync_job { 3803 cf::sync_job {
3427 eval { 3804 eval {
3428 BDB::db_env_open 3805 BDB::db_env_open
3429 $DB_ENV, 3806 $DB_ENV,
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3810 0666;
3434 3811
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3813 };
3440 3814
3441 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3816 };
3443 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3444} 3828}
3445 3829
3446{ 3830{
3831 # configure IO::AIO
3832
3447 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3448
3449 undef $Coro::AIO::WATCHER;
3450 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3451 $AIO_POLL_WATCHER = Event->io ( 3835 undef $AnyEvent::AIO::WATCHER;
3452 reentrant => 0,
3453 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno,
3455 poll => 'r',
3456 prio => 6,
3457 cb => \&IO::AIO::poll_cb,
3458 );
3459} 3836}
3460 3837
3461my $_log_backtrace; 3838my $_log_backtrace;
3462 3839
3463sub _log_backtrace { 3840sub _log_backtrace {
3467 3844
3468 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3847 ++$_log_backtrace;
3471 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3472 my @bt = fork_call { 3851 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3855 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines