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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 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 1.6;
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;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 369}
326 370
371=item cf::periodic $interval, $cb
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
384}
385
327=item cf::get_slot $time[, $priority] 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>:
330This call blocks and returns only when you have at least C<$time> seconds 389This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 390of cpu time till the next tick. The slot is only valid till the next cede.
332 391
392The optional C<$name> can be used to identify the job to run. It might be
393used for statistical purposes and should identify the same time-class.
394
333Useful for short background jobs. 395Useful for short background jobs.
334 396
335=cut 397=cut
336 398
337our @SLOT_QUEUE; 399our @SLOT_QUEUE;
338our $SLOT_QUEUE; 400our $SLOT_QUEUE;
339 401
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 402$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 403$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager");
405
342 my $signal = new Coro::Signal; 406 my $signal = new Coro::Signal;
343 407
344 while () { 408 while () {
345 next_job: 409 next_job:
346 my $avail = cf::till_tick; 410 my $avail = cf::till_tick;
354 } 418 }
355 } 419 }
356 } 420 }
357 421
358 if (@SLOT_QUEUE) { 422 if (@SLOT_QUEUE) {
359 # 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
360 push @cf::WAIT_FOR_TICK, $signal; 424 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 425 $signal->wait;
362 } else { 426 } else {
363 Coro::schedule; 427 Coro::schedule;
364 } 428 }
365 } 429 }
366}; 430};
367 431
368sub get_slot($;$) { 432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
369 my ($time, $pri) = @_; 435 my ($time, $pri, $name) = @_;
370 436
437 $time = $TICK * .6 if $time > $TICK * .6;
438 my $sig = new Coro::Signal;
439
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 440 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 442 $SLOT_QUEUE->ready;
374 $sig->wait; 443 $sig->wait;
375} 444}
376 445
384 453
385BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
386 455
387=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
388 457
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
391partly 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
392acceptable. 461acceptable.
393 462
394If 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
395the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
400 469
401sub sync_job(&) { 470sub sync_job(&) {
402 my ($job) = @_; 471 my ($job) = @_;
403 472
404 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
405 my $time = Event::time; 474 my $time = EV::time;
406 475
407 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
409 478
410 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 480
412 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
413 482
414 my $busy = 1; 483 my $busy = 1;
415 my @res; 484 my @res;
416 485
417 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 488 @res = eval { $job->() };
419 warn $@ if $@; 489 warn $@ if $@;
420 undef $busy; 490 undef $busy;
421 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
422 492
423 while ($busy) { 493 while ($busy) {
424 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
425 } 498 }
499 }
426 500
427 $time = Event::time - $time; 501 my $time = EV::time - $time;
428 502
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
433 504
434 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
435 } else { 506 } else {
436 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
437 508
462=item fork_call { }, $args 533=item fork_call { }, $args
463 534
464Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
468 539
469=cut 540=cut
470
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479 541
480sub fork_call(&@) { 542sub fork_call(&@) {
481 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
482 544
483# 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,
484# or die "socketpair: $!"; 546 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 547 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 548
488 if (my $pid = fork) { 549 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 550 reset_signals;
502 local $SIG{__WARN__}; 551 &$cb
503 local $SIG{__DIE__}; 552 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 553
510 eval { 554 wantarray ? @res : $res[-1]
511 close $fh1; 555}
512 556
513 my @res = eval { $cb->(@args) }; 557=item $coin = coin_from_name $name
514 558
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 559=cut
516 close $fh2;
517 };
518 560
519 warn $@ if $@; 561our %coin_alias = (
520 _exit 0; 562 "silver" => "silvercoin",
521 } 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
522} 582}
523 583
524=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
525 585
526Returns a single value from the environment database. 586Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 588=item cf::db_put $family => $key => $value
529 589
530Stores 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
531data 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).
532 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
533=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}
534 616
535our $DB; 617our $DB;
536 618
537sub db_init { 619sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 620 cf::sync_job {
542 eval { 621 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 622 };
552} 623}
553 624
554sub db_get($$) { 625sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 626 my $key = "$_[0]/$_[1]";
556 627
606 if (1) { 677 if (1) {
607 $md5 = 678 $md5 =
608 join "\x00", 679 join "\x00",
609 $processversion, 680 $processversion,
610 map { 681 map {
611 Coro::cede; 682 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 683 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 684 } 0.. $#$src;
614 685
615 686
616 my $dbmd5 = db_get cache => "$id/md5"; 687 my $dbmd5 = db_get cache => "$id/md5";
660attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
662 733
663In 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>
664C<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
665Crossfire TRT). 736Deliantra).
666 737
667=over 4 738=over 4
668 739
669=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
670 741
952 } 1023 }
953 1024
954 0 1025 0
955} 1026}
956 1027
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 1029
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1031
961Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
962 1033
968 1039
969=cut 1040=cut
970 1041
971############################################################################# 1042#############################################################################
972# object support 1043# object support
973#
974 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#
975sub _can_merge { 1078sub _can_merge {
976 my ($ob1, $ob2) = @_; 1079 my ($ob1, $ob2) = @_;
977 1080
978 local $Storable::canonical = 1; 1081 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1082
982 $fob1 eq $fob2 1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
983} 1085}
984 1086
985sub reattach { 1087sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1089 my ($obj) = @_;
1009cf::attachable->attach ( 1111cf::attachable->attach (
1010 prio => -1000000, 1112 prio => -1000000,
1011 on_instantiate => sub { 1113 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
1013 1115
1014 $data = from_json $data; 1116 $data = decode_json $data;
1015 1117
1016 for (@$data) { 1118 for (@$data) {
1017 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
1018 1120
1019 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1137sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
1037 1139
1038 sync_job { 1140 sync_job {
1039 if (length $$rdata) { 1141 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
1042 1145
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
1047 close $fh; 1150 aio_close $fh;
1048 1151
1049 if (@$objs) { 1152 if (@$objs) {
1050 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) {
1051 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
1054 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
1055 close $fh; 1158 aio_close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1160 }
1058 } else { 1161 } else {
1059 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
1060 } 1163 }
1065 } 1168 }
1066 } else { 1169 } else {
1067 aio_unlink $filename; 1170 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1069 } 1172 }
1070 } 1173 };
1071} 1174}
1072 1175
1073sub object_freezer_as_string { 1176sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
1075 1178
1087 or return; 1190 or return;
1088 1191
1089 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1194 or return;
1195
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1093 } 1198 }
1094 1199
1200 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1203
1097 return ($data, $av); 1204 ($data, $av)
1098} 1205}
1099 1206
1100=head2 COMMAND CALLBACKS 1207=head2 COMMAND CALLBACKS
1101 1208
1102=over 4 1209=over 4
1175 my ($pl, $buf) = @_; 1282 my ($pl, $buf) = @_;
1176 1283
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1284 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1285
1179 if (ref $msg) { 1286 if (ref $msg) {
1287 my ($type, $reply, @payload) =
1288 "ARRAY" eq ref $msg
1289 ? @$msg
1290 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1291
1292 my @reply;
1293
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1294 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1295 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1296 }
1297
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1185 } else { 1301 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1303 }
1188 1304
1189 cf::override; 1305 cf::override;
1242 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1243 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1244 1360
1245 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1246 warn $msg; 1362 warn $msg;
1247 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1248 exit 1;
1249 } 1364 }
1250 1365
1251 warn $msg; 1366 warn $msg;
1252 } 1367 }
1253 1368
1278use Coro::AIO; 1393use Coro::AIO;
1279 1394
1280=head3 cf::player 1395=head3 cf::player
1281 1396
1282=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}
1283 1412
1284=item cf::player::find $login 1413=item cf::player::find $login
1285 1414
1286Returns the given player object, loading it if necessary (might block). 1415Returns the given player object, loading it if necessary (might block).
1287 1416
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1452 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1453 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1454 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1456
1328 my $pl = load_pl path $login 1457 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1331 } 1466 }
1332 } 1467 }
1333} 1468}
1334 1469
1343 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1344 1479
1345 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1347 1482
1483 cf::get_slot 0.01;
1484
1348 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1349 Coro::cede; 1486 cf::cede_to_tick;
1350} 1487}
1351 1488
1352sub new($) { 1489sub new($) {
1353 my ($login) = @_; 1490 my ($login) = @_;
1354 1491
1360 $cf::PLAYER{$login} = $self; 1497 $cf::PLAYER{$login} = $self;
1361 1498
1362 $self 1499 $self
1363} 1500}
1364 1501
1502=item $player->send_msg ($channel, $msg, $color, [extra...])
1503
1504=cut
1505
1506sub send_msg {
1507 my $ns = shift->ns
1508 or return;
1509 $ns->send_msg (@_);
1510}
1511
1365=item $pl->quit_character 1512=item $pl->quit_character
1366 1513
1367Nukes the player without looking back. If logged in, the connection will 1514Nukes the player without looking back. If logged in, the connection will
1368be destroyed. May block for a long time. 1515be destroyed. May block for a long time.
1369 1516
1377 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1378 $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
1379 1526
1380 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1381 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1382 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1383 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1384 1533
1385 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1386 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1422 or return []; 1571 or return [];
1423 1572
1424 my @logins; 1573 my @logins;
1425 1574
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1584 }
1430 1585
1431 utf8::decode $login; 1586 utf8::decode $login;
1432 push @logins, $login; 1587 push @logins, $login;
1433 } 1588 }
1434 1589
1467 1622
1468Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1469 1624
1470=cut 1625=cut
1471 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
1472sub expand_cfpod { 1638sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1474 1640
1475 # escape & and < 1641 my $xml;
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478 1642
1479 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1480 1646
1481 1 while 1647 $group =~ s/&/&amp;/g;
1482 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1486 # replace G<male|female> tags 1652 ([BCGHITU])
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1653 <
1488 $self->gender ? $2 : $1 1654 (?:
1489 }ge 1655 ([^<>]*) (?{ $group = $^N })
1490 # replace H<hint text> 1656 | < $interior >
1491 || s{H<([^\>]*)>} 1657 )
1658 >
1659 %gcsx
1492 { 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") {
1493 ("<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>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "") 1680 "")
1496 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1497 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1498 1692
1693 for ($xml) {
1499 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1501 1696
1502 # compress some whitespace 1697 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1507 1703
1508 $_ 1704 $xml
1509} 1705}
1706
1707no re 'eval';
1510 1708
1511sub hintmode { 1709sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1711 $_[0]{hintmode}
1514} 1712}
1515 1713
1516=item $player->ext_reply ($msgid, %msg) 1714=item $player->ext_reply ($msgid, @msg)
1517 1715
1518Sends an ext reply to the player. 1716Sends an ext reply to the player.
1519 1717
1520=cut 1718=cut
1521 1719
1522sub ext_reply($$%) { 1720sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1721 my ($self, $id, @msg) = @_;
1524 1722
1525 $msg{msgid} = $id; 1723 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1724}
1528 1725
1529=item $player->ext_event ($type, %msg) 1726=item $player->ext_msg ($type, @msg)
1530 1727
1531Sends an ext event to the client. 1728Sends an ext event to the client.
1532 1729
1533=cut 1730=cut
1534 1731
1535sub ext_event($$%) { 1732sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1733 my ($self, $type, @msg) = @_;
1537 1734
1538 $self->ns->ext_event ($type, %msg); 1735 $self->ns->ext_msg ($type, @msg);
1539} 1736}
1540 1737
1541=head3 cf::region 1738=head3 cf::region
1542 1739
1543=over 4 1740=over 4
1587our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1589 1786
1590sub generate_random_map { 1787sub generate_random_map {
1591 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
1592 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1593 $self->_create_random_map ( 1793 $self->_create_random_map (
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 1918
1719# the temporary/swap location 1919# the temporary/swap location
1720sub save_path { 1920sub save_path {
1721 my ($self) = @_; 1921 my ($self) = @_;
1722 1922
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1725} 1925}
1726 1926
1727# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1728sub uniq_path { 1928sub uniq_path {
1729 my ($self) = @_; 1929 my ($self) = @_;
1730 1930
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1733} 1933}
1734 1934
1735# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1736# all maps in C++... 1936# all maps in C++...
1759 1959
1760sub load_header_from($) { 1960sub load_header_from($) {
1761 my ($self, $path) = @_; 1961 my ($self, $path) = @_;
1762 1962
1763 utf8::encode $path; 1963 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1964 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 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;
1769 1972
1770 $self->{load_path} = $path; 1973 $self->{load_path} = $path;
1771 1974
1772 1 1975 1
1773} 1976}
1827sub find { 2030sub find {
1828 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1829 2032
1830 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1831 2034
2035 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1833 2037
1834 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1835 my $guard = cf::lock_acquire "map_find:$path"; 2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
1836 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1837 or return; 2043 or return;
1838 2044
1839 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1840 2046
1842 or return; 2048 or return;
1843 2049
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2054 undef $guard1;
1847 $map->reset; 2055 $map->reset;
1848 undef $guard;
1849 return find $path; 2056 return find $path;
1850 } 2057 }
1851 2058
1852 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1853 } 2060 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1863 2070
1864 my $path = $self->{path}; 2071 my $path = $self->{path};
1865 2072
1866 { 2073 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2074 my $guard = cf::lock_acquire "map_data:$path";
1868 2075
2076 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2077 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 2078
1871 $self->in_memory (cf::MAP_LOADING); 2079 $self->in_memory (cf::MAP_LOADING);
1872 2080
1873 $self->alloc; 2081 $self->alloc;
1874 2082
1875 $self->pre_load; 2083 $self->pre_load;
1876 Coro::cede; 2084 cf::cede_to_tick;
1877 2085
2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 2088 $self->_load_objects ($f)
1879 or return; 2089 or return;
1880 2090
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
1882 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1883 2093
1884 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2095 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2096 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2098 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2099 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs;
2101 }
1889 } 2102 }
1890 } 2103 }
1891 2104
1892 Coro::cede; 2105 $f->resolve_delayed_derefs;
2106
2107 cf::cede_to_tick;
1893 # now do the right thing for maps 2108 # now do the right thing for maps
1894 $self->link_multipart_objects; 2109 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2110 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2111 unless $self->difficulty;
1897 Coro::cede; 2112 cf::cede_to_tick;
1898 2113
1899 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2115 $self->decay_objects;
1901 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
1902 $self->update_buttons; 2117 $self->update_buttons;
1903 Coro::cede; 2118 cf::cede_to_tick;
1904 $self->set_darkness_map; 2119 $self->set_darkness_map;
1905 Coro::cede; 2120 cf::cede_to_tick;
1906 $self->activate; 2121 $self->activate;
1907 } 2122 }
1908 2123
2124 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME);
2126
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1910 } 2128 }
1911 2129
1912 $self->post_load; 2130 $self->post_load;
1913} 2131}
1914 2132
1923 2141
1924 $self 2142 $self
1925} 2143}
1926 2144
1927# 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
1928sub load_diag { 2146sub load_neighbours {
1929 my ($map) = @_; 2147 my ($map) = @_;
1930 2148
1931 my @diag; # diagonal neighbours 2149 my @neigh; # diagonal neighbours
1932 2150
1933 for (0 .. 3) { 2151 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2152 my $neigh = $map->tile_path ($_)
1935 or next; 2153 or next;
1936 $neigh = find $neigh, $map 2154 $neigh = find $neigh, $map
1937 or next; 2155 or next;
1938 $neigh->load; 2156 $neigh->load;
1939 2157
2158 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2161 }
1943 2162
1944 for (@diag) { 2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2165 my $neigh = find $path, $origin
1946 or next; 2166 or next;
1947 $neigh->load; 2167 $neigh->load;
1948 } 2168 }
1949} 2169}
1950 2170
1955} 2175}
1956 2176
1957sub do_load_sync { 2177sub do_load_sync {
1958 my ($map) = @_; 2178 my ($map) = @_;
1959 2179
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main;
2182
1960 cf::sync_job { $map->load }; 2183 cf::sync_job { $map->load };
1961} 2184}
1962 2185
1963our %MAP_PREFETCH; 2186our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2187our $MAP_PREFETCHER = undef;
1965 2188
1966sub find_async { 2189sub find_async {
1967 my ($path, $origin) = @_; 2190 my ($path, $origin, $load) = @_;
1968 2191
1969 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
1970 2193
1971 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2196 }
1974 2197
1975 undef $MAP_PREFETCH{$path}; 2198 $MAP_PREFETCH{$path} |= $load;
2199
1976 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
1977 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2205 if (my $map = find $k) {
1980 $map->load; 2206 $map->load if $v;
1981 } 2207 }
1982 2208
1983 delete $MAP_PREFETCH{$path}; 2209 delete $MAP_PREFETCH{$k};
1984 } 2210 }
1985 } 2211 }
1986 undef $MAP_PREFETCHER; 2212 undef $MAP_PREFETCHER;
1987 }; 2213 };
1988 $MAP_PREFETCHER->prio (6); 2214 $MAP_PREFETCHER->prio (6);
1991} 2217}
1992 2218
1993sub save { 2219sub save {
1994 my ($self) = @_; 2220 my ($self) = @_;
1995 2221
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2223
1998 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
1999 2225
2000 return unless $self->dirty; 2226 return unless $self->dirty;
2001 2227
2007 return if $self->{deny_save}; 2233 return if $self->{deny_save};
2008 2234
2009 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
2010 2236
2011 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2013 }; 2240 };
2241
2242 cf::get_slot 0.02;
2014 2243
2015 if ($uniq) { 2244 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2247 } else {
2024 my ($self) = @_; 2253 my ($self) = @_;
2025 2254
2026 # save first because save cedes 2255 # save first because save cedes
2027 $self->save; 2256 $self->save;
2028 2257
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2259
2031 return if $self->players; 2260 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
2033 return if $self->{deny_save}; 2262 return if $self->{deny_save};
2034 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2268 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2269}
2038 2270
2039sub reset_at { 2271sub reset_at {
2040 my ($self) = @_; 2272 my ($self) = @_;
2041 2273
2073 if $uniq; 2305 if $uniq;
2074 } 2306 }
2075 2307
2076 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
2077 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2312 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2313
2082 $self->unlink_save; 2314 $self->unlink_save;
2083 $self->destroy; 2315 $self->destroy;
2084} 2316}
2085 2317
2086my $nuke_counter = "aaaa"; 2318my $nuke_counter = "aaaa";
2087 2319
2088sub nuke { 2320sub nuke {
2089 my ($self) = @_; 2321 my ($self) = @_;
2090 2322
2323 {
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2091 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
2092 2327
2093 $self->unlink_save; 2328 $self->unlink_save;
2094 2329
2095 bless $self, "cf::map"; 2330 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2331 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2332 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2333 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2335
2101 $cf::MAP{$self->path} = $self; 2336 $cf::MAP{$self->path} = $self;
2337 }
2102 2338
2103 $self->reset; # polite request, might not happen 2339 $self->reset; # polite request, might not happen
2104} 2340}
2105 2341
2106=item $maps = cf::map::tmp_maps 2342=item $maps = cf::map::tmp_maps
2148 2384
2149sub unique_maps() { 2385sub unique_maps() {
2150 [ 2386 [
2151 map { 2387 map {
2152 utf8::decode $_; 2388 utf8::decode $_;
2153 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2154 ? normalise $_ 2392 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2394 ]
2158} 2395}
2159 2396
2160package cf;
2161
2162=back 2397=back
2163 2398
2164=head3 cf::object 2399=head3 cf::object
2165 2400
2166=cut 2401=cut
2169 2404
2170=over 4 2405=over 4
2171 2406
2172=item $ob->inv_recursive 2407=item $ob->inv_recursive
2173 2408
2174Returns 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.
2175 2411
2176=cut 2412=cut
2177 2413
2178sub inv_recursive_; 2414sub inv_recursive_;
2179sub inv_recursive_ { 2415sub inv_recursive_ {
2182 2418
2183sub inv_recursive { 2419sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2185} 2421}
2186 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
2187package cf; 2451package cf;
2188 2452
2189=back 2453=back
2190 2454
2191=head3 cf::object::player 2455=head3 cf::object::player
2197Sends 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>
2198can 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
2199dialogue with the given NPC character. 2463dialogue with the given NPC character.
2200 2464
2201=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};
2202 2480
2203# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2482# with dialog boxes.
2205#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
2206sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2213 2491
2214 } else { 2492 } else {
2215 my $pl = $self->contr; 2493 my $pl = $self->contr;
2216 2494
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2495 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2498
2226 } else { 2499 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2502 }
2230 } 2503 }
2504}
2505
2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2507
2508=cut
2509
2510sub cf::object::send_msg {
2511 my $pl = shift->contr
2512 or return;
2513 $pl->send_msg (@_);
2231} 2514}
2232 2515
2233=item $player_object->may ("access") 2516=item $player_object->may ("access")
2234 2517
2235Returns wether the given player is authorized to access resource "access" 2518Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2597 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2598 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2599 if $x <=0 && $y <= 0;
2317 2600
2318 $map->load; 2601 $map->load;
2319 $map->load_diag; 2602 $map->load_neighbours;
2320 2603
2321 return unless $self->contr->active; 2604 return unless $self->contr->active;
2322 $self->activate_recursive; 2605 $self->activate_recursive;
2323 2606
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2331her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2332that has to return the map if sucecssful, and then unfreezes the player on 2615that has to return the map if sucecssful, and then unfreezes the player on
2333the new (success) or old (failed) map position. In either case, $done will 2616the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process. 2617be called at the end of this process.
2335 2618
2619Note that $check will be called with a potentially non-loaded map, so if
2620it needs a loaded map it has to call C<< ->load >>.
2621
2336=cut 2622=cut
2337 2623
2338our $GOTOGEN; 2624our $GOTOGEN;
2339 2625
2340sub cf::object::player::goto { 2626sub cf::object::player::goto {
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2631
2346 $self->enter_link; 2632 $self->enter_link;
2347 2633
2348 (async { 2634 (async {
2635 $Coro::current->{desc} = "player::goto $path $x $y";
2636
2637 # *tag paths override both path and x|y
2638 if ($path =~ /^\*(.*)$/) {
2639 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2640 my $ob = $obs[rand @obs];
2641
2642 # see if we actually can go there
2643 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2644 $ob = $obs[rand @obs];
2645 } else {
2646 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2647 }
2648 # else put us there anyways for now #d#
2649
2650 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2651 } else {
2652 ($path, $x, $y) = (undef, undef, undef);
2653 }
2654 }
2655
2349 my $map = eval { 2656 my $map = eval {
2350 my $map = cf::map::find $path; 2657 my $map = defined $path ? cf::map::find $path : undef;
2351 2658
2352 if ($map) { 2659 if ($map) {
2353 $map = $map->customise_for ($self); 2660 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2661 $map = $check->($map) if $check && $map;
2355 } else { 2662 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2664 }
2358 2665
2359 $map 2666 $map
2360 }; 2667 };
2361 2668
2397} 2704}
2398 2705
2399sub prepare_random_map { 2706sub prepare_random_map {
2400 my ($exit) = @_; 2707 my ($exit) = @_;
2401 2708
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2711 # that depends on the exit object
2407 2712
2408 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2715 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2415 } 2722 }
2416 2723
2417 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2418 2725
2419 my $data = cf::to_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2422 2729
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2732 undef $fh;
2426 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2427 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2430 } 2741 }
2431} 2742}
2432 2743
2433sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2435 2746
2436 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2437 2748
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2749 $self->enter_link;
2450 2750
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2751 (async {
2456 $self->deactivate_recursive; # just to be sure 2752 $Coro::current->{desc} = "enter_exit";
2753
2457 unless (eval { 2754 unless (eval {
2755 $self->deactivate_recursive; # just to be sure
2756
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2766 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp;
2768
2458 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2459 2770
2771 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED);
2774
2460 1; 2775 1
2461 }) { 2776 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2463 . "I'll try to bring you back to the map you were before. " 2778 . "I'll try to bring you back to the map you were before. "
2464 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2810the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2811the message unless the client supports the msg packet.
2497 2812
2498=cut 2813=cut
2499 2814
2815# non-persistent channels (usually the info channel)
2816our %CHANNEL = (
2817 "c/identify" => {
2818 id => "infobox",
2819 title => "Identify",
2820 reply => undef,
2821 tooltip => "Items recently identified",
2822 },
2823 "c/examine" => {
2824 id => "infobox",
2825 title => "Examine",
2826 reply => undef,
2827 tooltip => "Signs and other items you examined",
2828 },
2829 "c/book" => {
2830 id => "infobox",
2831 title => "Book",
2832 reply => undef,
2833 tooltip => "The contents of a note or book",
2834 },
2835 "c/lookat" => {
2836 id => "infobox",
2837 title => "Look",
2838 reply => undef,
2839 tooltip => "What you saw there",
2840 },
2841 "c/who" => {
2842 id => "infobox",
2843 title => "Players",
2844 reply => undef,
2845 tooltip => "Shows players who are currently online",
2846 },
2847 "c/body" => {
2848 id => "infobox",
2849 title => "Body Parts",
2850 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available",
2852 },
2853 "c/uptime" => {
2854 id => "infobox",
2855 title => "Uptime",
2856 reply => undef,
2857 tooltip => "How long the server has been running since last restart",
2858 },
2859 "c/mapinfo" => {
2860 id => "infobox",
2861 title => "Map Info",
2862 reply => undef,
2863 tooltip => "Information related to the maps",
2864 },
2865 "c/party" => {
2866 id => "party",
2867 title => "Party",
2868 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party",
2870 },
2871);
2872
2500sub cf::client::send_msg { 2873sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2875
2503 $msg = $self->pl->expand_cfpod ($msg); 2876 $msg = $self->pl->expand_cfpod ($msg);
2504 2877
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2878 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 2879
2880 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel};
2883
2884 $self->ext_msg (channel_info => $channel)
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id};
2888
2507 if (ref $channel) { 2889 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2890 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2891 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2892 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2893 $self->ext_msg (channel_info => $channel)
2894 if $self->can_msg;
2512 } 2895 }
2513 2896
2514 $channel = $channel->{id}; 2897 $channel = $channel->{id};
2515 } 2898 }
2516 2899
2517 return unless @extra || length $msg; 2900 return unless @extra || length $msg;
2518 2901
2519 if ($self->can_msg) { 2902 if ($self->can_msg) {
2903 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF;
2906
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2907 $self->send_packet ("msg " . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2909 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920
2921 $color &= cf::NDI_COLOR_MASK;
2922
2923 utf8::encode $msg;
2924
2533 if (0 && $msg =~ /\[/) { 2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2928 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2930 $self->send_packet ("drawinfo $color $msg")
2538 } 2931 }
2539 } 2932 }
2540 } 2933 }
2541} 2934}
2542 2935
2543=item $client->ext_event ($type, %msg) 2936=item $client->ext_msg ($type, @msg)
2544 2937
2545Sends an ext event to the client. 2938Sends an ext event to the client.
2546 2939
2547=cut 2940=cut
2548 2941
2549sub cf::client::ext_event($$%) { 2942sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2943 my ($self, $type, @msg) = @_;
2551 2944
2552 return unless $self->extcmd; 2945 if ($self->extcmd == 2) {
2553 2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2948 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951}
2952
2953=item $client->ext_reply ($msgid, @msg)
2954
2955Sends an ext reply to the client.
2956
2957=cut
2958
2959sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_;
2961
2962 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 }
2556} 2969}
2557 2970
2558=item $success = $client->query ($flags, "text", \&cb) 2971=item $success = $client->query ($flags, "text", \&cb)
2559 2972
2560Queues a query to the client, calling the given callback with 2973Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 3028 my ($ns, $buf) = @_;
2616 3029
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3030 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 3031
2619 if (ref $msg) { 3032 if (ref $msg) {
3033 my ($type, $reply, @payload) =
3034 "ARRAY" eq ref $msg
3035 ? @$msg
3036 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3037
3038 my @reply;
3039
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3040 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 3041 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 3042 }
3043
3044 $ns->ext_reply ($reply, @reply)
3045 if $reply;
3046
2626 } else { 3047 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 3049 }
2629 3050
2630 cf::override; 3051 cf::override;
2677our $safe = new Safe "safe"; 3098our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3099our $safe_hole = new Safe::Hole;
2679 3100
2680$SIG{FPE} = 'IGNORE'; 3101$SIG{FPE} = 'IGNORE';
2681 3102
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3103$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math
3105 grepstart grepwhile mapstart mapwhile
3106 sort time
3107));
2683 3108
2684# here we export the classes and methods available to script code 3109# here we export the classes and methods available to script code
2685 3110
2686=pod 3111=pod
2687 3112
2688The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
2689 3114
2690 cf::object 3115 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3116 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3117 insert remove name archname title slaying race decrease split
2693 3118
2694 cf::object::player 3119 cf::object::player
2695 player 3120 player
2696 3121
2697 cf::player 3122 cf::player
2702 3127
2703=cut 3128=cut
2704 3129
2705for ( 3130for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 3132 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)],
2708 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
2711) { 3137) {
2712 no strict 'refs'; 3138 no strict 'refs';
2788# the server's init and main functions 3214# the server's init and main functions
2789 3215
2790sub load_facedata($) { 3216sub load_facedata($) {
2791 my ($path) = @_; 3217 my ($path) = @_;
2792 3218
3219 # HACK to clear player env face cache, we need some signal framework
3220 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = ();
3222
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224
2793 warn "loading facedata from $path\n"; 3225 warn "loading facedata from $path\n";
2794 3226
2795 my $facedata; 3227 my $facedata;
2796 0 < aio_load $path, $facedata 3228 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 3229 or die "$path: $!";
2799 $facedata = Coro::Storable::thaw $facedata; 3231 $facedata = Coro::Storable::thaw $facedata;
2800 3232
2801 $facedata->{version} == 2 3233 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3234 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3235
3236 # patch in the exptable
3237 $facedata->{resource}{"res/exp_table"} = {
3238 type => FT_RSRC,
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3240 };
3241 cf::cede_to_tick;
3242
2804 { 3243 {
2805 my $faces = $facedata->{faceinfo}; 3244 my $faces = $facedata->{faceinfo};
2806 3245
2807 while (my ($face, $info) = each %$faces) { 3246 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3247 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248
2809 cf::face::set_visibility $idx, $info->{visibility}; 3249 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3250 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3253
2814 cf::cede_to_tick; 3254 cf::cede_to_tick;
2815 } 3255 }
2816 3256
2817 while (my ($face, $info) = each %$faces) { 3257 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3258 next unless $info->{smooth};
3259
2819 my $idx = cf::face::find $face 3260 my $idx = cf::face::find $face
2820 or next; 3261 or next;
3262
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3263 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3264 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3266 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3267 warn "smooth face '$info->{smooth}' not found for face '$face'";
2842 3284
2843 { 3285 {
2844 # TODO: for gcfclient pleasure, we should give resources 3286 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3287 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3288 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3289
2849 while (my ($name, $info) = each %$res) { 3290 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3291 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3292 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
2857 3294
2858 if ($name =~ /\.jpg$/) { 3295 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3296 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type};
2861 } else { 3310 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3311 $RESOURCE{$name} = $info;
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3312 }
2868 3313
2869 cf::cede_to_tick; 3314 cf::cede_to_tick;
2870 } 3315 }
2871 } 3316 }
2872 3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319
2873 1 3320 1
2874} 3321}
2875 3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3342
3343register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_;
3345
3346 while (my ($k, $v) = each %$want) {
3347 $ns->fx_want ($k, $v);
3348 }
3349};
3350
3351sub load_resource_file($) {
3352 my $guard = lock_acquire "load_resource_file";
3353
3354 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100;
3356 cf::arch::commit_load;
3357
3358 $status
3359}
3360
2876sub reload_regions { 3361sub reload_regions {
3362 # HACK to clear player env face cache, we need some signal framework
3363 # for this (global event?)
3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3365
2877 load_resource_file "$MAPDIR/regions" 3366 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3367 or die "unable to load regions file\n";
2879 3368
2880 for (cf::region::list) { 3369 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3370 $_->{match} = qr/$_->{match}/
2889} 3378}
2890 3379
2891sub reload_archetypes { 3380sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2899} 3383}
2900 3384
2901sub reload_treasures { 3385sub reload_treasures {
2902 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
2903 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
2904} 3388}
2905 3389
2906sub reload_resources { 3390sub reload_resources {
2907 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
2908 3392
3393 reload_facedata;
3394 reload_archetypes;
2909 reload_regions; 3395 reload_regions;
2910 reload_facedata;
2911 #reload_archetypes;#d#
2912 reload_archetypes;
2913 reload_treasures; 3396 reload_treasures;
2914 3397
2915 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
2916} 3399}
2917 3400
2918sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
2919 reload_resources; 3406 reload_resources;
2920} 3407}
2921 3408
2922sub cfg_load { 3409sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3411 or return;
2925 3412
2926 local $/; 3413 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
2928 3415
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2930 3417
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2932 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2943sub main { 3430sub main {
2944 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3434 (async {
2948 Event::one_event; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
2950 }; 3438 };
2951 3439
2952 cfg_load; 3440 {
3441 my $guard = freeze_mainloop;
3442 reload_config;
2953 db_init; 3443 db_init;
2954 load_extensions; 3444 load_extensions;
2955 3445
2956 $TICK_WATCHER->start; 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
2957 Event::loop; 3449 EV::loop;
2958} 3450}
2959 3451
2960############################################################################# 3452#############################################################################
2961# initialisation and cleanup 3453# initialisation and cleanup
2962 3454
2963# install some emergency cleanup handlers 3455# install some emergency cleanup handlers
2964BEGIN { 3456BEGIN {
3457 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3458 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3459 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
2973 },
2974 ); 3461 };
2975 } 3462 }
2976} 3463}
2977 3464
2978sub write_runtime { 3465sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
2980 3467
2981 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
2983 3470
3009 and return; 3496 and return;
3010 3497
3011 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3012 3499
3013 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3518 $uuid_skip = 0;
3519
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return;
3522
3523 # always fsync - this file is important
3524 aio_fsync $fh
3525 and return;
3526
3527 close $fh
3528 or return;
3529
3530 aio_rename "$uuid~", $uuid
3531 and return;
3532
3533 warn "uuid file written ($value).\n";
3534
3535 1
3536
3537}
3538
3539sub write_uuid($$) {
3540 my ($skip, $sync) = @_;
3541
3542 $sync ? write_uuid_sync $skip
3543 : async { write_uuid_sync $skip };
3014} 3544}
3015 3545
3016sub emergency_save() { 3546sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
3018 3548
3024 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3555 warn "begin emergency player save\n";
3026 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3560 $pl->save;
3030 } 3561 }
3031 warn "end emergency player save\n"; 3562 warn "end emergency player save\n";
3032 3563
3033 warn "begin emergency map save\n"; 3564 warn "begin emergency map save\n";
3039 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
3040 3571
3041 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3043 warn "end emergency database checkpoint\n"; 3574 warn "end emergency database checkpoint\n";
3575
3576 warn "begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "end write uuid\n";
3044 }; 3579 };
3045 3580
3046 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
3047} 3582}
3048 3583
3063 warn "reloading..."; 3598 warn "reloading...";
3064 3599
3065 warn "entering sync_job"; 3600 warn "entering sync_job";
3066 3601
3067 cf::sync_job { 3602 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
3069 cf::emergency_save; 3604 cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3071 3606
3072 warn "syncing database to disk"; 3607 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
3074 3609
3075 # if anything goes wrong in here, we should simply crash as we already saved 3610 # if anything goes wrong in here, we should simply crash as we already saved
3076
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081 3611
3082 warn "flushing outstanding aio requests"; 3612 warn "flushing outstanding aio requests";
3083 for (;;) { 3613 for (;;) {
3084 BDB::flush; 3614 BDB::flush;
3085 IO::AIO::flush; 3615 IO::AIO::flush;
3086 Coro::cede; 3616 Coro::cede_notself;
3087 last unless IO::AIO::nreqs || BDB::nreqs; 3617 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate..."; 3618 warn "iterate...";
3089 } 3619 }
3090 3620
3091 ++$RELOAD; 3621 ++$RELOAD;
3150 warn "reloading cf.pm"; 3680 warn "reloading cf.pm";
3151 require cf; 3681 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3683
3154 warn "loading config and database again"; 3684 warn "loading config and database again";
3155 cf::cfg_load; 3685 cf::reload_config;
3156 3686
3157 warn "loading extensions"; 3687 warn "loading extensions";
3158 cf::load_extensions; 3688 cf::load_extensions;
3159 3689
3160 warn "reattaching attachments to objects/players"; 3690 warn "reattaching attachments to objects/players";
3167 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3168 3698
3169 1 3699 1
3170 } or do { 3700 } or do {
3171 warn $@; 3701 warn $@;
3172 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3173 exit 1;
3174 }; 3703 };
3175 3704
3176 warn "reloaded"; 3705 warn "reloaded";
3177}; 3706};
3178 3707
3180 3709
3181sub reload_perl() { 3710sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3184 3713
3185 $RELOAD_WATCHER ||= Event->timer ( 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3186 reentrant => 0,
3187 after => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => sub {
3190 do_reload_perl; 3715 do_reload_perl;
3191 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3192 },
3193 ); 3717 };
3194} 3718}
3195 3719
3196register_command "reload" => sub { 3720register_command "reload" => sub {
3197 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
3198 3722
3199 if ($who->flag (FLAG_WIZ)) { 3723 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 3724 $who->message ("reloading server.");
3725 async {
3726 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 3727 reload_perl;
3728 };
3202 } 3729 }
3203}; 3730};
3204 3731
3205unshift @INC, $LIBDIR; 3732unshift @INC, $LIBDIR;
3206 3733
3208 3735
3209our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3211 3738
3212sub wait_for_tick { 3739sub wait_for_tick {
3213 return unless $TICK_WATCHER->is_active;
3214 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3215 3741
3216 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 3744 $signal->wait;
3219} 3745}
3220 3746
3221sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3222 return unless $TICK_WATCHER->is_active;
3223 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3224 3749
3225 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3752 $signal->wait;
3228} 3753}
3229 3754
3230 my $min = 1e6;#d# 3755sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3242 return; 3759 return;
3243 } 3760 }
3244 3761
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3248 3763
3249 0 && sync_job {#d# 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3250 for(1..10) { 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3251 my $t = Event::time; 3766 Coro::async_pool {
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3767 $Coro::current->{desc} = "runtime saver";
3253 or die; 3768 write_runtime_sync
3254 3769 or warn "ERROR: unable to write runtime file: $!";
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 3770 };
3771 }
3271 3772
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3774 $sig->send;
3288 } 3775 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3777 $sig->send;
3291 } 3778 }
3292 3779
3293 $NOW = Event::time; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3782
3304 _post_tick; 3783 if (0) {
3305 3784 if ($NEXT_TICK) {
3306 3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
3307 }, 3789 }
3308); 3790}
3309 3791
3310{ 3792{
3311 BDB::max_poll_time $TICK * 0.1; 3793 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 3794
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3321 3796 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 3797 $AnyEvent::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 3798
3337 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3800 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3803 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3804 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3805 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3806
3340 cf::sync_job { 3807 cf::sync_job {
3341 eval { 3808 eval {
3342 BDB::db_env_open 3809 BDB::db_env_open
3343 $DB_ENV, 3810 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3812 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3813 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3814 0666;
3348 3815
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3816 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3817 };
3354 3818
3355 cf::cleanup "db_env_open(db): $@" if $@; 3819 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3820 };
3357 } 3821 }
3822
3823 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3824 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3825 };
3826 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3827 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3828 };
3829 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3830 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3831 };
3358} 3832}
3359 3833
3360{ 3834{
3835 # configure IO::AIO
3836
3361 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 3839 undef $AnyEvent::AIO::WATCHER;
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 3840}
3374 3841
3375my $_log_backtrace; 3842my $_log_backtrace;
3376 3843
3377sub _log_backtrace { 3844sub _log_backtrace {
3381 3848
3382 # limit the # of concurrent backtraces 3849 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 3850 if ($_log_backtrace < 2) {
3384 ++$_log_backtrace; 3851 ++$_log_backtrace;
3385 async { 3852 async {
3853 $Coro::current->{desc} = "abt $msg";
3854
3386 my @bt = fork_call { 3855 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 3856 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3857 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3858 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 3859 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines