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.306 by root, Sat Jul 14 14:33:30 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
169returns directly I<after> the tick processing (and consequently, can only wake one process 192returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 193per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 194
195=item @cf::INVOKE_RESULTS
196
197This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call.
200
172=back 201=back
173 202
174=cut 203=cut
175 204
176BEGIN { 205BEGIN {
180 $msg .= "\n" 209 $msg .= "\n"
181 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
182 211
183 $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;
184 213
185 utf8::encode $msg;
186 LOG llevError, $msg; 214 LOG llevError, $msg;
187 }; 215 };
188} 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#?
189 232
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206)) { 249)) {
207 no strict 'refs'; 250 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 252}
210 253
211$Event::DIED = sub { 254$EV::DIED = sub {
212 warn "error in event callback: @_"; 255 warn "error in event callback: @_";
213}; 256};
214 257
215############################################################################# 258#############################################################################
216 259
239 $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;
240 $d 283 $d
241 } || "[unable to dump $_[0]: '$@']"; 284 } || "[unable to dump $_[0]: '$@']";
242} 285}
243 286
244=item $ref = cf::from_json $json 287=item $ref = cf::decode_json $json
245 288
246Converts a JSON string into the corresponding perl data structure. 289Converts a JSON string into the corresponding perl data structure.
247 290
248=item $json = cf::to_json $ref 291=item $json = cf::encode_json $ref
249 292
250Converts a perl data structure into its JSON representation. 293Converts a perl data structure into its JSON representation.
251 294
252=cut 295=cut
253 296
254our $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
255 298
256sub to_json ($) { $json_coder->encode ($_[0]) } 299sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 300sub decode_json($) { $json_coder->decode ($_[0]) }
258 301
259=item cf::lock_wait $string 302=item cf::lock_wait $string
260 303
261Wait until the given lock is available. See cf::lock_acquire. 304Wait until the given lock is available. See cf::lock_acquire.
262 305
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 310for example when the coroutine gets canceled), the lock is automatically
268returned. 311returned.
269 312
313Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro.
315
270Lock 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
271uses map_find and cf::map::load uses map_load). 317uses map_find and cf::map::load uses map_load).
272 318
273=item $locked = cf::lock_active $string 319=item $locked = cf::lock_active $string
274 320
275Return 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.
276 322
277=cut 323=cut
278 324
279our %LOCK; 325our %LOCK;
326our %LOCKER;#d#
280 327
281sub lock_wait($) { 328sub lock_wait($) {
282 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#
283 335
284 # wait for lock, if any 336 # wait for lock, if any
285 while ($LOCK{$key}) { 337 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 338 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 339 Coro::schedule;
293 345
294 # wait, to be sure we are not locked 346 # wait, to be sure we are not locked
295 lock_wait $key; 347 lock_wait $key;
296 348
297 $LOCK{$key} = []; 349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
298 351
299 Coro::guard { 352 Coro::guard {
353 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 354 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 355 $_->ready for @{ delete $LOCK{$key} };
302 } 356 }
303} 357}
304 358
307 361
308 ! ! $LOCK{$key} 362 ! ! $LOCK{$key}
309} 363}
310 364
311sub freeze_mainloop { 365sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 366 tick_inhibit_inc;
313 367
314 my $guard = Coro::guard { 368 Coro::guard \&tick_inhibit_dec;
315 $TICK_WATCHER->start; 369}
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
386=item cf::get_slot $time[, $priority[, $name]]
387
388Allocate $time seconds of blocking CPU time at priority C<$priority>:
389This call blocks and returns only when you have at least C<$time> seconds
390of cpu time till the next tick. The slot is only valid till the next cede.
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
395Useful for short background jobs.
396
397=cut
398
399our @SLOT_QUEUE;
400our $SLOT_QUEUE;
401
402$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager");
405
406 my $signal = new Coro::Signal;
407
408 while () {
409 next_job:
410 my $avail = cf::till_tick;
411 if ($avail > 0.01) {
412 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) {
414 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send;
416 Coro::cede;
417 goto next_job;
418 }
419 }
420 }
421
422 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait;
426 } else {
427 Coro::schedule;
428 }
316 }; 429 }
317 $TICK_WATCHER->stop; 430};
318 $guard 431
432sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main;
434
435 my ($time, $pri, $name) = @_;
436
437 $time = $TICK * .6 if $time > $TICK * .6;
438 my $sig = new Coro::Signal;
439
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready;
443 $sig->wait;
319} 444}
320 445
321=item cf::async { BLOCK } 446=item cf::async { BLOCK }
322 447
323Currently the same as Coro::async_pool, meaning you cannot use 448Currently the same as Coro::async_pool, meaning you cannot use
328 453
329BEGIN { *async = \&Coro::async_pool } 454BEGIN { *async = \&Coro::async_pool }
330 455
331=item cf::sync_job { BLOCK } 456=item cf::sync_job { BLOCK }
332 457
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 458The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 459is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 461acceptable.
337 462
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 464the given BLOCK in another coroutine while waiting for the result. The
344 469
345sub sync_job(&) { 470sub sync_job(&) {
346 my ($job) = @_; 471 my ($job) = @_;
347 472
348 if ($Coro::current == $Coro::main) { 473 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 474 my $time = EV::time;
350 475
351 # this is the main coro, too bad, we have to block 476 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 477 # till the operation succeeds, freezing the server :/
353 478
354 # TODO: use suspend/resume instead 479 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 480
356 my $freeze_guard = freeze_mainloop; 481 my $freeze_guard = freeze_mainloop;
357 482
358 my $busy = 1; 483 my $busy = 1;
359 my @res; 484 my @res;
360 485
361 (async { 486 (async {
487 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 488 @res = eval { $job->() };
363 warn $@ if $@; 489 warn $@ if $@;
364 undef $busy; 490 undef $busy;
365 })->prio (Coro::PRIO_MAX); 491 })->prio (Coro::PRIO_MAX);
366 492
367 while ($busy) { 493 while ($busy) {
368 Coro::cede or Event::one_event; 494 if (Coro::nready) {
495 Coro::cede_notself;
496 } else {
497 EV::loop EV::LOOP_ONESHOT;
369 } 498 }
499 }
370 500
371 $time = Event::time - $time; 501 my $time = EV::time - $time;
372 502
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 503 $TICK_START += $time; # do not account sync jobs to server load
377 504
378 wantarray ? @res : $res[0] 505 wantarray ? @res : $res[0]
379 } else { 506 } else {
380 # we are in another coroutine, how wonderful, everything just works 507 # we are in another coroutine, how wonderful, everything just works
381 508
406=item fork_call { }, $args 533=item fork_call { }, $args
407 534
408Executes the given code block with the given arguments in a seperate 535Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 536process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 537Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 538never block itself or use any form of event handling.
412 539
413=cut 540=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 541
424sub fork_call(&@) { 542sub fork_call(&@) {
425 my ($cb, @args) = @_; 543 my ($cb, @args) = @_;
426 544
427# 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,
428# or die "socketpair: $!"; 546 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 547 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 548
432 if (my $pid = fork) { 549 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 550 reset_signals;
446 local $SIG{__WARN__}; 551 &$cb
447 local $SIG{__DIE__}; 552 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 553
454 eval { 554 wantarray ? @res : $res[-1]
455 close $fh1; 555}
456 556
457 my @res = eval { $cb->(@args) }; 557=item $coin = coin_from_name $name
458 558
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 559=cut
460 close $fh2;
461 };
462 560
463 warn $@ if $@; 561our %coin_alias = (
464 _exit 0; 562 "silver" => "silvercoin",
465 } 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
466} 582}
467 583
468=item $value = cf::db_get $family => $key 584=item $value = cf::db_get $family => $key
469 585
470Returns a single value from the environment database. 586Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 588=item cf::db_put $family => $key => $value
473 589
474Stores 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
475data 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).
476 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
477=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}
478 616
479our $DB; 617our $DB;
480 618
481sub db_init { 619sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 620 cf::sync_job {
486 eval { 621 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 622 };
496} 623}
497 624
498sub db_get($$) { 625sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 626 my $key = "$_[0]/$_[1]";
500 627
550 if (1) { 677 if (1) {
551 $md5 = 678 $md5 =
552 join "\x00", 679 join "\x00",
553 $processversion, 680 $processversion,
554 map { 681 map {
555 Coro::cede; 682 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 683 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 684 } 0.. $#$src;
558 685
559 686
560 my $dbmd5 = db_get cache => "$id/md5"; 687 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 731attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 732to it. All such attachable objects support the following methods.
606 733
607In 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>
608C<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
609Crossfire TRT). 736Deliantra).
610 737
611=over 4 738=over 4
612 739
613=item $attachable->attach ($attachment, key => $value...) 740=item $attachable->attach ($attachment, key => $value...)
614 741
866 "; 993 ";
867 die if $@; 994 die if $@;
868} 995}
869 996
870our $override; 997our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 998our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 999
873sub override { 1000sub override {
874 $override = 1; 1001 $override = 1;
875 @invoke_results = (); 1002 @INVOKE_RESULTS = (@_);
876} 1003}
877 1004
878sub do_invoke { 1005sub do_invoke {
879 my $event = shift; 1006 my $event = shift;
880 my $callbacks = shift; 1007 my $callbacks = shift;
881 1008
882 @invoke_results = (); 1009 @INVOKE_RESULTS = ();
883 1010
884 local $override; 1011 local $override;
885 1012
886 for (@$callbacks) { 1013 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1014 eval { &{$_->[1]} };
896 } 1023 }
897 1024
898 0 1025 0
899} 1026}
900 1027
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1028=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1029
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1031
905Generate an object-specific event with the given arguments. 1032Generate an object-specific event with the given arguments.
906 1033
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1034This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1035removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1036results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1037
911=back 1038=back
912 1039
913=cut 1040=cut
914 1041
915############################################################################# 1042#############################################################################
916# object support 1043# object support
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#
1078sub _can_merge {
1079 my ($ob1, $ob2) = @_;
1080
1081 ++$SLOW_MERGES;#d#
1082
1083 # we do the slow way here
1084 return _object_equal $ob1, $ob2
1085}
917 1086
918sub reattach { 1087sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1088 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1089 my ($obj) = @_;
921 1090
942cf::attachable->attach ( 1111cf::attachable->attach (
943 prio => -1000000, 1112 prio => -1000000,
944 on_instantiate => sub { 1113 on_instantiate => sub {
945 my ($obj, $data) = @_; 1114 my ($obj, $data) = @_;
946 1115
947 $data = from_json $data; 1116 $data = decode_json $data;
948 1117
949 for (@$data) { 1118 for (@$data) {
950 my ($name, $args) = @$_; 1119 my ($name, $args) = @$_;
951 1120
952 $obj->attach ($name, %{$args || {} }); 1121 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1137sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1138 my ($filename, $rdata, $objs) = @_;
970 1139
971 sync_job { 1140 sync_job {
972 if (length $$rdata) { 1141 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1143 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1144 $decname, length $$rdata, scalar @$objs;
975 1145
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1147 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1149 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1150 aio_close $fh;
981 1151
982 if (@$objs) { 1152 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1156 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1157 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1158 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1159 aio_rename "$filename.pst~", "$filename.pst";
990 } 1160 }
991 } else { 1161 } else {
992 aio_unlink "$filename.pst"; 1162 aio_unlink "$filename.pst";
993 } 1163 }
998 } 1168 }
999 } else { 1169 } else {
1000 aio_unlink $filename; 1170 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1002 } 1172 }
1003 } 1173 };
1004} 1174}
1005 1175
1006sub object_freezer_as_string { 1176sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1177 my ($rdata, $objs) = @_;
1008 1178
1020 or return; 1190 or return;
1021 1191
1022 unless (aio_stat "$filename.pst") { 1192 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1193 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1194 or return;
1195
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1196 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs};
1026 } 1198 }
1027 1199
1200 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1201 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1202 $decname, length $data, scalar @{$av || []};
1203
1030 return ($data, $av); 1204 ($data, $av)
1031} 1205}
1032 1206
1033=head2 COMMAND CALLBACKS 1207=head2 COMMAND CALLBACKS
1034 1208
1035=over 4 1209=over 4
1108 my ($pl, $buf) = @_; 1282 my ($pl, $buf) = @_;
1109 1283
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1284 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1285
1112 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
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1294 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1295 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1296 }
1297
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1118 } else { 1301 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1303 }
1121 1304
1122 cf::override; 1305 cf::override;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1358 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1359 : "$v->{base}: extension inactive.\n";
1177 1360
1178 if (exists $v->{meta}{mandatory}) { 1361 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1362 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1363 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1364 }
1183 1365
1184 warn $msg; 1366 warn $msg;
1185 } 1367 }
1186 1368
1211use Coro::AIO; 1393use Coro::AIO;
1212 1394
1213=head3 cf::player 1395=head3 cf::player
1214 1396
1215=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}
1216 1412
1217=item cf::player::find $login 1413=item cf::player::find $login
1218 1414
1219Returns the given player object, loading it if necessary (might block). 1415Returns the given player object, loading it if necessary (might block).
1220 1416
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1452 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1453 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1454 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1455 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1456
1261 my $pl = load_pl path $login 1457 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1465 $cf::PLAYER{$login} = $pl
1264 } 1466 }
1265 } 1467 }
1266} 1468}
1267 1469
1276 return if $pl->{deny_save}; 1478 return if $pl->{deny_save};
1277 1479
1278 aio_mkdir playerdir $pl, 0770; 1480 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1481 $pl->{last_save} = $cf::RUNTIME;
1280 1482
1483 cf::get_slot 0.01;
1484
1281 $pl->save_pl ($path); 1485 $pl->save_pl ($path);
1282 Coro::cede; 1486 cf::cede_to_tick;
1283} 1487}
1284 1488
1285sub new($) { 1489sub new($) {
1286 my ($login) = @_; 1490 my ($login) = @_;
1287 1491
1293 $cf::PLAYER{$login} = $self; 1497 $cf::PLAYER{$login} = $self;
1294 1498
1295 $self 1499 $self
1296} 1500}
1297 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
1298=item $pl->quit_character 1512=item $pl->quit_character
1299 1513
1300Nukes the player without looking back. If logged in, the connection will 1514Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1515be destroyed. May block for a long time.
1302 1516
1310 $pl->{deny_save} = 1; 1524 $pl->{deny_save} = 1;
1311 $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
1312 1526
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1528 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1531 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1532 $pl->ns->destroy if $pl->ns;
1317 1533
1318 my $path = playerdir $pl; 1534 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1535 my $temp = "$path~$cf::RUNTIME~deleting~";
1355 or return []; 1571 or return [];
1356 1572
1357 my @logins; 1573 my @logins;
1358 1574
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1581 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1582 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1583 $buf !~ /^password -------------$/m or next; # official not-valid tag
1584 }
1363 1585
1364 utf8::decode $login; 1586 utf8::decode $login;
1365 push @logins, $login; 1587 push @logins, $login;
1366 } 1588 }
1367 1589
1400 1622
1401Expand crossfire pod fragments into protocol xml. 1623Expand crossfire pod fragments into protocol xml.
1402 1624
1403=cut 1625=cut
1404 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
1405sub expand_cfpod { 1638sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1639 my ($self, $pod) = @_;
1407 1640
1408 # escape & and < 1641 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1642
1412 # this is buggy, it needs to properly take care of nested <'s 1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1413 1646
1414 1 while 1647 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1648 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1649
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1650 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1651 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1652 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1653 <
1421 $self->gender ? $2 : $1 1654 (?:
1422 }ge 1655 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1656 | < $interior >
1424 || s{H<([^\>]*)>} 1657 )
1658 >
1659 %gcsx
1425 { 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") {
1426 ("<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>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1680 "")
1429 [$self->{hintmode}] 1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1431 1692
1693 for ($xml) {
1432 # create single paragraphs (very hackish) 1694 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1695 s/(?<=\S)\n(?=\w)/ /g;
1434 1696
1435 # compress some whitespace 1697 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1698 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1699 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1700 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1701 s/\n+$//; # ending lines
1702 }
1440 1703
1441 $_ 1704 $xml
1442} 1705}
1706
1707no re 'eval';
1443 1708
1444sub hintmode { 1709sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1711 $_[0]{hintmode}
1447} 1712}
1448 1713
1449=item $player->ext_reply ($msgid, %msg) 1714=item $player->ext_reply ($msgid, @msg)
1450 1715
1451Sends an ext reply to the player. 1716Sends an ext reply to the player.
1452 1717
1453=cut 1718=cut
1454 1719
1455sub ext_reply($$%) { 1720sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1721 my ($self, $id, @msg) = @_;
1457 1722
1458 $msg{msgid} = $id; 1723 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1724}
1461 1725
1462=item $player->ext_event ($type, %msg) 1726=item $player->ext_msg ($type, @msg)
1463 1727
1464Sends an ext event to the client. 1728Sends an ext event to the client.
1465 1729
1466=cut 1730=cut
1467 1731
1468sub ext_event($$%) { 1732sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1733 my ($self, $type, @msg) = @_;
1470 1734
1471 $self->ns->ext_event ($type, %msg); 1735 $self->ns->ext_msg ($type, @msg);
1472} 1736}
1473 1737
1474=head3 cf::region 1738=head3 cf::region
1475 1739
1476=over 4 1740=over 4
1520our $MAX_RESET = 3600; 1784our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1785our $DEFAULT_RESET = 3000;
1522 1786
1523sub generate_random_map { 1787sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1792 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1793 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1886 $self->init; # pass $1 etc.
1620 return $self; 1887 return $self;
1621 } 1888 }
1622 } 1889 }
1623 1890
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1891 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1892 ()
1626} 1893}
1627 1894
1628sub init { 1895sub init {
1629 my ($self) = @_; 1896 my ($self) = @_;
1651 1918
1652# the temporary/swap location 1919# the temporary/swap location
1653sub save_path { 1920sub save_path {
1654 my ($self) = @_; 1921 my ($self) = @_;
1655 1922
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1923 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1924 "$TMPDIR/$path.map"
1658} 1925}
1659 1926
1660# the unique path, undef == no special unique path 1927# the unique path, undef == no special unique path
1661sub uniq_path { 1928sub uniq_path {
1662 my ($self) = @_; 1929 my ($self) = @_;
1663 1930
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1932 "$UNIQUEDIR/$path"
1666} 1933}
1667 1934
1668# and all this just because we cannot iterate over 1935# and all this just because we cannot iterate over
1669# all maps in C++... 1936# all maps in C++...
1692 1959
1693sub load_header_from($) { 1960sub load_header_from($) {
1694 my ($self, $path) = @_; 1961 my ($self, $path) = @_;
1695 1962
1696 utf8::encode $path; 1963 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1964 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1972
1703 $self->{load_path} = $path; 1973 $self->{load_path} = $path;
1704 1974
1705 1 1975 1
1706} 1976}
1760sub find { 2030sub find {
1761 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1762 2032
1763 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1764 2034
2035 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2036 cf::lock_wait "map_find:$path";
1766 2037
1767 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1768 my $guard = cf::lock_acquire "map_find:$path"; 2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
1769 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1770 or return; 2043 or return;
1771 2044
1772 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1773 2046
1775 or return; 2048 or return;
1776 2049
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
2054 undef $guard1;
1780 $map->reset; 2055 $map->reset;
1781 undef $guard;
1782 return find $path; 2056 return find $path;
1783 } 2057 }
1784 2058
1785 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1786 } 2060 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1796 2070
1797 my $path = $self->{path}; 2071 my $path = $self->{path};
1798 2072
1799 { 2073 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2074 my $guard = cf::lock_acquire "map_data:$path";
1801 2075
2076 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2077 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2078
1804 $self->in_memory (cf::MAP_LOADING); 2079 $self->in_memory (cf::MAP_LOADING);
1805 2080
1806 $self->alloc; 2081 $self->alloc;
1807 2082
1808 $self->pre_load; 2083 $self->pre_load;
1809 Coro::cede; 2084 cf::cede_to_tick;
1810 2085
2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2088 $self->_load_objects ($f)
1812 or return; 2089 or return;
1813 2090
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
1815 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1816 2093
1817 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2095 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2096 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2098 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2099 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs;
2101 }
1822 } 2102 }
1823 } 2103 }
1824 2104
1825 Coro::cede; 2105 $f->resolve_delayed_derefs;
2106
2107 cf::cede_to_tick;
1826 # now do the right thing for maps 2108 # now do the right thing for maps
1827 $self->link_multipart_objects; 2109 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2110 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2111 unless $self->difficulty;
1830 Coro::cede; 2112 cf::cede_to_tick;
1831 2113
1832 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2115 $self->decay_objects;
1834 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
1835 $self->update_buttons; 2117 $self->update_buttons;
1836 Coro::cede; 2118 cf::cede_to_tick;
1837 $self->set_darkness_map; 2119 $self->set_darkness_map;
1838 Coro::cede; 2120 cf::cede_to_tick;
1839 $self->activate; 2121 $self->activate;
1840 } 2122 }
1841 2123
2124 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME);
2126
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2127 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2128 }
1844 2129
1845 $self->post_load; 2130 $self->post_load;
1846} 2131}
1847 2132
1856 2141
1857 $self 2142 $self
1858} 2143}
1859 2144
1860# 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
1861sub load_diag { 2146sub load_neighbours {
1862 my ($map) = @_; 2147 my ($map) = @_;
1863 2148
1864 my @diag; # diagonal neighbours 2149 my @neigh; # diagonal neighbours
1865 2150
1866 for (0 .. 3) { 2151 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2152 my $neigh = $map->tile_path ($_)
1868 or next; 2153 or next;
1869 $neigh = find $neigh, $map 2154 $neigh = find $neigh, $map
1870 or next; 2155 or next;
1871 $neigh->load; 2156 $neigh->load;
1872 2157
2158 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2161 }
1876 2162
1877 for (@diag) { 2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2165 my $neigh = find $path, $origin
1879 or next; 2166 or next;
1880 $neigh->load; 2167 $neigh->load;
1881 } 2168 }
1882} 2169}
1883 2170
1888} 2175}
1889 2176
1890sub do_load_sync { 2177sub do_load_sync {
1891 my ($map) = @_; 2178 my ($map) = @_;
1892 2179
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main;
2182
1893 cf::sync_job { $map->load }; 2183 cf::sync_job { $map->load };
1894} 2184}
1895 2185
1896our %MAP_PREFETCH; 2186our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2187our $MAP_PREFETCHER = undef;
1898 2188
1899sub find_async { 2189sub find_async {
1900 my ($path, $origin) = @_; 2190 my ($path, $origin, $load) = @_;
1901 2191
1902 $path = normalise $path, $origin && $origin->{path}; 2192 $path = normalise $path, $origin && $origin->{path};
1903 2193
1904 if (my $map = $cf::MAP{$path}) { 2194 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2196 }
1907 2197
1908 undef $MAP_PREFETCH{$path}; 2198 $MAP_PREFETCH{$path} |= $load;
2199
1909 $MAP_PREFETCHER ||= cf::async { 2200 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher";
2202
1910 while (%MAP_PREFETCH) { 2203 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2204 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2205 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2206 $map->load if $v;
2207 }
1915 2208
1916 delete $MAP_PREFETCH{$path}; 2209 delete $MAP_PREFETCH{$k};
1917 } 2210 }
1918 } 2211 }
1919 undef $MAP_PREFETCHER; 2212 undef $MAP_PREFETCHER;
1920 }; 2213 };
1921 $MAP_PREFETCHER->prio (6); 2214 $MAP_PREFETCHER->prio (6);
1924} 2217}
1925 2218
1926sub save { 2219sub save {
1927 my ($self) = @_; 2220 my ($self) = @_;
1928 2221
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2223
1931 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
1932 2225
1933 return unless $self->dirty; 2226 return unless $self->dirty;
1934 2227
1940 return if $self->{deny_save}; 2233 return if $self->{deny_save};
1941 2234
1942 local $self->{last_access} = $self->last_access;#d# 2235 local $self->{last_access} = $self->last_access;#d#
1943 2236
1944 cf::async { 2237 cf::async {
2238 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
1946 }; 2240 };
2241
2242 cf::get_slot 0.02;
1947 2243
1948 if ($uniq) { 2244 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2247 } else {
1957 my ($self) = @_; 2253 my ($self) = @_;
1958 2254
1959 # save first because save cedes 2255 # save first because save cedes
1960 $self->save; 2256 $self->save;
1961 2257
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2258 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2259
1964 return if $self->players; 2260 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2261 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2262 return if $self->{deny_save};
1967 2263
2264 $self->in_memory (cf::MAP_SWAPPED);
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2268 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2269}
1971 2270
1972sub reset_at { 2271sub reset_at {
1973 my ($self) = @_; 2272 my ($self) = @_;
1974 2273
2006 if $uniq; 2305 if $uniq;
2007 } 2306 }
2008 2307
2009 delete $cf::MAP{$self->path}; 2308 delete $cf::MAP{$self->path};
2010 2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2312 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2313
2015 $self->unlink_save; 2314 $self->unlink_save;
2016 $self->destroy; 2315 $self->destroy;
2017} 2316}
2018 2317
2019my $nuke_counter = "aaaa"; 2318my $nuke_counter = "aaaa";
2020 2319
2021sub nuke { 2320sub nuke {
2022 my ($self) = @_; 2321 my ($self) = @_;
2023 2322
2323 {
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2024 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
2025 2327
2026 $self->unlink_save; 2328 $self->unlink_save;
2027 2329
2028 bless $self, "cf::map"; 2330 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2331 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2332 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2333 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2335
2034 $cf::MAP{$self->path} = $self; 2336 $cf::MAP{$self->path} = $self;
2337 }
2035 2338
2036 $self->reset; # polite request, might not happen 2339 $self->reset; # polite request, might not happen
2037} 2340}
2038 2341
2039=item $maps = cf::map::tmp_maps 2342=item $maps = cf::map::tmp_maps
2081 2384
2082sub unique_maps() { 2385sub unique_maps() {
2083 [ 2386 [
2084 map { 2387 map {
2085 utf8::decode $_; 2388 utf8::decode $_;
2086 /\.map$/ 2389 s/\.map$//; # TODO future compatibility hack
2390 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2391 ? ()
2087 ? normalise $_ 2392 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2393 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2394 ]
2091} 2395}
2092 2396
2093package cf;
2094
2095=back 2397=back
2096 2398
2097=head3 cf::object 2399=head3 cf::object
2098 2400
2099=cut 2401=cut
2102 2404
2103=over 4 2405=over 4
2104 2406
2105=item $ob->inv_recursive 2407=item $ob->inv_recursive
2106 2408
2107Returns 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.
2108 2411
2109=cut 2412=cut
2110 2413
2111sub inv_recursive_; 2414sub inv_recursive_;
2112sub inv_recursive_ { 2415sub inv_recursive_ {
2115 2418
2116sub inv_recursive { 2419sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2118} 2421}
2119 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
2120package cf; 2451package cf;
2121 2452
2122=back 2453=back
2123 2454
2124=head3 cf::object::player 2455=head3 cf::object::player
2130Sends 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>
2131can 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
2132dialogue with the given NPC character. 2463dialogue with the given NPC character.
2133 2464
2134=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};
2135 2480
2136# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2482# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2146 2491
2147 } else { 2492 } else {
2148 my $pl = $self->contr; 2493 my $pl = $self->contr;
2149 2494
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2495 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2498
2159 } else { 2499 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2502 }
2163 } 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 (@_);
2164} 2514}
2165 2515
2166=item $player_object->may ("access") 2516=item $player_object->may ("access")
2167 2517
2168Returns wether the given player is authorized to access resource "access" 2518Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2597 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2598 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2599 if $x <=0 && $y <= 0;
2250 2600
2251 $map->load; 2601 $map->load;
2252 $map->load_diag; 2602 $map->load_neighbours;
2253 2603
2254 return unless $self->contr->active; 2604 return unless $self->contr->active;
2255 $self->activate_recursive; 2605 $self->activate_recursive;
2256 2606
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2264her, loading and preparing them map, calling the provided $check callback 2614her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the 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
2267be called at the end of this process. 2617be called at the end of this process.
2268 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
2269=cut 2622=cut
2270 2623
2271our $GOTOGEN; 2624our $GOTOGEN;
2272 2625
2273sub cf::object::player::goto { 2626sub cf::object::player::goto {
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2631
2279 $self->enter_link; 2632 $self->enter_link;
2280 2633
2281 (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
2282 my $map = eval { 2656 my $map = eval {
2283 my $map = cf::map::find $path; 2657 my $map = defined $path ? cf::map::find $path : undef;
2284 2658
2285 if ($map) { 2659 if ($map) {
2286 $map = $map->customise_for ($self); 2660 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2661 $map = $check->($map) if $check && $map;
2288 } else { 2662 } else {
2289 $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);
2290 } 2664 }
2291 2665
2292 $map 2666 $map
2293 }; 2667 };
2294 2668
2330} 2704}
2331 2705
2332sub prepare_random_map { 2706sub prepare_random_map {
2333 my ($exit) = @_; 2707 my ($exit) = @_;
2334 2708
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2709 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2710 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2711 # that depends on the exit object
2340 2712
2341 my $rmp = parse_random_map_params $exit->msg; 2713 my $rmp = parse_random_map_params $exit->msg;
2343 if ($exit->map) { 2715 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2716 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2717 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2718 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2719 $rmp->{origin_y} = $exit->y;
2720
2721 $exit->map->touch;
2348 } 2722 }
2349 2723
2350 $rmp->{random_seed} ||= $exit->random_seed; 2724 $rmp->{random_seed} ||= $exit->random_seed;
2351 2725
2352 my $data = cf::to_json $rmp; 2726 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2727 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2728 my $meta = "$RANDOMDIR/$md5.meta";
2355 2729
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2730 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2731 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2732 undef $fh;
2359 aio_rename "$meta~", $meta; 2733 aio_rename "$meta~", $meta;
2360 2734
2735 my $slaying = "?random/$md5";
2736
2737 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2738 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2739 $exit->msg (undef);
2740 }
2363 } 2741 }
2364} 2742}
2365 2743
2366sub cf::object::player::enter_exit { 2744sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2745 my ($self, $exit) = @_;
2368 2746
2369 return unless $self->type == cf::PLAYER; 2747 return unless $self->type == cf::PLAYER;
2370 2748
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2749 $self->enter_link;
2383 2750
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2751 (async {
2389 $self->deactivate_recursive; # just to be sure 2752 $Coro::current->{desc} = "enter_exit";
2753
2390 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
2391 $self->goto ($slaying, $hp, $sp); 2769 $self->goto ($map, $x, $y);
2392 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
2393 1; 2775 1
2394 }) { 2776 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2777 $self->message ("Something went wrong deep within the crossfire server. "
2396 . "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. "
2397 . "Please report this to the dungeon master!", 2779 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2780 cf::NDI_UNIQUE | cf::NDI_RED);
2419 2801
2420 utf8::encode $text; 2802 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2804}
2423 2805
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 2806=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 2807
2426Send a drawinfo or msg packet to the client, formatting the msg for the 2808Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 2809client if neccessary. C<$type> should be a string identifying the type of
2428the 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
2429the message unless the client supports the msg packet. 2811the message unless the client supports the msg packet.
2430 2812
2431=cut 2813=cut
2432 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
2433sub cf::client::send_msg { 2873sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 2874 my ($self, $channel, $msg, $color, @extra) = @_;
2435 2875
2436 $msg = $self->pl->expand_cfpod ($msg); 2876 $msg = $self->pl->expand_cfpod ($msg);
2437 2877
2878 $color &= cf::NDI_CLIENT_MASK; # just in case...
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
2889 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel)
2894 if $self->can_msg;
2895 }
2896
2897 $channel = $channel->{id};
2898 }
2899
2438 return unless @extra || length $msg; 2900 return unless @extra || length $msg;
2439 2901
2440 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
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2907 $self->send_packet ("msg " . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2442 } else { 2909 } else {
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452
2453 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
2454 if (0 && $msg =~ /\[/) { 2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2456 } else { 2928 } else {
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg") 2930 $self->send_packet ("drawinfo $color $msg")
2459 } 2931 }
2460 } 2932 }
2461 } 2933 }
2462} 2934}
2463 2935
2464=item $client->ext_event ($type, %msg) 2936=item $client->ext_msg ($type, @msg)
2465 2937
2466Sends an ext event to the client. 2938Sends an ext event to the client.
2467 2939
2468=cut 2940=cut
2469 2941
2470sub cf::client::ext_event($$%) { 2942sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 2943 my ($self, $type, @msg) = @_;
2472 2944
2473 return unless $self->extcmd; 2945 if ($self->extcmd == 2) {
2474 2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 2948 push @msg, msgtype => "event_$type";
2476 $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 }
2477} 2969}
2478 2970
2479=item $success = $client->query ($flags, "text", \&cb) 2971=item $success = $client->query ($flags, "text", \&cb)
2480 2972
2481Queues a query to the client, calling the given callback with 2973Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 3028 my ($ns, $buf) = @_;
2537 3029
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3030 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 3031
2540 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
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3040 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3041 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3042 }
3043
3044 $ns->ext_reply ($reply, @reply)
3045 if $reply;
3046
2547 } else { 3047 } else {
2548 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";
2549 } 3049 }
2550 3050
2551 cf::override; 3051 cf::override;
2598our $safe = new Safe "safe"; 3098our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3099our $safe_hole = new Safe::Hole;
2600 3100
2601$SIG{FPE} = 'IGNORE'; 3101$SIG{FPE} = 'IGNORE';
2602 3102
2603$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));
2604 3108
2605# here we export the classes and methods available to script code 3109# here we export the classes and methods available to script code
2606 3110
2607=pod 3111=pod
2608 3112
2609The following functions and methods are available within a safe environment: 3113The following functions and methods are available within a safe environment:
2610 3114
2611 cf::object 3115 cf::object
2612 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
2613 insert remove 3117 insert remove name archname title slaying race decrease split
2614 3118
2615 cf::object::player 3119 cf::object::player
2616 player 3120 player
2617 3121
2618 cf::player 3122 cf::player
2623 3127
2624=cut 3128=cut
2625 3129
2626for ( 3130for (
2627 ["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
2628 insert remove)], 3132 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)],
2629 ["cf::object::player" => qw(player)], 3134 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3135 ["cf::player" => qw(peaceful)],
2631 ["cf::map" => qw(trigger)], 3136 ["cf::map" => qw(trigger)],
2632) { 3137) {
2633 no strict 'refs'; 3138 no strict 'refs';
2709# the server's init and main functions 3214# the server's init and main functions
2710 3215
2711sub load_facedata($) { 3216sub load_facedata($) {
2712 my ($path) = @_; 3217 my ($path) = @_;
2713 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
2714 warn "loading facedata from $path\n"; 3225 warn "loading facedata from $path\n";
2715 3226
2716 my $facedata; 3227 my $facedata;
2717 0 < aio_load $path, $facedata 3228 0 < aio_load $path, $facedata
2718 or die "$path: $!"; 3229 or die "$path: $!";
2720 $facedata = Coro::Storable::thaw $facedata; 3231 $facedata = Coro::Storable::thaw $facedata;
2721 3232
2722 $facedata->{version} == 2 3233 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3234 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 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
2725 { 3243 {
2726 my $faces = $facedata->{faceinfo}; 3244 my $faces = $facedata->{faceinfo};
2727 3245
2728 while (my ($face, $info) = each %$faces) { 3246 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3247 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248
2730 cf::face::set_visibility $idx, $info->{visibility}; 3249 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3250 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2734 3253
2735 cf::cede_to_tick; 3254 cf::cede_to_tick;
2736 } 3255 }
2737 3256
2738 while (my ($face, $info) = each %$faces) { 3257 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3258 next unless $info->{smooth};
3259
2740 my $idx = cf::face::find $face 3260 my $idx = cf::face::find $face
2741 or next; 3261 or next;
3262
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3263 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3264 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3266 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3267 warn "smooth face '$info->{smooth}' not found for face '$face'";
2763 3284
2764 { 3285 {
2765 # TODO: for gcfclient pleasure, we should give resources 3286 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index. 3287 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3288 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3289
2770 while (my ($name, $info) = each %$res) { 3290 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3291 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776 my $data = pack "(w/a*)*", $meta, $info->{data};
2777 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2778
2779 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3292 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294
3295 if ($info->{type} & 1) {
3296 # prepend meta info
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;
2780 cf::face::set_type $idx, 1; 3309 cf::face::set_type $idx, $info->{type};
2781 cf::face::set_data $idx, 0, $data, $chk; 3310 } else {
3311 $RESOURCE{$name} = $info;
3312 }
2782 3313
2783 cf::cede_to_tick; 3314 cf::cede_to_tick;
2784 } 3315 }
2785 } 3316 }
2786 3317
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319
2787 1 3320 1
2788} 3321}
2789 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
2790sub 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
2791 load_resource_file "$MAPDIR/regions" 3366 load_resource_file "$MAPDIR/regions"
2792 or die "unable to load regions file\n"; 3367 or die "unable to load regions file\n";
2793 3368
2794 for (cf::region::list) { 3369 for (cf::region::list) {
2795 $_->{match} = qr/$_->{match}/ 3370 $_->{match} = qr/$_->{match}/
2803} 3378}
2804 3379
2805sub reload_archetypes { 3380sub reload_archetypes {
2806 load_resource_file "$DATADIR/archetypes" 3381 load_resource_file "$DATADIR/archetypes"
2807 or die "unable to load archetypes\n"; 3382 or die "unable to load archetypes\n";
2808 #d# NEED to laod twice to resolve forward references
2809 # this really needs to be done in an extra post-pass
2810 # (which needs to be synchronous, so solve it differently)
2811 load_resource_file "$DATADIR/archetypes"
2812 or die "unable to load archetypes\n";
2813} 3383}
2814 3384
2815sub reload_treasures { 3385sub reload_treasures {
2816 load_resource_file "$DATADIR/treasures" 3386 load_resource_file "$DATADIR/treasures"
2817 or die "unable to load treasurelists\n"; 3387 or die "unable to load treasurelists\n";
2818} 3388}
2819 3389
2820sub reload_resources { 3390sub reload_resources {
2821 warn "reloading resource files...\n"; 3391 warn "reloading resource files...\n";
2822 3392
3393 reload_facedata;
3394 reload_archetypes;
2823 reload_regions; 3395 reload_regions;
2824 reload_facedata;
2825 #reload_archetypes;#d#
2826 reload_archetypes;
2827 reload_treasures; 3396 reload_treasures;
2828 3397
2829 warn "finished reloading resource files\n"; 3398 warn "finished reloading resource files\n";
2830} 3399}
2831 3400
2832sub init { 3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
2833 reload_resources; 3406 reload_resources;
2834} 3407}
2835 3408
2836sub cfg_load { 3409sub reload_config {
2837 open my $fh, "<:utf8", "$CONFDIR/config" 3410 open my $fh, "<:utf8", "$CONFDIR/config"
2838 or return; 3411 or return;
2839 3412
2840 local $/; 3413 local $/;
2841 *CFG = YAML::Syck::Load <$fh>; 3414 *CFG = YAML::Load <$fh>;
2842 3415
2843 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2844 3417
2845 $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};
2846 $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};
2857sub main { 3430sub main {
2858 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
2859 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
2860 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#
2861 (async { 3434 (async {
2862 Event::one_event; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT;
2863 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
2864 }; 3438 };
2865 3439
2866 cfg_load; 3440 {
3441 my $guard = freeze_mainloop;
3442 reload_config;
2867 db_init; 3443 db_init;
2868 load_extensions; 3444 load_extensions;
2869 3445
2870 $TICK_WATCHER->start; 3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3447 }
3448
2871 Event::loop; 3449 EV::loop;
2872} 3450}
2873 3451
2874############################################################################# 3452#############################################################################
2875# initialisation and cleanup 3453# initialisation and cleanup
2876 3454
2877# install some emergency cleanup handlers 3455# install some emergency cleanup handlers
2878BEGIN { 3456BEGIN {
3457 our %SIGWATCHER = ();
2879 for my $signal (qw(INT HUP TERM)) { 3458 for my $signal (qw(INT HUP TERM)) {
2880 Event->signal ( 3459 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2881 reentrant => 0,
2882 data => WF_AUTOCANCEL,
2883 signal => $signal,
2884 prio => 0,
2885 cb => sub {
2886 cf::cleanup "SIG$signal"; 3460 cf::cleanup "SIG$signal";
2887 },
2888 ); 3461 };
2889 } 3462 }
2890} 3463}
2891 3464
2892sub write_runtime { 3465sub write_runtime_sync {
2893 my $runtime = "$LOCALDIR/runtime"; 3466 my $runtime = "$LOCALDIR/runtime";
2894 3467
2895 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
2896 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
2897 3470
2923 and return; 3496 and return;
2924 3497
2925 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
2926 3499
2927 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 };
2928} 3544}
2929 3545
2930sub emergency_save() { 3546sub emergency_save() {
2931 my $freeze_guard = cf::freeze_mainloop; 3547 my $freeze_guard = cf::freeze_mainloop;
2932 3548
2938 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
2939 warn "begin emergency player save\n"; 3555 warn "begin emergency player save\n";
2940 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
2941 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
2942 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2943 $pl->save; 3560 $pl->save;
2944 } 3561 }
2945 warn "end emergency player save\n"; 3562 warn "end emergency player save\n";
2946 3563
2947 warn "begin emergency map save\n"; 3564 warn "begin emergency map save\n";
2953 warn "end emergency map save\n"; 3570 warn "end emergency map save\n";
2954 3571
2955 warn "begin emergency database checkpoint\n"; 3572 warn "begin emergency database checkpoint\n";
2956 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
2957 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";
2958 }; 3579 };
2959 3580
2960 warn "leave emergency perl save\n"; 3581 warn "leave emergency perl save\n";
2961} 3582}
2962 3583
2977 warn "reloading..."; 3598 warn "reloading...";
2978 3599
2979 warn "entering sync_job"; 3600 warn "entering sync_job";
2980 3601
2981 cf::sync_job { 3602 cf::sync_job {
2982 cf::write_runtime; # external watchdog should not bark 3603 cf::write_runtime_sync; # external watchdog should not bark
2983 cf::emergency_save; 3604 cf::emergency_save;
2984 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
2985 3606
2986 warn "syncing database to disk"; 3607 warn "syncing database to disk";
2987 BDB::db_env_txn_checkpoint $DB_ENV; 3608 BDB::db_env_txn_checkpoint $DB_ENV;
2988 3609
2989 # 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
2990
2991 warn "cancelling all WF_AUTOCANCEL watchers";
2992 for (Event::all_watchers) {
2993 $_->cancel if $_->data & WF_AUTOCANCEL;
2994 }
2995 3611
2996 warn "flushing outstanding aio requests"; 3612 warn "flushing outstanding aio requests";
2997 for (;;) { 3613 for (;;) {
2998 BDB::flush; 3614 BDB::flush;
2999 IO::AIO::flush; 3615 IO::AIO::flush;
3000 Coro::cede; 3616 Coro::cede_notself;
3001 last unless IO::AIO::nreqs || BDB::nreqs; 3617 last unless IO::AIO::nreqs || BDB::nreqs;
3002 warn "iterate..."; 3618 warn "iterate...";
3003 } 3619 }
3004 3620
3005 ++$RELOAD; 3621 ++$RELOAD;
3064 warn "reloading cf.pm"; 3680 warn "reloading cf.pm";
3065 require cf; 3681 require cf;
3066 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3067 3683
3068 warn "loading config and database again"; 3684 warn "loading config and database again";
3069 cf::cfg_load; 3685 cf::reload_config;
3070 3686
3071 warn "loading extensions"; 3687 warn "loading extensions";
3072 cf::load_extensions; 3688 cf::load_extensions;
3073 3689
3074 warn "reattaching attachments to objects/players"; 3690 warn "reattaching attachments to objects/players";
3081 warn "leaving sync_job"; 3697 warn "leaving sync_job";
3082 3698
3083 1 3699 1
3084 } or do { 3700 } or do {
3085 warn $@; 3701 warn $@;
3086 warn "error while reloading, exiting."; 3702 cf::cleanup "error while reloading, exiting.";
3087 exit 1;
3088 }; 3703 };
3089 3704
3090 warn "reloaded"; 3705 warn "reloaded";
3091}; 3706};
3092 3707
3094 3709
3095sub reload_perl() { 3710sub reload_perl() {
3096 # doing reload synchronously and two reloads happen back-to-back, 3711 # doing reload synchronously and two reloads happen back-to-back,
3097 # coro crashes during coro_state_free->destroy here. 3712 # coro crashes during coro_state_free->destroy here.
3098 3713
3099 $RELOAD_WATCHER ||= Event->timer ( 3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3100 reentrant => 0,
3101 after => 0,
3102 data => WF_AUTOCANCEL,
3103 cb => sub {
3104 do_reload_perl; 3715 do_reload_perl;
3105 undef $RELOAD_WATCHER; 3716 undef $RELOAD_WATCHER;
3106 },
3107 ); 3717 };
3108} 3718}
3109 3719
3110register_command "reload" => sub { 3720register_command "reload" => sub {
3111 my ($who, $arg) = @_; 3721 my ($who, $arg) = @_;
3112 3722
3113 if ($who->flag (FLAG_WIZ)) { 3723 if ($who->flag (FLAG_WIZ)) {
3114 $who->message ("reloading server."); 3724 $who->message ("reloading server.");
3725 async {
3726 $Coro::current->{desc} = "perl_reload";
3115 async { reload_perl }; 3727 reload_perl;
3728 };
3116 } 3729 }
3117}; 3730};
3118 3731
3119unshift @INC, $LIBDIR; 3732unshift @INC, $LIBDIR;
3120 3733
3122 3735
3123our @WAIT_FOR_TICK; 3736our @WAIT_FOR_TICK;
3124our @WAIT_FOR_TICK_BEGIN; 3737our @WAIT_FOR_TICK_BEGIN;
3125 3738
3126sub wait_for_tick { 3739sub wait_for_tick {
3127 return unless $TICK_WATCHER->is_active;
3128 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
3129 3741
3130 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
3131 push @WAIT_FOR_TICK, $signal; 3743 push @WAIT_FOR_TICK, $signal;
3132 $signal->wait; 3744 $signal->wait;
3133} 3745}
3134 3746
3135sub wait_for_tick_begin { 3747sub wait_for_tick_begin {
3136 return unless $TICK_WATCHER->is_active;
3137 return if $Coro::current == $Coro::main; 3748 return if tick_inhibit || $Coro::current == $Coro::main;
3138 3749
3139 my $signal = new Coro::Signal; 3750 my $signal = new Coro::Signal;
3140 push @WAIT_FOR_TICK_BEGIN, $signal; 3751 push @WAIT_FOR_TICK_BEGIN, $signal;
3141 $signal->wait; 3752 $signal->wait;
3142} 3753}
3143 3754
3144 my $min = 1e6;#d# 3755sub tick {
3145 my $avg = 10;
3146$TICK_WATCHER = Event->timer (
3147 reentrant => 0,
3148 parked => 1,
3149 prio => 0,
3150 at => $NEXT_TICK || $TICK,
3151 data => WF_AUTOCANCEL,
3152 cb => sub {
3153 if ($Coro::current != $Coro::main) { 3756 if ($Coro::current != $Coro::main) {
3154 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"
3155 unless ++$bug_warning > 10; 3758 unless ++$bug_warning > 10;
3156 return; 3759 return;
3157 } 3760 }
3158 3761
3159 $NOW = $tick_start = Event::time;
3160
3161 cf::server_tick; # one server iteration 3762 cf::server_tick; # one server iteration
3162 3763
3163 0 && sync_job {#d# 3764 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3164 for(1..10) { 3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3165 my $t = Event::time; 3766 Coro::async_pool {
3166 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3767 $Coro::current->{desc} = "runtime saver";
3167 or die; 3768 write_runtime_sync
3168 3769 or warn "ERROR: unable to write runtime file: $!";
3169 $map->width (50);
3170 $map->height (50);
3171 $map->alloc;
3172 $map->_load_objects ("/tmp/x.map", 1);
3173 my $t = Event::time - $t;
3174
3175 #next unless $t < 0.0013;#d#
3176 if ($t < $min) {
3177 $min = $t;
3178 }
3179 $avg = $avg * 0.99 + $t * 0.01;
3180 }
3181 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3182 exit 0;
3183 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3184 }; 3770 };
3771 }
3185 3772
3186 $RUNTIME += $TICK;
3187 $NEXT_TICK += $TICK;
3188
3189 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3190 $NEXT_RUNTIME_WRITE = $NOW + 10;
3191 Coro::async_pool {
3192 write_runtime
3193 or warn "ERROR: unable to write runtime file: $!";
3194 };
3195 }
3196
3197# my $AFTER = Event::time;
3198# warn $AFTER - $NOW;#d#
3199
3200 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3201 $sig->send; 3774 $sig->send;
3202 } 3775 }
3203 while (my $sig = shift @WAIT_FOR_TICK) { 3776 while (my $sig = shift @WAIT_FOR_TICK) {
3204 $sig->send; 3777 $sig->send;
3205 } 3778 }
3206 3779
3207 $NOW = Event::time; 3780 $LOAD = ($NOW - $TICK_START) / $TICK;
3208
3209 # if we are delayed by four ticks or more, skip them all
3210 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3211
3212 $TICK_WATCHER->at ($NEXT_TICK);
3213 $TICK_WATCHER->start;
3214
3215 $LOAD = ($NOW - $tick_start) / $TICK;
3216 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3217 3782
3218 _post_tick; 3783 if (0) {
3219 3784 if ($NEXT_TICK) {
3220 3785 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d#
3788 }
3221 }, 3789 }
3222); 3790}
3223 3791
3224{ 3792{
3225 BDB::max_poll_time $TICK * 0.1; 3793 # configure BDB
3226 $BDB_POLL_WATCHER = Event->io ( 3794
3227 reentrant => 0,
3228 fd => BDB::poll_fileno,
3229 poll => 'r',
3230 prio => 0,
3231 data => WF_AUTOCANCEL,
3232 cb => \&BDB::poll_cb,
3233 );
3234 BDB::min_parallel 8; 3795 BDB::min_parallel 8;
3235 3796 BDB::max_poll_reqs $TICK * 0.1;
3236 BDB::set_sync_prepare { 3797 $AnyEvent::BDB::WATCHER->priority (1);
3237 my $status;
3238 my $current = $Coro::current;
3239 (
3240 sub {
3241 $status = $!;
3242 $current->ready; undef $current;
3243 },
3244 sub {
3245 Coro::schedule while defined $current;
3246 $! = $status;
3247 },
3248 )
3249 };
3250 3798
3251 unless ($DB_ENV) { 3799 unless ($DB_ENV) {
3252 $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);
3253 3806
3254 cf::sync_job { 3807 cf::sync_job {
3255 eval { 3808 eval {
3256 BDB::db_env_open 3809 BDB::db_env_open
3257 $DB_ENV, 3810 $DB_ENV,
3259 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
3260 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3813 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3261 0666; 3814 0666;
3262 3815
3263 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3816 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3264
3265 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3266 $DB_ENV->set_lk_detect;
3267 }; 3817 };
3268 3818
3269 cf::cleanup "db_env_open(db): $@" if $@; 3819 cf::cleanup "db_env_open(db): $@" if $@;
3270 }; 3820 };
3271 } 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 };
3272} 3832}
3273 3833
3274{ 3834{
3835 # configure IO::AIO
3836
3275 IO::AIO::min_parallel 8; 3837 IO::AIO::min_parallel 8;
3276
3277 undef $Coro::AIO::WATCHER;
3278 IO::AIO::max_poll_time $TICK * 0.1; 3838 IO::AIO::max_poll_time $TICK * 0.1;
3279 $AIO_POLL_WATCHER = Event->io ( 3839 undef $AnyEvent::AIO::WATCHER;
3280 reentrant => 0,
3281 data => WF_AUTOCANCEL,
3282 fd => IO::AIO::poll_fileno,
3283 poll => 'r',
3284 prio => 6,
3285 cb => \&IO::AIO::poll_cb,
3286 );
3287} 3840}
3288 3841
3289my $_log_backtrace; 3842my $_log_backtrace;
3290 3843
3291sub _log_backtrace { 3844sub _log_backtrace {
3295 3848
3296 # limit the # of concurrent backtraces 3849 # limit the # of concurrent backtraces
3297 if ($_log_backtrace < 2) { 3850 if ($_log_backtrace < 2) {
3298 ++$_log_backtrace; 3851 ++$_log_backtrace;
3299 async { 3852 async {
3853 $Coro::current->{desc} = "abt $msg";
3854
3300 my @bt = fork_call { 3855 my @bt = fork_call {
3301 @addr = map { sprintf "%x", $_ } @addr; 3856 @addr = map { sprintf "%x", $_ } @addr;
3302 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3857 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3303 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 |"
3304 or die "addr2line: $!"; 3859 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines