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.292 by root, Tue Jul 3 00:54:57 2007 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 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 3.2;
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 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
250 293
251=cut 294=cut
252 295
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
434 my ($time, $pri, $name) = @_;
435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready;
442 $sig->wait;
318} 443}
319 444
320=item cf::async { BLOCK } 445=item cf::async { BLOCK }
321 446
322Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
327 452
328BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
329 454
330=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
331 456
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 460acceptable.
336 461
337If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
343 468
344sub sync_job(&) { 469sub sync_job(&) {
345 my ($job) = @_; 470 my ($job) = @_;
346 471
347 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 473 my $time = EV::time;
349 474
350 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
352 477
353 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 479
355 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
356 481
357 my $busy = 1; 482 my $busy = 1;
358 my @res; 483 my @res;
359 484
360 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 487 @res = eval { $job->() };
362 warn $@ if $@; 488 warn $@ if $@;
363 undef $busy; 489 undef $busy;
364 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
365 491
366 while ($busy) { 492 while ($busy) {
367 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
368 } 497 }
498 }
369 499
370 $time = Event::time - $time; 500 my $time = EV::time - $time;
371 501
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
376 503
377 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
378 } else { 505 } else {
379 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
380 507
405=item fork_call { }, $args 532=item fork_call { }, $args
406 533
407Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
411 538
412=cut 539=cut
413 540
414sub fork_call(&@) { 541sub fork_call(&@) {
415 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
416 543
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 544 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 547
422 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 549 reset_signals;
435 local $SIG{__WARN__}; 550 &$cb
436 local $SIG{__DIE__}; 551 }, @args;
437 eval {
438 close $fh1;
439 552
440 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 554}
442 };
443 555
444 warn $@ if $@; 556=item $coin = coin_from_name $name
445 _exit 0; 557
446 } 558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
447} 581}
448 582
449=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
450 584
451Returns a single value from the environment database. 585Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
454 588
455Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
458=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
459 615
460our $DB; 616our $DB;
461 617
462sub db_init { 618sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 619 cf::sync_job {
467 eval { 620 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 621 };
477} 622}
478 623
479sub db_get($$) { 624sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
481 626
531 if (1) { 676 if (1) {
532 $md5 = 677 $md5 =
533 join "\x00", 678 join "\x00",
534 $processversion, 679 $processversion,
535 map { 680 map {
536 Coro::cede; 681 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 683 } 0.. $#$src;
539 684
540 685
541 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
587 732
588In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
589C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
590Crossfire TRT). 735Deliantra).
591 736
592=over 4 737=over 4
593 738
594=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
595 740
847 "; 992 ";
848 die if $@; 993 die if $@;
849} 994}
850 995
851our $override; 996our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 997our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 998
854sub override { 999sub override {
855 $override = 1; 1000 $override = 1;
856 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
857} 1002}
858 1003
859sub do_invoke { 1004sub do_invoke {
860 my $event = shift; 1005 my $event = shift;
861 my $callbacks = shift; 1006 my $callbacks = shift;
862 1007
863 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
864 1009
865 local $override; 1010 local $override;
866 1011
867 for (@$callbacks) { 1012 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
877 } 1022 }
878 1023
879 0 1024 0
880} 1025}
881 1026
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1028
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1030
886Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
887 1032
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1033This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1034removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1036
892=back 1037=back
893 1038
894=cut 1039=cut
895 1040
896############################################################################# 1041#############################################################################
897# object support 1042# object support
1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
1077sub _can_merge {
1078 my ($ob1, $ob2) = @_;
1079
1080 ++$SLOW_MERGES;#d#
1081
1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
1084}
898 1085
899sub reattach { 1086sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1088 my ($obj) = @_;
902 1089
923cf::attachable->attach ( 1110cf::attachable->attach (
924 prio => -1000000, 1111 prio => -1000000,
925 on_instantiate => sub { 1112 on_instantiate => sub {
926 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
927 1114
928 $data = from_json $data; 1115 $data = decode_json $data;
929 1116
930 for (@$data) { 1117 for (@$data) {
931 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
932 1119
933 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1136sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
951 1138
952 sync_job { 1139 sync_job {
953 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
956 1144
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1149 aio_close $fh;
962 1150
963 if (@$objs) { 1151 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1157 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
971 } 1159 }
972 } else { 1160 } else {
973 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
974 } 1162 }
979 } 1167 }
980 } else { 1168 } else {
981 aio_unlink $filename; 1169 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
983 } 1171 }
984 } 1172 };
985} 1173}
986 1174
987sub object_freezer_as_string { 1175sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
989 1177
1001 or return; 1189 or return;
1002 1190
1003 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1193 or return;
1194
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1007 } 1197 }
1008 1198
1199 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1011 return ($data, $av); 1203 ($data, $av)
1012} 1204}
1013 1205
1014=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1015 1207
1016=over 4 1208=over 4
1089 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1090 1282
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1284
1093 if (ref $msg) { 1285 if (ref $msg) {
1286 my ($type, $reply, @payload) =
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290
1291 my @reply;
1292
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1099 } else { 1300 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1302 }
1102 1303
1103 cf::override; 1304 cf::override;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1158 1359
1159 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1361 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1363 }
1164 1364
1165 warn $msg; 1365 warn $msg;
1166 } 1366 }
1167 1367
1192use Coro::AIO; 1392use Coro::AIO;
1193 1393
1194=head3 cf::player 1394=head3 cf::player
1195 1395
1196=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1197 1411
1198=item cf::player::find $login 1412=item cf::player::find $login
1199 1413
1200Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1201 1415
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1455
1242 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1245 } 1465 }
1246 } 1466 }
1247} 1467}
1248 1468
1257 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1258 1478
1259 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1261 1481
1482 cf::get_slot 0.01;
1483
1262 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1263 Coro::cede; 1485 cf::cede_to_tick;
1264} 1486}
1265 1487
1266sub new($) { 1488sub new($) {
1267 my ($login) = @_; 1489 my ($login) = @_;
1268 1490
1274 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1275 1497
1276 $self 1498 $self
1277} 1499}
1278 1500
1501=item $player->send_msg ($channel, $msg, $color, [extra...])
1502
1503=cut
1504
1505sub send_msg {
1506 my $ns = shift->ns
1507 or return;
1508 $ns->send_msg (@_);
1509}
1510
1279=item $pl->quit_character 1511=item $pl->quit_character
1280 1512
1281Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1514be destroyed. May block for a long time.
1283 1515
1291 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1292 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1293 1525
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1298 1532
1299 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1336 or return []; 1570 or return [];
1337 1571
1338 my @logins; 1572 my @logins;
1339 1573
1340 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1575 my $path = path $login;
1576
1577 # a .pst is a dead give-away for a valid player
1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1583 }
1344 1584
1345 utf8::decode $login; 1585 utf8::decode $login;
1346 push @logins, $login; 1586 push @logins, $login;
1347 } 1587 }
1348 1588
1381 1621
1382Expand crossfire pod fragments into protocol xml. 1622Expand crossfire pod fragments into protocol xml.
1383 1623
1384=cut 1624=cut
1385 1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1386sub expand_cfpod { 1637sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1638 my ($self, $pod) = @_;
1388 1639
1389 # escape & and < 1640 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1641
1393 # this is buggy, it needs to properly take care of nested <'s 1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1394 1645
1395 1 while 1646 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1647 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1648
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1649 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1650 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1651 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1652 <
1402 $self->gender ? $2 : $1 1653 (?:
1403 }ge 1654 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1655 | < $interior >
1405 || s{H<([^\>]*)>} 1656 )
1657 >
1658 %gcsx
1406 { 1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1679 "")
1410 [$self->{hintmode}] 1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1412 1691
1692 for ($xml) {
1413 # create single paragraphs (very hackish) 1693 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1694 s/(?<=\S)\n(?=\w)/ /g;
1415 1695
1416 # compress some whitespace 1696 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1697 s/\s+\n/\n/g; # ws line-ends
1698 s/\n\n+/\n/g; # double lines
1699 s/^\n+//; # beginning lines
1700 s/\n+$//; # ending lines
1701 }
1418 1702
1419 $_ 1703 $xml
1420} 1704}
1705
1706no re 'eval';
1421 1707
1422sub hintmode { 1708sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1710 $_[0]{hintmode}
1425} 1711}
1426 1712
1427=item $player->ext_reply ($msgid, %msg) 1713=item $player->ext_reply ($msgid, @msg)
1428 1714
1429Sends an ext reply to the player. 1715Sends an ext reply to the player.
1430 1716
1431=cut 1717=cut
1432 1718
1433sub ext_reply($$%) { 1719sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1720 my ($self, $id, @msg) = @_;
1435 1721
1436 $msg{msgid} = $id; 1722 $self->ns->ext_reply ($id, @msg)
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1438} 1723}
1439 1724
1440=item $player->ext_event ($type, %msg) 1725=item $player->ext_msg ($type, @msg)
1441 1726
1442Sends an ext event to the client. 1727Sends an ext event to the client.
1443 1728
1444=cut 1729=cut
1445 1730
1446sub ext_event($$%) { 1731sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1732 my ($self, $type, @msg) = @_;
1448 1733
1449 $self->ns->ext_event ($type, %msg); 1734 $self->ns->ext_msg ($type, @msg);
1450} 1735}
1451 1736
1452=head3 cf::region 1737=head3 cf::region
1453 1738
1454=over 4 1739=over 4
1467 my ($path) = @_; 1752 my ($path) = @_;
1468 1753
1469 my ($match, $specificity); 1754 my ($match, $specificity);
1470 1755
1471 for my $region (list) { 1756 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1757 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1758 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1759 if $region->specificity > $specificity;
1475 } 1760 }
1476 } 1761 }
1477 1762
1498our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1499our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1500 1785
1501sub generate_random_map { 1786sub generate_random_map {
1502 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1503 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1504 $self->_create_random_map ( 1792 $self->_create_random_map (
1505 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1506 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1507 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1597 $self->init; # pass $1 etc. 1885 $self->init; # pass $1 etc.
1598 return $self; 1886 return $self;
1599 } 1887 }
1600 } 1888 }
1601 1889
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1890 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1891 ()
1604} 1892}
1605 1893
1606sub init { 1894sub init {
1607 my ($self) = @_; 1895 my ($self) = @_;
1629 1917
1630# the temporary/swap location 1918# the temporary/swap location
1631sub save_path { 1919sub save_path {
1632 my ($self) = @_; 1920 my ($self) = @_;
1633 1921
1634 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1635 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1636} 1924}
1637 1925
1638# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1639sub uniq_path { 1927sub uniq_path {
1640 my ($self) = @_; 1928 my ($self) = @_;
1641 1929
1642 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1643 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1644} 1932}
1645 1933
1646# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1647# all maps in C++... 1935# all maps in C++...
1670 1958
1671sub load_header_from($) { 1959sub load_header_from($) {
1672 my ($self, $path) = @_; 1960 my ($self, $path) = @_;
1673 1961
1674 utf8::encode $path; 1962 utf8::encode $path;
1675 #aio_open $path, O_RDONLY, 0 1963 my $f = new_from_file cf::object::thawer $path
1676 # or return;
1677
1678 $self->_load_header ($path)
1679 or return; 1964 or return;
1965
1966 $self->_load_header ($f)
1967 or return;
1968
1969 local $MAP_LOADING{$self->{path}} = $self;
1970 $f->resolve_delayed_derefs;
1680 1971
1681 $self->{load_path} = $path; 1972 $self->{load_path} = $path;
1682 1973
1683 1 1974 1
1684} 1975}
1738sub find { 2029sub find {
1739 my ($path, $origin) = @_; 2030 my ($path, $origin) = @_;
1740 2031
1741 $path = normalise $path, $origin && $origin->path; 2032 $path = normalise $path, $origin && $origin->path;
1742 2033
2034 cf::lock_wait "map_data:$path";#d#remove
1743 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1744 2036
1745 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1746 my $guard = cf::lock_acquire "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
1747 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1748 or return; 2042 or return;
1749 2043
1750 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1751 2045
1753 or return; 2047 or return;
1754 2048
1755 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1756 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1757 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2053 undef $guard1;
1758 $map->reset; 2054 $map->reset;
1759 undef $guard;
1760 return find $path; 2055 return find $path;
1761 } 2056 }
1762 2057
1763 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1764 } 2059 }
1773 local $self->{deny_reset} = 1; # loading can take a long time 2068 local $self->{deny_reset} = 1; # loading can take a long time
1774 2069
1775 my $path = $self->{path}; 2070 my $path = $self->{path};
1776 2071
1777 { 2072 {
1778 my $guard = cf::lock_acquire "map_load:$path"; 2073 my $guard = cf::lock_acquire "map_data:$path";
1779 2074
2075 return unless $self->valid;
1780 return if $self->in_memory != cf::MAP_SWAPPED; 2076 return unless $self->in_memory == cf::MAP_SWAPPED;
1781 2077
1782 $self->in_memory (cf::MAP_LOADING); 2078 $self->in_memory (cf::MAP_LOADING);
1783 2079
1784 $self->alloc; 2080 $self->alloc;
1785 2081
1786 $self->pre_load; 2082 $self->pre_load;
1787 Coro::cede; 2083 cf::cede_to_tick;
1788 2084
2085 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block;
1789 $self->_load_objects ($self->{load_path}, 1) 2087 $self->_load_objects ($f)
1790 or return; 2088 or return;
1791 2089
1792 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1793 if delete $self->{load_original}; 2091 if delete $self->{load_original};
1794 2092
1795 if (my $uniq = $self->uniq_path) { 2093 if (my $uniq = $self->uniq_path) {
1796 utf8::encode $uniq; 2094 utf8::encode $uniq;
1797 if (aio_open $uniq, O_RDONLY, 0) { 2095 unless (aio_stat $uniq) {
2096 if (my $f = new_from_file cf::object::thawer $uniq) {
1798 $self->clear_unique_items; 2097 $self->clear_unique_items;
1799 $self->_load_objects ($uniq, 0); 2098 $self->_load_objects ($f);
2099 $f->resolve_delayed_derefs;
2100 }
1800 } 2101 }
1801 } 2102 }
1802 2103
1803 Coro::cede; 2104 $f->resolve_delayed_derefs;
2105
2106 cf::cede_to_tick;
1804 # now do the right thing for maps 2107 # now do the right thing for maps
1805 $self->link_multipart_objects; 2108 $self->link_multipart_objects;
1806 $self->difficulty ($self->estimate_difficulty) 2109 $self->difficulty ($self->estimate_difficulty)
1807 unless $self->difficulty; 2110 unless $self->difficulty;
1808 Coro::cede; 2111 cf::cede_to_tick;
1809 2112
1810 unless ($self->{deny_activate}) { 2113 unless ($self->{deny_activate}) {
1811 $self->decay_objects; 2114 $self->decay_objects;
1812 $self->fix_auto_apply; 2115 $self->fix_auto_apply;
1813 $self->update_buttons; 2116 $self->update_buttons;
1814 Coro::cede; 2117 cf::cede_to_tick;
1815 $self->set_darkness_map; 2118 $self->set_darkness_map;
1816 Coro::cede; 2119 cf::cede_to_tick;
1817 $self->activate; 2120 $self->activate;
1818 } 2121 }
1819 2122
2123 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME);
2125
1820 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1821 } 2127 }
1822 2128
1823 $self->post_load; 2129 $self->post_load;
1824} 2130}
1825 2131
1834 2140
1835 $self 2141 $self
1836} 2142}
1837 2143
1838# find and load all maps in the 3x3 area around a map 2144# find and load all maps in the 3x3 area around a map
1839sub load_diag { 2145sub load_neighbours {
1840 my ($map) = @_; 2146 my ($map) = @_;
1841 2147
1842 my @diag; # diagonal neighbours 2148 my @neigh; # diagonal neighbours
1843 2149
1844 for (0 .. 3) { 2150 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 2151 my $neigh = $map->tile_path ($_)
1846 or next; 2152 or next;
1847 $neigh = find $neigh, $map 2153 $neigh = find $neigh, $map
1848 or next; 2154 or next;
1849 $neigh->load; 2155 $neigh->load;
1850 2156
2157 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2158 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2159 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 2160 }
1854 2161
1855 for (@diag) { 2162 for (grep defined $_->[0], @neigh) {
2163 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 2164 my $neigh = find $path, $origin
1857 or next; 2165 or next;
1858 $neigh->load; 2166 $neigh->load;
1859 } 2167 }
1860} 2168}
1861 2169
1866} 2174}
1867 2175
1868sub do_load_sync { 2176sub do_load_sync {
1869 my ($map) = @_; 2177 my ($map) = @_;
1870 2178
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main;
2181
1871 cf::sync_job { $map->load }; 2182 cf::sync_job { $map->load };
1872} 2183}
1873 2184
1874our %MAP_PREFETCH; 2185our %MAP_PREFETCH;
1875our $MAP_PREFETCHER = undef; 2186our $MAP_PREFETCHER = undef;
1876 2187
1877sub find_async { 2188sub find_async {
1878 my ($path, $origin) = @_; 2189 my ($path, $origin, $load) = @_;
1879 2190
1880 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
1881 2192
1882 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
1883 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1884 } 2195 }
1885 2196
1886 undef $MAP_PREFETCH{$path}; 2197 $MAP_PREFETCH{$path} |= $load;
2198
1887 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
1888 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
1890 my $map = find $path 2204 if (my $map = find $k) {
1891 or next;
1892 $map->load; 2205 $map->load if $v;
2206 }
1893 2207
1894 delete $MAP_PREFETCH{$path}; 2208 delete $MAP_PREFETCH{$k};
1895 } 2209 }
1896 } 2210 }
1897 undef $MAP_PREFETCHER; 2211 undef $MAP_PREFETCHER;
1898 }; 2212 };
1899 $MAP_PREFETCHER->prio (6); 2213 $MAP_PREFETCHER->prio (6);
1902} 2216}
1903 2217
1904sub save { 2218sub save {
1905 my ($self) = @_; 2219 my ($self) = @_;
1906 2220
1907 my $lock = cf::lock_acquire "map_data:" . $self->path; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
1908 2222
1909 $self->{last_save} = $cf::RUNTIME; 2223 $self->{last_save} = $cf::RUNTIME;
1910 2224
1911 return unless $self->dirty; 2225 return unless $self->dirty;
1912 2226
1918 return if $self->{deny_save}; 2232 return if $self->{deny_save};
1919 2233
1920 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
1921 2235
1922 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
1923 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
1924 }; 2239 };
2240
2241 cf::get_slot 0.02;
1925 2242
1926 if ($uniq) { 2243 if ($uniq) {
1927 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1928 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1929 } else { 2246 } else {
1935 my ($self) = @_; 2252 my ($self) = @_;
1936 2253
1937 # save first because save cedes 2254 # save first because save cedes
1938 $self->save; 2255 $self->save;
1939 2256
1940 my $lock = cf::lock_acquire "map_data:" . $self->path; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1941 2258
1942 return if $self->players; 2259 return if $self->players;
1943 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
1944 return if $self->{deny_save}; 2261 return if $self->{deny_save};
1945 2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP;
1946 $self->clear; 2267 $self->clear;
1947 $self->in_memory (cf::MAP_SWAPPED);
1948} 2268}
1949 2269
1950sub reset_at { 2270sub reset_at {
1951 my ($self) = @_; 2271 my ($self) = @_;
1952 2272
1984 if $uniq; 2304 if $uniq;
1985 } 2305 }
1986 2306
1987 delete $cf::MAP{$self->path}; 2307 delete $cf::MAP{$self->path};
1988 2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
1989 $self->clear; 2311 $self->clear;
1990
1991 $_->clear_links_to ($self) for values %cf::MAP;
1992 2312
1993 $self->unlink_save; 2313 $self->unlink_save;
1994 $self->destroy; 2314 $self->destroy;
1995} 2315}
1996 2316
1997my $nuke_counter = "aaaa"; 2317my $nuke_counter = "aaaa";
1998 2318
1999sub nuke { 2319sub nuke {
2000 my ($self) = @_; 2320 my ($self) = @_;
2001 2321
2322 {
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2002 delete $cf::MAP{$self->path}; 2325 delete $cf::MAP{$self->path};
2003 2326
2004 $self->unlink_save; 2327 $self->unlink_save;
2005 2328
2006 bless $self, "cf::map"; 2329 bless $self, "cf::map";
2007 delete $self->{deny_reset}; 2330 delete $self->{deny_reset};
2008 $self->{deny_save} = 1; 2331 $self->{deny_save} = 1;
2009 $self->reset_timeout (1); 2332 $self->reset_timeout (1);
2010 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2011 2334
2012 $cf::MAP{$self->path} = $self; 2335 $cf::MAP{$self->path} = $self;
2336 }
2013 2337
2014 $self->reset; # polite request, might not happen 2338 $self->reset; # polite request, might not happen
2015} 2339}
2016 2340
2017=item $maps = cf::map::tmp_maps 2341=item $maps = cf::map::tmp_maps
2059 2383
2060sub unique_maps() { 2384sub unique_maps() {
2061 [ 2385 [
2062 map { 2386 map {
2063 utf8::decode $_; 2387 utf8::decode $_;
2064 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2065 ? normalise $_ 2391 : normalise $_
2066 : ()
2067 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2068 ] 2393 ]
2069} 2394}
2070 2395
2071package cf;
2072
2073=back 2396=back
2074 2397
2075=head3 cf::object 2398=head3 cf::object
2076 2399
2077=cut 2400=cut
2080 2403
2081=over 4 2404=over 4
2082 2405
2083=item $ob->inv_recursive 2406=item $ob->inv_recursive
2084 2407
2085Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2086 2410
2087=cut 2411=cut
2088 2412
2089sub inv_recursive_; 2413sub inv_recursive_;
2090sub inv_recursive_ { 2414sub inv_recursive_ {
2093 2417
2094sub inv_recursive { 2418sub inv_recursive {
2095 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2096} 2420}
2097 2421
2422=item $ref = $ob->ref
2423
2424Creates and returns a persistent reference to an object that can be stored as a string.
2425
2426=item $ob = cf::object::deref ($refstring)
2427
2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2429even if the object actually exists. May block.
2430
2431=cut
2432
2433sub deref {
2434 my ($ref) = @_;
2435
2436 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2437 my ($uuid, $name) = ($1, $2);
2438 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2439 or return;
2440 $pl->ob->uuid eq $uuid
2441 or return;
2442
2443 $pl->ob
2444 } else {
2445 warn "$ref: cannot resolve object reference\n";
2446 undef
2447 }
2448}
2449
2098package cf; 2450package cf;
2099 2451
2100=back 2452=back
2101 2453
2102=head3 cf::object::player 2454=head3 cf::object::player
2108Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2460Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2109can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2110dialogue with the given NPC character. 2462dialogue with the given NPC character.
2111 2463
2112=cut 2464=cut
2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2113 2479
2114# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2115# with dialog boxes. 2481# with dialog boxes.
2116#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2117sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2124 2490
2125 } else { 2491 } else {
2126 my $pl = $self->contr; 2492 my $pl = $self->contr;
2127 2493
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2494 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2497
2137 } else { 2498 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2140 } 2501 }
2141 } 2502 }
2503}
2504
2505=item $object->send_msg ($channel, $msg, $color, [extra...])
2506
2507=cut
2508
2509sub cf::object::send_msg {
2510 my $pl = shift->contr
2511 or return;
2512 $pl->send_msg (@_);
2142} 2513}
2143 2514
2144=item $player_object->may ("access") 2515=item $player_object->may ("access")
2145 2516
2146Returns wether the given player is authorized to access resource "access" 2517Returns wether the given player is authorized to access resource "access"
2225 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2598 if $x <=0 && $y <= 0;
2228 2599
2229 $map->load; 2600 $map->load;
2230 $map->load_diag; 2601 $map->load_neighbours;
2231 2602
2232 return unless $self->contr->active; 2603 return unless $self->contr->active;
2233 $self->activate_recursive; 2604 $self->activate_recursive;
2234 2605
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2607 $self->enter_map ($map, $x, $y);
2237} 2608}
2238 2609
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2611
2241Moves the player to the given map-path and coordinates by first freezing 2612Moves the player to the given map-path and coordinates by first freezing
2242her, loading and preparing them map, calling the provided $check callback 2613her, loading and preparing them map, calling the provided $check callback
2243that has to return the map if sucecssful, and then unfreezes the player on 2614that has to return the map if sucecssful, and then unfreezes the player on
2244the new (success) or old (failed) map position. 2615the new (success) or old (failed) map position. In either case, $done will
2616be called at the end of this process.
2245 2617
2246=cut 2618=cut
2247 2619
2248our $GOTOGEN; 2620our $GOTOGEN;
2249 2621
2250sub cf::object::player::goto { 2622sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2623 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2624
2253 # do generation counting so two concurrent goto's will be executed in-order 2625 # do generation counting so two concurrent goto's will be executed in-order
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2627
2256 $self->enter_link; 2628 $self->enter_link;
2257 2629
2258 (async { 2630 (async {
2631 $Coro::current->{desc} = "player::goto $path $x $y";
2632
2633 # *tag paths override both path and x|y
2634 if ($path =~ /^\*(.*)$/) {
2635 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2636 my $ob = $obs[rand @obs];
2637
2638 # see if we actually can go there
2639 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2640 $ob = $obs[rand @obs];
2641 } else {
2642 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2643 }
2644 # else put us there anyways for now #d#
2645
2646 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2647 } else {
2648 ($path, $x, $y) = (undef, undef, undef);
2649 }
2650 }
2651
2259 my $map = eval { 2652 my $map = eval {
2260 my $map = cf::map::find $path; 2653 my $map = defined $path ? cf::map::find $path : undef;
2261 2654
2262 if ($map) { 2655 if ($map) {
2263 $map = $map->customise_for ($self); 2656 $map = $map->customise_for ($self);
2264 $map = $check->($map) if $check && $map; 2657 $map = $check->($map) if $check && $map;
2265 } else { 2658 } else {
2266 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2659 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2267 } 2660 }
2268 2661
2269 $map 2662 $map
2270 }; 2663 };
2271 2664
2276 2669
2277 if ($gen == $self->{_goto_generation}) { 2670 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2671 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2672 $self->leave_link ($map, $x, $y);
2280 } 2673 }
2674
2675 $done->() if $done;
2281 })->prio (1); 2676 })->prio (1);
2282} 2677}
2283 2678
2284=item $player_object->enter_exit ($exit_object) 2679=item $player_object->enter_exit ($exit_object)
2285 2680
2305} 2700}
2306 2701
2307sub prepare_random_map { 2702sub prepare_random_map {
2308 my ($exit) = @_; 2703 my ($exit) = @_;
2309 2704
2310 my $guard = cf::lock_acquire "exit_prepare:$exit";
2311
2312 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2313 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2314 # that depends on the exit object 2707 # that depends on the exit object
2315 2708
2316 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2318 if ($exit->map) { 2711 if ($exit->map) {
2319 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2320 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2321 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2322 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2323 } 2718 }
2324 2719
2325 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2326 2721
2327 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2328 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2329 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2330 2725
2331 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2332 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2333 undef $fh; 2728 undef $fh;
2334 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2335 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2336 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2337 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2338 } 2737 }
2339} 2738}
2340 2739
2341sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2342 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2343 2742
2344 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2345 2744
2346 if ($exit->slaying eq "/!") {
2347 #TODO: this should de-fi-ni-te-ly not be a sync-job
2348 # the problem is that $exit might not survive long enough
2349 # so it needs to be done right now, right here
2350 cf::sync_job { prepare_random_map $exit };
2351 }
2352
2353 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2354 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp;
2356
2357 $self->enter_link; 2745 $self->enter_link;
2358 2746
2359 (async { 2747 (async {
2360 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2361 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2362 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2363 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2364 1; 2771 1
2365 }) { 2772 }) {
2366 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2367 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2368 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2369 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2390 2797
2391 utf8::encode $text; 2798 utf8::encode $text;
2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2799 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2393} 2800}
2394 2801
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2802=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2803
2397Send a drawinfo or msg packet to the client, formatting the msg for the 2804Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of 2805client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress 2806the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet. 2807the message unless the client supports the msg packet.
2401 2808
2402=cut 2809=cut
2403 2810
2811# non-persistent channels (usually the info channel)
2812our %CHANNEL = (
2813 "c/identify" => {
2814 id => "infobox",
2815 title => "Identify",
2816 reply => undef,
2817 tooltip => "Items recently identified",
2818 },
2819 "c/examine" => {
2820 id => "infobox",
2821 title => "Examine",
2822 reply => undef,
2823 tooltip => "Signs and other items you examined",
2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/uptime" => {
2850 id => "infobox",
2851 title => "Uptime",
2852 reply => undef,
2853 tooltip => "How long the server has been running since last restart",
2854 },
2855 "c/mapinfo" => {
2856 id => "infobox",
2857 title => "Map Info",
2858 reply => undef,
2859 tooltip => "Information related to the maps",
2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2867);
2868
2404sub cf::client::send_msg { 2869sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2871
2407 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg);
2408 2873
2874 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875
2876 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel};
2879
2880 $self->ext_msg (channel_info => $channel)
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id};
2884
2885 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891 }
2892
2893 $channel = $channel->{id};
2894 }
2895
2896 return unless @extra || length $msg;
2897
2409 if ($self->can_msg) { 2898 if ($self->can_msg) {
2899 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF;
2902
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2903 $self->send_packet ("msg " . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2905 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) { 2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916
2917 $color &= cf::NDI_COLOR_MASK;
2918
2919 utf8::encode $msg;
2920
2423 if (0 && $msg =~ /\[/) { 2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2924 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2926 $self->send_packet ("drawinfo $color $msg")
2428 } 2927 }
2429 } 2928 }
2430 } 2929 }
2431} 2930}
2432 2931
2433=item $client->ext_event ($type, %msg) 2932=item $client->ext_msg ($type, @msg)
2434 2933
2435Sends an ext event to the client. 2934Sends an ext event to the client.
2436 2935
2437=cut 2936=cut
2438 2937
2439sub cf::client::ext_event($$%) { 2938sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2939 my ($self, $type, @msg) = @_;
2441 2940
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove
2442 $msg{msgtype} = "event_$type"; 2944 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2945 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2946 }
2947}
2948
2949=item $client->ext_reply ($msgid, @msg)
2950
2951Sends an ext reply to the client.
2952
2953=cut
2954
2955sub cf::client::ext_reply($$@) {
2956 my ($self, $id, @msg) = @_;
2957
2958 if ($self->extcmd == 2) {
2959 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2960 } elsif ($self->extcmd == 1) {
2961 #TODO: version 1, remove
2962 unshift @msg, msgtype => "reply", msgid => $id;
2963 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2964 }
2444} 2965}
2445 2966
2446=item $success = $client->query ($flags, "text", \&cb) 2967=item $success = $client->query ($flags, "text", \&cb)
2447 2968
2448Queues a query to the client, calling the given callback with 2969Queues a query to the client, calling the given callback with
2503 my ($ns, $buf) = @_; 3024 my ($ns, $buf) = @_;
2504 3025
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3026 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 3027
2507 if (ref $msg) { 3028 if (ref $msg) {
3029 my ($type, $reply, @payload) =
3030 "ARRAY" eq ref $msg
3031 ? @$msg
3032 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3033
3034 my @reply;
3035
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3036 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 3037 @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 } 3038 }
3039
3040 $ns->ext_reply ($reply, @reply)
3041 if $reply;
3042
2514 } else { 3043 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3044 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 } 3045 }
2517 3046
2518 cf::override; 3047 cf::override;
2565our $safe = new Safe "safe"; 3094our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 3095our $safe_hole = new Safe::Hole;
2567 3096
2568$SIG{FPE} = 'IGNORE'; 3097$SIG{FPE} = 'IGNORE';
2569 3098
2570$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3099$safe->permit_only (Opcode::opset qw(
3100 :base_core :base_mem :base_orig :base_math
3101 grepstart grepwhile mapstart mapwhile
3102 sort time
3103));
2571 3104
2572# here we export the classes and methods available to script code 3105# here we export the classes and methods available to script code
2573 3106
2574=pod 3107=pod
2575 3108
2576The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2577 3110
2578 cf::object contr pay_amount pay_player map 3111 cf::object
3112 contr pay_amount pay_player map x y force_find force_add destroy
3113 insert remove name archname title slaying race decrease split
3114
2579 cf::object::player player 3115 cf::object::player
2580 cf::player peaceful 3116 player
2581 cf::map trigger 3117
3118 cf::player
3119 peaceful
3120
3121 cf::map
3122 trigger
2582 3123
2583=cut 3124=cut
2584 3125
2585for ( 3126for (
2586 ["cf::object" => qw(contr pay_amount pay_player map)], 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3128 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)],
2587 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2590) { 3133) {
2591 no strict 'refs'; 3134 no strict 'refs';
2667# the server's init and main functions 3210# the server's init and main functions
2668 3211
2669sub load_facedata($) { 3212sub load_facedata($) {
2670 my ($path) = @_; 3213 my ($path) = @_;
2671 3214
3215 # HACK to clear player env face cache, we need some signal framework
3216 # for this (global event?)
3217 %ext::player_env::MUSIC_FACE_CACHE = ();
3218
3219 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3220
2672 warn "loading facedata from $path\n"; 3221 warn "loading facedata from $path\n";
2673 3222
2674 my $facedata; 3223 my $facedata;
2675 0 < aio_load $path, $facedata 3224 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 3225 or die "$path: $!";
2678 $facedata = Coro::Storable::thaw $facedata; 3227 $facedata = Coro::Storable::thaw $facedata;
2679 3228
2680 $facedata->{version} == 2 3229 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 3230 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 3231
3232 # patch in the exptable
3233 $facedata->{resource}{"res/exp_table"} = {
3234 type => FT_RSRC,
3235 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3236 };
3237 cf::cede_to_tick;
3238
2683 { 3239 {
2684 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
2685 3241
2686 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3245 cf::face::set_visibility $idx, $info->{visibility};
3246 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 3249
3250 cf::cede_to_tick;
2692 } 3251 }
2693 3252
2694 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
2696 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
2697 or next; 3257 or next;
3258
2698 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
3260 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 3262 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 3264 }
2703 Coro::cede; 3265
3266 cf::cede_to_tick;
2704 } 3267 }
2705 } 3268 }
2706 3269
2707 { 3270 {
2708 my $anims = $facedata->{animinfo}; 3271 my $anims = $facedata->{animinfo};
2709 3272
2710 while (my ($anim, $info) = each %$anims) { 3273 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3274 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 3275 cf::cede_to_tick;
2713 } 3276 }
2714 3277
2715 cf::anim::invalidate_all; # d'oh 3278 cf::anim::invalidate_all; # d'oh
2716 } 3279 }
2717 3280
3281 {
3282 # TODO: for gcfclient pleasure, we should give resources
3283 # that gcfclient doesn't grok a >10000 face index.
3284 my $res = $facedata->{resource};
3285
3286 while (my ($name, $info) = each %$res) {
3287 if (defined $info->{type}) {
3288 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3289 my $data;
3290
3291 if ($info->{type} & 1) {
3292 # prepend meta info
3293
3294 my $meta = $enc->encode ({
3295 name => $name,
3296 %{ $info->{meta} || {} },
3297 });
3298
3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3305 cf::face::set_type $idx, $info->{type};
3306 } else {
3307 $RESOURCE{$name} = $info;
3308 }
3309
3310 cf::cede_to_tick;
3311 }
3312 }
3313
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3315
2718 1 3316 1
2719} 3317}
2720 3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3338
3339register_exticmd fx_want => sub {
3340 my ($ns, $want) = @_;
3341
3342 while (my ($k, $v) = each %$want) {
3343 $ns->fx_want ($k, $v);
3344 }
3345};
3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3356
2721sub reload_regions { 3357sub reload_regions {
3358 # HACK to clear player env face cache, we need some signal framework
3359 # for this (global event?)
3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3361
2722 load_resource_file "$MAPDIR/regions" 3362 load_resource_file "$MAPDIR/regions"
2723 or die "unable to load regions file\n"; 3363 or die "unable to load regions file\n";
3364
3365 for (cf::region::list) {
3366 $_->{match} = qr/$_->{match}/
3367 if exists $_->{match};
3368 }
2724} 3369}
2725 3370
2726sub reload_facedata { 3371sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 3372 load_facedata "$DATADIR/facedata"
2728 or die "unable to load facedata\n"; 3373 or die "unable to load facedata\n";
2729} 3374}
2730 3375
2731sub reload_archetypes { 3376sub reload_archetypes {
2732 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
2733 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
2734 #d# NEED to laod twice to resolve forward references
2735 # this really needs to be done in an extra post-pass
2736 # (which needs to be synchronous, so solve it differently)
2737 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n";
2739} 3379}
2740 3380
2741sub reload_treasures { 3381sub reload_treasures {
2742 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
2743 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
2744} 3384}
2745 3385
2746sub reload_resources { 3386sub reload_resources {
2747 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
2748 3388
3389 reload_facedata;
3390 reload_archetypes;
2749 reload_regions; 3391 reload_regions;
2750 reload_facedata;
2751 #reload_archetypes;#d#
2752 reload_archetypes;
2753 reload_treasures; 3392 reload_treasures;
2754 3393
2755 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
2756} 3395}
2757 3396
2758sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
2759 reload_resources; 3400 reload_resources;
2760} 3401}
2761 3402
2762sub cfg_load { 3403sub reload_config {
2763 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
2764 or return; 3405 or return;
2765 3406
2766 local $/; 3407 local $/;
2767 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
2768 3409
2769 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2770 3411
2771 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2772 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2783sub main { 3424sub main {
2784 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
2785 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
2786 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2787 (async { 3428 (async {
2788 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
2789 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
2790 }; 3432 };
2791 3433
2792 cfg_load; 3434 {
3435 my $guard = freeze_mainloop;
3436 reload_config;
2793 db_init; 3437 db_init;
2794 load_extensions; 3438 load_extensions;
2795 3439
2796 $TICK_WATCHER->start; 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
2797 Event::loop; 3444 EV::loop;
2798} 3445}
2799 3446
2800############################################################################# 3447#############################################################################
2801# initialisation and cleanup 3448# initialisation and cleanup
2802 3449
2803# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
2804BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
2805 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
2806 Event->signal ( 3454 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2807 reentrant => 0,
2808 data => WF_AUTOCANCEL,
2809 signal => $signal,
2810 prio => 0,
2811 cb => sub {
2812 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
2813 },
2814 ); 3456 };
2815 } 3457 }
2816} 3458}
2817 3459
2818sub write_runtime { 3460sub write_runtime_sync {
2819 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
2820 3462
2821 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
2822 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
2823 3465
2849 and return; 3491 and return;
2850 3492
2851 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
2852 3494
2853 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
2854} 3539}
2855 3540
2856sub emergency_save() { 3541sub emergency_save() {
2857 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2858 3543
2864 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
2865 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
2866 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
2867 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
2868 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2869 $pl->save; 3555 $pl->save;
2870 } 3556 }
2871 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
2872 3558
2873 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
2879 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
2880 3566
2881 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
2882 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
2883 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
2884 }; 3574 };
2885 3575
2886 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
2887} 3577}
2888 3578
2903 warn "reloading..."; 3593 warn "reloading...";
2904 3594
2905 warn "entering sync_job"; 3595 warn "entering sync_job";
2906 3596
2907 cf::sync_job { 3597 cf::sync_job {
2908 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2909 cf::emergency_save; 3599 cf::emergency_save;
2910 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2911 3601
2912 warn "syncing database to disk"; 3602 warn "syncing database to disk";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
2914 3604
2915 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
2916
2917 warn "cancelling all WF_AUTOCANCEL watchers";
2918 for (Event::all_watchers) {
2919 $_->cancel if $_->data & WF_AUTOCANCEL;
2920 }
2921 3606
2922 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
2923 for (;;) { 3608 for (;;) {
2924 BDB::flush; 3609 BDB::flush;
2925 IO::AIO::flush; 3610 IO::AIO::flush;
2926 Coro::cede; 3611 Coro::cede_notself;
2927 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
2928 warn "iterate..."; 3613 warn "iterate...";
2929 } 3614 }
2930 3615
2931 ++$RELOAD; 3616 ++$RELOAD;
2990 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
2991 require cf; 3676 require cf;
2992 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2993 3678
2994 warn "loading config and database again"; 3679 warn "loading config and database again";
2995 cf::cfg_load; 3680 cf::reload_config;
2996 3681
2997 warn "loading extensions"; 3682 warn "loading extensions";
2998 cf::load_extensions; 3683 cf::load_extensions;
2999 3684
3000 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3007 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3008 3693
3009 1 3694 1
3010 } or do { 3695 } or do {
3011 warn $@; 3696 warn $@;
3012 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3013 exit 1;
3014 }; 3698 };
3015 3699
3016 warn "reloaded"; 3700 warn "reloaded";
3017}; 3701};
3018 3702
3020 3704
3021sub reload_perl() { 3705sub reload_perl() {
3022 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3023 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3024 3708
3025 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3026 reentrant => 0,
3027 after => 0,
3028 data => WF_AUTOCANCEL,
3029 cb => sub {
3030 do_reload_perl; 3710 do_reload_perl;
3031 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3032 },
3033 ); 3712 };
3034} 3713}
3035 3714
3036register_command "reload" => sub { 3715register_command "reload" => sub {
3037 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
3038 3717
3039 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
3040 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
3041 async { reload_perl }; 3722 reload_perl;
3723 };
3042 } 3724 }
3043}; 3725};
3044 3726
3045unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
3046 3728
3048 3730
3049our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3050our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3051 3733
3052sub wait_for_tick { 3734sub wait_for_tick {
3053 return unless $TICK_WATCHER->is_active;
3054 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3055 3736
3056 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3057 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3058 $signal->wait; 3739 $signal->wait;
3059} 3740}
3060 3741
3061sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3062 return unless $TICK_WATCHER->is_active;
3063 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3064 3744
3065 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3066 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3067 $signal->wait; 3747 $signal->wait;
3068} 3748}
3069 3749
3070 my $min = 1e6;#d# 3750sub tick {
3071 my $avg = 10;
3072$TICK_WATCHER = Event->timer (
3073 reentrant => 0,
3074 parked => 1,
3075 prio => 0,
3076 at => $NEXT_TICK || $TICK,
3077 data => WF_AUTOCANCEL,
3078 cb => sub {
3079 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3080 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3081 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3082 return; 3754 return;
3083 } 3755 }
3084 3756
3085 $NOW = $tick_start = Event::time;
3086
3087 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3088 3758
3089 0 && sync_job {#d# 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3090 for(1..10) { 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3091 my $t = Event::time; 3761 Coro::async_pool {
3092 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3762 $Coro::current->{desc} = "runtime saver";
3093 or die; 3763 write_runtime_sync
3094 3764 or warn "ERROR: unable to write runtime file: $!";
3095 $map->width (50);
3096 $map->height (50);
3097 $map->alloc;
3098 $map->_load_objects ("/tmp/x.map", 1);
3099 my $t = Event::time - $t;
3100
3101 #next unless $t < 0.0013;#d#
3102 if ($t < $min) {
3103 $min = $t;
3104 }
3105 $avg = $avg * 0.99 + $t * 0.01;
3106 }
3107 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3108 exit 0;
3109 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3110 }; 3765 };
3766 }
3111 3767
3112 $RUNTIME += $TICK;
3113 $NEXT_TICK += $TICK;
3114
3115 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3116 $NEXT_RUNTIME_WRITE = $NOW + 10;
3117 Coro::async_pool {
3118 write_runtime
3119 or warn "ERROR: unable to write runtime file: $!";
3120 };
3121 }
3122
3123# my $AFTER = Event::time;
3124# warn $AFTER - $NOW;#d#
3125
3126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3127 $sig->send; 3769 $sig->send;
3128 } 3770 }
3129 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3130 $sig->send; 3772 $sig->send;
3131 } 3773 }
3132 3774
3133 $NOW = Event::time; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3134
3135 # if we are delayed by four ticks or more, skip them all
3136 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3137
3138 $TICK_WATCHER->at ($NEXT_TICK);
3139 $TICK_WATCHER->start;
3140
3141 $LOAD = ($NOW - $tick_start) / $TICK;
3142 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3143 3777
3144 _post_tick; 3778 if (0) {
3145 3779 if ($NEXT_TICK) {
3146 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3147 }, 3784 }
3148); 3785}
3149 3786
3150{ 3787{
3151 BDB::max_poll_time $TICK * 0.1; 3788 # configure BDB
3152 $BDB_POLL_WATCHER = Event->io ( 3789
3153 reentrant => 0,
3154 fd => BDB::poll_fileno,
3155 poll => 'r',
3156 prio => 0,
3157 data => WF_AUTOCANCEL,
3158 cb => \&BDB::poll_cb,
3159 );
3160 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3161 3791 BDB::max_poll_reqs $TICK * 0.1;
3162 BDB::set_sync_prepare { 3792 $Coro::BDB::WATCHER->priority (1);
3163 my $status;
3164 my $current = $Coro::current;
3165 (
3166 sub {
3167 $status = $!;
3168 $current->ready; undef $current;
3169 },
3170 sub {
3171 Coro::schedule while defined $current;
3172 $! = $status;
3173 },
3174 )
3175 };
3176 3793
3177 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3178 $DB_ENV = BDB::db_env_create; 3795 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3797 | BDB::LOG_AUTOREMOVE, 1);
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3179 3800
3180 cf::sync_job { 3801 cf::sync_job {
3181 eval { 3802 eval {
3182 BDB::db_env_open 3803 BDB::db_env_open
3183 $DB_ENV, 3804 $DB_ENV,
3185 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3806 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3186 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3807 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3187 0666; 3808 0666;
3188 3809
3189 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3810 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3190
3191 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3192 $DB_ENV->set_lk_detect;
3193 }; 3811 };
3194 3812
3195 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3196 }; 3814 };
3197 } 3815 }
3816
3817 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3818 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3819 };
3820 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3821 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3822 };
3823 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3824 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3825 };
3198} 3826}
3199 3827
3200{ 3828{
3829 # configure IO::AIO
3830
3201 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3202
3203 undef $Coro::AIO::WATCHER;
3204 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3205 $AIO_POLL_WATCHER = Event->io ( 3833 $Coro::AIO::WATCHER->priority (1);
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 fd => IO::AIO::poll_fileno,
3209 poll => 'r',
3210 prio => 6,
3211 cb => \&IO::AIO::poll_cb,
3212 );
3213} 3834}
3214 3835
3215my $_log_backtrace; 3836my $_log_backtrace;
3216 3837
3217sub _log_backtrace { 3838sub _log_backtrace {
3221 3842
3222 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3223 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3224 ++$_log_backtrace; 3845 ++$_log_backtrace;
3225 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3226 my @bt = fork_call { 3849 my @bt = fork_call {
3227 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3228 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3229 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3852 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3230 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines