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.303 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
68our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
74 120
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 123our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
82 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
85 132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME;
137our $NOW;
90 138
91our %PLAYER; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 140our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
94 142
95# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 145
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
101 155
102binmode STDOUT; 156binmode STDOUT;
103binmode STDERR; 157binmode STDERR;
104 158
105# read virtual server time, if available 159# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
110} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
111 167
112mkdir $_ 168mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 170
115our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
116 172
117sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 189
119############################################################################# 190#############################################################################
120 191
121=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
122 193
158 229
159The raw value load value from the last tick. 230The raw value load value from the last tick.
160 231
161=item %cf::CFG 232=item %cf::CFG
162 233
163Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 235from wherever your confdir points to.
165 236
166=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
167 238
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
248=item @cf::INVOKE_RESULTS
249
250This array contains the results of the last C<invoke ()> call. When
251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
252that call.
253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
172=back 260=back
173 261
174=cut 262=cut
175 263
176BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
177 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
178 my $msg = join "", @_; 271 my $msg = join "", @_;
179 272
180 $msg .= "\n" 273 $msg .= "\n"
181 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
182 275
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 277
185 utf8::encode $msg;
186 LOG llevError, $msg; 278 LOG llevWarn, $msg;
187 }; 279};
188} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
189 294
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 305for my $pkg (qw(
201 cf::global cf::attachable 306 cf::global cf::attachable
202 cf::object cf::object::player 307 cf::object cf::object::player
203 cf::client cf::player 308 cf::client cf::player
204 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
205 cf::map cf::party cf::region 311 cf::party cf::region
206)) { 312)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 314}
210 315
211$Event::DIED = sub { 316$EV::DIED = sub {
212 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
213}; 318};
214 319
215############################################################################# 320#############################################################################
216 321
217=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 344 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 345 $d
241 } || "[unable to dump $_[0]: '$@']"; 346 } || "[unable to dump $_[0]: '$@']";
242} 347}
243 348
244=item $ref = cf::from_json $json 349=item $ref = cf::decode_json $json
245 350
246Converts a JSON string into the corresponding perl data structure. 351Converts a JSON string into the corresponding perl data structure.
247 352
248=item $json = cf::to_json $ref 353=item $json = cf::encode_json $ref
249 354
250Converts a perl data structure into its JSON representation. 355Converts a perl data structure into its JSON representation.
251 356
252=cut 357=cut
253 358
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 360
256sub to_json ($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
376=item cf::post_init { BLOCK }
377
378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
379but I<before> the server starts ticking again.
380
381The codeblock will have a single boolean argument to indicate whether this
382is a reload or not.
383
384=cut
385
386sub post_init(&) {
387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
405}
258 406
259=item cf::lock_wait $string 407=item cf::lock_wait $string
260 408
261Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
262 410
263=item my $lock = cf::lock_acquire $string 411=item my $lock = cf::lock_acquire $string
264 412
265Wait until the given lock is available and then acquires it and returns 413Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 414a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 415for example when the coroutine gets canceled), the lock is automatically
268returned. 416returned.
269 417
418Locks are *not* recursive, locking from the same coro twice results in a
419deadlocked coro.
420
270Lock names should begin with a unique identifier (for example, cf::map::find 421Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 422uses map_find and cf::map::load uses map_load).
272 423
273=item $locked = cf::lock_active $string 424=item $locked = cf::lock_active $string
274 425
275Return true if the lock is currently active, i.e. somebody has locked it. 426Return true if the lock is currently active, i.e. somebody has locked it.
276 427
277=cut 428=cut
278 429
279our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
280 431
281sub lock_wait($) { 432sub lock_wait($) {
282 my ($key) = @_; 433 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 434}
290 435
291sub lock_acquire($) { 436sub lock_acquire($) {
292 my ($key) = @_; 437 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 438}
304 439
305sub lock_active($) { 440sub lock_active($) {
306 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 442}
310 443
311sub freeze_mainloop { 444sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 445 tick_inhibit_inc;
313 446
314 my $guard = Coro::guard { 447 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 448}
449
450=item cf::periodic $interval, $cb
451
452Like EV::periodic, but randomly selects a starting point so that the actions
453get spread over time.
454
455=cut
456
457sub periodic($$) {
458 my ($interval, $cb) = @_;
459
460 my $start = rand List::Util::min 180, $interval;
461
462 EV::periodic $start, $interval, 0, $cb
463}
464
465=item cf::get_slot $time[, $priority[, $name]]
466
467Allocate $time seconds of blocking CPU time at priority C<$priority>:
468This call blocks and returns only when you have at least C<$time> seconds
469of cpu time till the next tick. The slot is only valid till the next cede.
470
471The optional C<$name> can be used to identify the job to run. It might be
472used for statistical purposes and should identify the same time-class.
473
474Useful for short background jobs.
475
476=cut
477
478our @SLOT_QUEUE;
479our $SLOT_QUEUE;
480our $SLOT_DECAY = 0.9;
481
482$SLOT_QUEUE->cancel if $SLOT_QUEUE;
483$SLOT_QUEUE = Coro::async {
484 $Coro::current->desc ("timeslot manager");
485
486 my $signal = new Coro::Signal;
487 my $busy;
488
489 while () {
490 next_job:
491
492 my $avail = cf::till_tick;
493
494 for (0 .. $#SLOT_QUEUE) {
495 if ($SLOT_QUEUE[$_][0] <= $avail) {
496 $busy = 0;
497 my $job = splice @SLOT_QUEUE, $_, 1, ();
498 $job->[2]->send;
499 Coro::cede;
500 goto next_job;
501 } else {
502 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
503 }
504 }
505
506 if (@SLOT_QUEUE) {
507 # we do not use wait_for_tick() as it returns immediately when tick is inactive
508 push @cf::WAIT_FOR_TICK, $signal;
509 $signal->wait;
510 } else {
511 $busy = 0;
512 Coro::schedule;
513 }
316 }; 514 }
317 $TICK_WATCHER->stop; 515};
318 $guard 516
517sub get_slot($;$$) {
518 return if tick_inhibit || $Coro::current == $Coro::main;
519
520 my ($time, $pri, $name) = @_;
521
522 $time = clamp $time, 0.01, $TICK * .6;
523
524 my $sig = new Coro::Signal;
525
526 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
527 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
528 $SLOT_QUEUE->ready;
529 $sig->wait;
319} 530}
320 531
321=item cf::async { BLOCK } 532=item cf::async { BLOCK }
322 533
323Currently the same as Coro::async_pool, meaning you cannot use 534Currently the same as Coro::async_pool, meaning you cannot use
328 539
329BEGIN { *async = \&Coro::async_pool } 540BEGIN { *async = \&Coro::async_pool }
330 541
331=item cf::sync_job { BLOCK } 542=item cf::sync_job { BLOCK }
332 543
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 544The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 545is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 546partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 547acceptable.
337 548
338If it must be done, put the blocking parts into C<sync_job>. This will run 549If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 550the given BLOCK in another coroutine while waiting for the result. The
343=cut 554=cut
344 555
345sub sync_job(&) { 556sub sync_job(&) {
346 my ($job) = @_; 557 my ($job) = @_;
347 558
348 if ($Coro::current == $Coro::main) { 559 if (in_main) {
349 my $time = Event::time; 560 my $time = AE::time;
350 561
351 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
353 564
354 # TODO: use suspend/resume instead 565 #LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 566
356 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
357 568
358 my $busy = 1; 569 my $busy = 1;
359 my @res; 570 my @res;
360 571
361 (async { 572 (async {
573 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 574 @res = eval { $job->() };
363 warn $@ if $@; 575 error $@ if $@;
364 undef $busy; 576 undef $busy;
365 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
366 578
367 while ($busy) { 579 while ($busy) {
368 Coro::cede or Event::one_event; 580 if (Coro::nready) {
581 Coro::cede_notself;
582 } else {
583 EV::loop EV::LOOP_ONESHOT;
369 } 584 }
585 }
370 586
371 $time = Event::time - $time; 587 my $time = AE::time - $time;
372 588
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
377 590
378 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
379 } else { 592 } else {
380 # we are in another coroutine, how wonderful, everything just works 593 # we are in another coroutine, how wonderful, everything just works
381 594
401 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
402 615
403 $coro 616 $coro
404} 617}
405 618
406=item fork_call { }, $args 619=item fork_call { }, @args
407 620
408Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 624never block itself or use any form of event handling.
412 625
413=cut 626=cut
414 627
415sub _store_scalar { 628sub post_fork {
416 open my $fh, ">", \my $buf 629 reset_signals;
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422} 630}
423 631
424sub fork_call(&@) { 632sub fork_call(&@) {
425 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
426 634
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 635 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 636 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 637 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 638
432 if (my $pid = fork) { 639 my @res = Coro::Util::fork_eval {
433 close $fh2; 640 cf::post_fork;
641 &$cb
642 } @args;
434 643
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 644 wantarray ? @res : $res[-1]
436 warn "pst<$res>" unless $res =~ /^pst/; 645}
437 $res = Coro::Storable::thaw $res;
438 646
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 647sub objinfo {
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals;
446 local $SIG{__WARN__};
447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
454 eval {
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 } 648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
656}
657
658=item $coin = coin_from_name $name
659
660=cut
661
662our %coin_alias = (
663 "silver" => "silvercoin",
664 "silvercoin" => "silvercoin",
665 "silvercoins" => "silvercoin",
666 "gold" => "goldcoin",
667 "goldcoin" => "goldcoin",
668 "goldcoins" => "goldcoin",
669 "platinum" => "platinacoin",
670 "platinumcoin" => "platinacoin",
671 "platinumcoins" => "platinacoin",
672 "platina" => "platinacoin",
673 "platinacoin" => "platinacoin",
674 "platinacoins" => "platinacoin",
675 "royalty" => "royalty",
676 "royalties" => "royalty",
677);
678
679sub coin_from_name($) {
680 $coin_alias{$_[0]}
681 ? cf::arch::find $coin_alias{$_[0]}
682 : undef
466} 683}
467 684
468=item $value = cf::db_get $family => $key 685=item $value = cf::db_get $family => $key
469 686
470Returns a single value from the environment database. 687Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 689=item cf::db_put $family => $key => $value
473 690
474Stores the given C<$value> in the family. It can currently store binary 691Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 692data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 693
694=item $db = cf::db_table "name"
695
696Create and/or open a new database table. The string must not be "db" and must be unique
697within each server.
698
477=cut 699=cut
700
701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
705 my ($name) = @_;
706 my $db = BDB::db_create $DB_ENV;
707
708 eval {
709 $db->set_flags (BDB::CHKSUM);
710
711 utf8::encode $name;
712 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
713 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
714 cf::cleanup "db_open(db): $!" if $!;
715 };
716 cf::cleanup "db_open(db): $@" if $@;
717
718 $db
719}
478 720
479our $DB; 721our $DB;
480 722
481sub db_init { 723sub db_init {
482 unless ($DB) { 724 $DB ||= db_table "db";
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job {
486 eval {
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 }
496} 725}
497 726
498sub db_get($$) { 727sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
500 729
501 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
502 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
503 734
504 $! ? () 735 $! ? ()
505 : $data 736 : $data
506 }
507} 737}
508 738
509sub db_put($$$) { 739sub db_put($$$) {
510 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
511 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
550 if (1) { 780 if (1) {
551 $md5 = 781 $md5 =
552 join "\x00", 782 join "\x00",
553 $processversion, 783 $processversion,
554 map { 784 map {
555 Coro::cede; 785 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 786 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 787 } 0.. $#$src;
558 788
559 789
560 my $dbmd5 = db_get cache => "$id/md5"; 790 my $dbmd5 = db_get cache => "$id/md5";
567 797
568 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
569 my $data = $process->(\@data); 799 my $data = $process->(\@data);
570 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
571 801
572 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
573 803
574 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
575 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
576 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
577 807
587 817
588=cut 818=cut
589 819
590sub datalog($@) { 820sub datalog($@) {
591 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
592 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
593} 823}
594 824
595=back 825=back
596 826
597=cut 827=cut
598 828
599############################################################################# 829#############################################################################
600 830
601=head2 ATTACHABLE OBJECTS 831=head2 ATTACHABLE OBJECTS
602 832
603Many objects in crossfire are so-called attachable objects. That means you can 833Many objects in deliantra are so-called attachable objects. That means you can
604attach callbacks/event handlers (a collection of which is called an "attachment") 834attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 835to it. All such attachable objects support the following methods.
606 836
607In the following description, CLASS can be any of C<global>, C<object> 837In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 838C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 839Deliantra).
610 840
611=over 4 841=over 4
612 842
613=item $attachable->attach ($attachment, key => $value...) 843=item $attachable->attach ($attachment, key => $value...)
614 844
658=item cf::CLASS::attachment $name, ... 888=item cf::CLASS::attachment $name, ...
659 889
660Register an attachment by C<$name> through which attachable objects of the 890Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 891given CLASS can refer to this attachment.
662 892
663Some classes such as crossfire maps and objects can specify attachments 893Some classes such as deliantra maps and objects can specify attachments
664that are attached at load/instantiate time, thus the need for a name. 894that are attached at load/instantiate time, thus the need for a name.
665 895
666These calls expect any number of the following handler/hook descriptions: 896These calls expect any number of the following handler/hook descriptions:
667 897
668=over 4 898=over 4
792 1022
793 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
794 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
795 1025
796 } elsif (ref $type) { 1026 } elsif (ref $type) {
797 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
798 1028
799 } else { 1029 } else {
800 shift @arg; 1030 shift @arg;
801 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
802 } 1032 }
803 } 1033 }
804} 1034}
805 1035
806sub _object_attach { 1036sub _object_attach {
816 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
817 } 1047 }
818 1048
819 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
820 } else { 1050 } else {
821 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
822 } 1052 }
823 1053
824 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
825} 1055}
826 1056
866 "; 1096 ";
867 die if $@; 1097 die if $@;
868} 1098}
869 1099
870our $override; 1100our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1101our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1102
873sub override { 1103sub override {
874 $override = 1; 1104 $override = 1;
875 @invoke_results = (); 1105 @INVOKE_RESULTS = (@_);
876} 1106}
877 1107
878sub do_invoke { 1108sub do_invoke {
879 my $event = shift; 1109 my $event = shift;
880 my $callbacks = shift; 1110 my $callbacks = shift;
881 1111
882 @invoke_results = (); 1112 @INVOKE_RESULTS = ();
883 1113
884 local $override; 1114 local $override;
885 1115
886 for (@$callbacks) { 1116 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
888 1118
889 if ($@) { 1119 if ($@) {
890 warn "$@";
891 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
892 override; 1121 override;
893 } 1122 }
894 1123
895 return 1 if $override; 1124 return 1 if $override;
896 } 1125 }
897 1126
898 0 1127 0
899} 1128}
900 1129
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1131
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1132=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1133
905Generate an object-specific event with the given arguments. 1134Generate an object-specific event with the given arguments.
906 1135
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1136This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1137removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1138results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1139
911=back 1140=back
912 1141
913=cut 1142=cut
914 1143
915############################################################################# 1144#############################################################################
916# object support 1145# object support
1146
1147sub _object_equal($$);
1148sub _object_equal($$) {
1149 my ($a, $b) = @_;
1150
1151 return 0 unless (ref $a) eq (ref $b);
1152
1153 if ("HASH" eq ref $a) {
1154 my @ka = keys %$a;
1155 my @kb = keys %$b;
1156
1157 return 0 if @ka != @kb;
1158
1159 for (0 .. $#ka) {
1160 return 0 unless $ka[$_] eq $kb[$_];
1161 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1162 }
1163
1164 } elsif ("ARRAY" eq ref $a) {
1165
1166 return 0 if @$a != @$b;
1167
1168 for (0 .. $#$a) {
1169 return 0 unless _object_equal $a->[$_], $b->[$_];
1170 }
1171
1172 } elsif ($a ne $b) {
1173 return 0;
1174 }
1175
1176 1
1177}
1178
1179our $SLOW_MERGES;#d#
1180sub _can_merge {
1181 my ($ob1, $ob2) = @_;
1182
1183 ++$SLOW_MERGES;#d#
1184
1185 # we do the slow way here
1186 return _object_equal $ob1, $ob2
1187}
917 1188
918sub reattach { 1189sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1190 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1191 my ($obj) = @_;
921 1192
1193 # no longer needed after getting rid of delete_package?
922 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1194 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
923 1195
924 my $registry = $obj->registry; 1196 my $registry = $obj->registry;
925 1197
926 @$registry = (); 1198 @$registry = ();
927 1199
932 for (@$attach) { 1204 for (@$attach) {
933 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
934 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
935 } 1207 }
936 } else { 1208 } else {
937 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
938 } 1210 }
939 } 1211 }
940} 1212}
941 1213
942cf::attachable->attach ( 1214cf::attachable->attach (
943 prio => -1000000, 1215 prio => -1000000,
944 on_instantiate => sub { 1216 on_instantiate => sub {
945 my ($obj, $data) = @_; 1217 my ($obj, $data) = @_;
946 1218
947 $data = from_json $data; 1219 $data = decode_json $data;
948 1220
949 for (@$data) { 1221 for (@$data) {
950 my ($name, $args) = @$_; 1222 my ($name, $args) = @$_;
951 1223
952 $obj->attach ($name, %{$args || {} }); 1224 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1240sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
970 1242
971 sync_job { 1243 sync_job {
972 if (length $$rdata) { 1244 if (length $$rdata) {
1245 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
975 1249
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1251 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1253 if ($cf::USE_FSYNC) {
1254 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1255 aio_fsync $fh;
1256 }
980 close $fh; 1257 aio_close $fh;
981 1258
982 if (@$objs) { 1259 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1260 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1261 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1264 if ($cf::USE_FSYNC) {
1265 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1266 aio_fsync $fh;
1267 }
988 close $fh; 1268 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
990 } 1270 }
991 } else { 1271 } else {
992 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
993 } 1273 }
994 1274
995 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1279 } else {
997 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
998 } 1281 }
999 } else { 1282 } else {
1000 aio_unlink $filename; 1283 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1002 } 1285 }
1003 } 1286 };
1004} 1287}
1005 1288
1006sub object_freezer_as_string { 1289sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1290 my ($rdata, $objs) = @_;
1008 1291
1020 or return; 1303 or return;
1021 1304
1022 unless (aio_stat "$filename.pst") { 1305 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1306 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1307 or return;
1308
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1309 my $st = eval { Coro::Storable::thaw $av };
1310 $av = $st->{objs};
1026 } 1311 }
1027 1312
1313 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1317
1030 return ($data, $av); 1318 ($data, $av)
1031} 1319}
1032 1320
1033=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1034 1322
1035=over 4 1323=over 4
1089 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1090 1378
1091 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1092} 1380}
1093 1381
1382use File::Glob ();
1383
1094cf::player->attach ( 1384cf::player->attach (
1095 on_command => sub { 1385 on_unknown_command => sub {
1096 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1097 1387
1098 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1099 or return; 1389 or return;
1100 1390
1108 my ($pl, $buf) = @_; 1398 my ($pl, $buf) = @_;
1109 1399
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1400 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1401
1112 if (ref $msg) { 1402 if (ref $msg) {
1403 my ($type, $reply, @payload) =
1404 "ARRAY" eq ref $msg
1405 ? @$msg
1406 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1407
1408 my @reply;
1409
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1410 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1411 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1412 }
1413
1414 $pl->ext_reply ($reply, @reply)
1415 if $reply;
1416
1118 } else { 1417 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1419 }
1121 1420
1122 cf::override; 1421 cf::override;
1123 }, 1422 },
1124); 1423);
1125 1424
1425# "readahead" all extensions
1426sub cache_extensions {
1427 my $grp = IO::AIO::aio_group;
1428
1429 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1430 for (grep /\.ext$/, @{$_[0]}) {
1431 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1432 }
1433 };
1434
1435 $grp
1436}
1437
1126sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1127 cf::sync_job { 1441 cf::sync_job {
1128 my %todo; 1442 my %todo;
1129 1443
1130 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1131 next unless -r $path; 1445 next unless -r $path;
1149 1463
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1466
1153 $ext{source} = 1467 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1155 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1156 . $source 1470 . $source
1157 . "\n};\n1"; 1471 . "\n};\n1";
1158 1472
1159 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1160 } 1474 }
1161 1475
1476 my $pass = 0;
1162 my %done; 1477 my %done;
1163 while (%todo) { 1478 while (%todo) {
1164 my $progress; 1479 my $progress;
1165 1480
1481 ++$pass;
1482
1483 ext:
1166 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1167 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1168 goto skip 1486 next ext
1169 unless exists $done{$_}; 1487 unless exists $done{$_};
1170 } 1488 }
1171 1489
1172 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1173 1491
1174 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1175 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1176 : "$v->{base}: extension inactive.\n";
1177 1496
1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1178 if (exists $v->{meta}{mandatory}) { 1498 if exists $v->{meta}{mandatory};
1179 warn $msg; 1499
1180 warn "mandatory extension failed to load, exiting.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1181 exit 1; 1501 delete $todo{$k};
1182 } 1502 } else {
1183 1503 $done{$k} = delete $todo{$k};
1184 warn $msg; 1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1185 } 1509 }
1186
1187 $done{$k} = delete $todo{$k};
1188 push @EXTS, $v->{pkg};
1189 $progress = 1;
1190 } 1510 }
1191 1511
1192 skip: 1512 unless ($progress) {
1193 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1194 unless $progress; 1514
1515 while (my ($k, $v) = each %todo) {
1516 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517 if exists $v->{meta}{mandatory};
1518 }
1519 }
1195 } 1520 }
1196 }; 1521 };
1197} 1522}
1198 1523
1199############################################################################# 1524#############################################################################
1200 1525
1201=back 1526=back
1202 1527
1203=head2 CORE EXTENSIONS 1528=head2 CORE EXTENSIONS
1204 1529
1205Functions and methods that extend core crossfire objects. 1530Functions and methods that extend core deliantra objects.
1206 1531
1207=cut 1532=cut
1208 1533
1209package cf::player; 1534package cf::player;
1210 1535
1211use Coro::AIO; 1536use Coro::AIO;
1212 1537
1213=head3 cf::player 1538=head3 cf::player
1214 1539
1215=over 4 1540=over 4
1541
1542=item cf::player::num_playing
1543
1544Returns the official number of playing players, as per the Crossfire metaserver rules.
1545
1546=cut
1547
1548sub num_playing {
1549 scalar grep
1550 $_->ob->map
1551 && !$_->hidden
1552 && !$_->ob->flag (cf::FLAG_WIZ),
1553 cf::player::list
1554}
1216 1555
1217=item cf::player::find $login 1556=item cf::player::find $login
1218 1557
1219Returns the given player object, loading it if necessary (might block). 1558Returns the given player object, loading it if necessary (might block).
1220 1559
1239 1578
1240sub exists($) { 1579sub exists($) {
1241 my ($login) = @_; 1580 my ($login) = @_;
1242 1581
1243 $cf::PLAYER{$login} 1582 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1583 or !aio_stat path $login
1245} 1584}
1246 1585
1247sub find($) { 1586sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1587 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1588 my $login = $_[0];
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1595 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1596 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1597 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1598 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1599
1261 my $pl = load_pl path $login 1600 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1601 or return;
1602
1603 my $pl = cf::player::load_pl $f
1604 or return;
1605
1606 local $cf::PLAYER_LOADING{$login} = $pl;
1607 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1264 } 1609 }
1265 } 1610 }
1266} 1611}
1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1267 1625
1268sub save($) { 1626sub save($) {
1269 my ($pl) = @_; 1627 my ($pl) = @_;
1270 1628
1271 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1276 return if $pl->{deny_save}; 1634 return if $pl->{deny_save};
1277 1635
1278 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1280 1638
1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1643
1281 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1282 Coro::cede; 1645 cf::cede_to_tick;
1283} 1646}
1284 1647
1285sub new($) { 1648sub new($) {
1286 my ($login) = @_; 1649 my ($login) = @_;
1287 1650
1293 $cf::PLAYER{$login} = $self; 1656 $cf::PLAYER{$login} = $self;
1294 1657
1295 $self 1658 $self
1296} 1659}
1297 1660
1661=item $player->send_msg ($channel, $msg, $color, [extra...])
1662
1663=cut
1664
1665sub send_msg {
1666 my $ns = shift->ns
1667 or return;
1668 $ns->send_msg (@_);
1669}
1670
1298=item $pl->quit_character 1671=item $pl->quit_character
1299 1672
1300Nukes the player without looking back. If logged in, the connection will 1673Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1674be destroyed. May block for a long time.
1302 1675
1306 my ($pl) = @_; 1679 my ($pl) = @_;
1307 1680
1308 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1309 1682
1310 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1685
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1314 $pl->deactivate; 1687 $pl->deactivate;
1688
1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1316 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1317 1694
1318 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1320 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1355 or return []; 1732 or return [];
1356 1733
1357 my @logins; 1734 my @logins;
1358 1735
1359 for my $login (@$dirs) { 1736 for my $login (@$dirs) {
1737 my $path = path $login;
1738
1739 # a .pst is a dead give-away for a valid player
1740 # if no pst file found, open and chekc for blocked users
1741 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1742 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1743 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1744 $buf !~ /^password -------------$/m or next; # official not-valid tag
1745 }
1363 1746
1364 utf8::decode $login; 1747 utf8::decode $login;
1365 push @logins, $login; 1748 push @logins, $login;
1366 } 1749 }
1367 1750
1368 \@logins 1751 \@logins
1369} 1752}
1370 1753
1371=item $player->maps 1754=item $player->maps
1755
1756=item cf::player::maps $login
1372 1757
1373Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1374player. May block. 1759player. May block.
1375 1760
1376=cut 1761=cut
1394 } 1779 }
1395 1780
1396 \@paths 1781 \@paths
1397} 1782}
1398 1783
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1784=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1785
1401Expand crossfire pod fragments into protocol xml. 1786Expand deliantra pod fragments into protocol xml.
1402 1787
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1788=item $player->ext_reply ($msgid, @msg)
1450 1789
1451Sends an ext reply to the player. 1790Sends an ext reply to the player.
1452 1791
1453=cut 1792=cut
1454 1793
1455sub ext_reply($$%) { 1794sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1795 my ($self, $id, @msg) = @_;
1457 1796
1458 $msg{msgid} = $id; 1797 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1798}
1461 1799
1462=item $player->ext_event ($type, %msg) 1800=item $player->ext_msg ($type, @msg)
1463 1801
1464Sends an ext event to the client. 1802Sends an ext event to the client.
1465 1803
1466=cut 1804=cut
1467 1805
1468sub ext_event($$%) { 1806sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1807 my ($self, $type, @msg) = @_;
1470 1808
1471 $self->ns->ext_event ($type, %msg); 1809 $self->ns->ext_msg ($type, @msg);
1472} 1810}
1473 1811
1474=head3 cf::region 1812=head3 cf::region
1475 1813
1476=over 4 1814=over 4
1486=cut 1824=cut
1487 1825
1488sub find_by_path($) { 1826sub find_by_path($) {
1489 my ($path) = @_; 1827 my ($path) = @_;
1490 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1491 my ($match, $specificity); 1831 my ($match, $specificity);
1492 1832
1493 for my $region (list) { 1833 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1836 if $region->specificity > $specificity;
1497 } 1837 }
1498 } 1838 }
1499 1839
1520our $MAX_RESET = 3600; 1860our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1861our $DEFAULT_RESET = 3000;
1522 1862
1523sub generate_random_map { 1863sub generate_random_map {
1524 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1525 # mit "rum" bekleckern, nicht 1865
1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1867
1526 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1530 $rmp->{exit_on_final_map},
1531 $rmp->{xsize}, $rmp->{ysize},
1532 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1533 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1534 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1535 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1536 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1537 (cf::region::find $rmp->{region}), $rmp->{custom}
1538 )
1539} 1869}
1540 1870
1541=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1542 1872
1543Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
1548 1878
1549sub register { 1879sub register {
1550 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1551 my $pkg = caller; 1881 my $pkg = caller;
1552 1882
1553 no strict;
1554 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1555 1884
1556 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1557} 1886}
1558 1887
1559# also paths starting with '/' 1888# also paths starting with '/'
1560$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1561 1890
1562sub thawer_merge { 1891sub thawer_merge {
1563 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1564 1893
1565 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1570} 1899}
1571 1900
1572sub normalise { 1901sub normalise {
1573 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1574 1903
1575 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1576 1905
1577 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1578 1907
1579 # map plan: 1908 # map plan:
1580 # 1909 #
1595 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1596 $path = "$base/$path"; 1925 $path = "$base/$path";
1597 } 1926 }
1598 1927
1599 for ($path) { 1928 for ($path) {
1600 redo if s{//}{/};
1601 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1602 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1603 } 1931 }
1604 1932
1605 $path 1933 $path
1619 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1620 return $self; 1948 return $self;
1621 } 1949 }
1622 } 1950 }
1623 1951
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1625 () 1953 ()
1626} 1954}
1627 1955
1628sub init { 1956sub init {
1629 my ($self) = @_; 1957 my ($self) = @_;
1651 1979
1652# the temporary/swap location 1980# the temporary/swap location
1653sub save_path { 1981sub save_path {
1654 my ($self) = @_; 1982 my ($self) = @_;
1655 1983
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1984 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1985 "$TMPDIR/$path.map"
1658} 1986}
1659 1987
1660# the unique path, undef == no special unique path 1988# the unique path, undef == no special unique path
1661sub uniq_path { 1989sub uniq_path {
1662 my ($self) = @_; 1990 my ($self) = @_;
1663 1991
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1994}
1676 1995
1677sub decay_objects { 1996sub decay_objects {
1678 my ($self) = @_; 1997 my ($self) = @_;
1679 1998
1692 2011
1693sub load_header_from($) { 2012sub load_header_from($) {
1694 my ($self, $path) = @_; 2013 my ($self, $path) = @_;
1695 2014
1696 utf8::encode $path; 2015 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 2016 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 2017 or return;
2018
2019 $self->_load_header ($f)
2020 or return;
2021
2022 local $MAP_LOADING{$self->{path}} = $self;
2023 $f->resolve_delayed_derefs;
1702 2024
1703 $self->{load_path} = $path; 2025 $self->{load_path} = $path;
1704 2026
1705 1 2027 1
1706} 2028}
1758 2080
1759sub find; 2081sub find;
1760sub find { 2082sub find {
1761 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
1762 2084
2085 cf::cede_to_tick;
2086
1763 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1764 2088
2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1766 2091
1767 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
1770 or return; 2094 or return;
1771 2095
1772 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
1773 2097
1775 or return; 2099 or return;
1776 2100
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2101 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2102 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2103 #$cf::WAIT_FOR_TICK->wait;
2104 undef $guard2;
2105 undef $guard1;
1780 $map->reset; 2106 $map->reset;
1781 undef $guard;
1782 return find $path; 2107 return find $path;
1783 } 2108 }
1784 2109
1785 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
1786 } 2111 }
1787} 2112}
1788 2113
1789sub pre_load { } 2114sub pre_load { }
1790sub post_load { } 2115#sub post_load { } # XS
1791 2116
1792sub load { 2117sub load {
1793 my ($self) = @_; 2118 my ($self) = @_;
1794 2119
1795 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
1796 2121
1797 my $path = $self->{path}; 2122 my $path = $self->{path};
1798 2123
1799 { 2124 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2125 my $guard = cf::lock_acquire "map_data:$path";
1801 2126
2127 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2128 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2129
1804 $self->in_memory (cf::MAP_LOADING); 2130 $self->in_memory (cf::MAP_LOADING);
1805 2131
1806 $self->alloc; 2132 $self->alloc;
1807 2133
1808 $self->pre_load; 2134 $self->pre_load;
1809 Coro::cede; 2135 cf::cede_to_tick;
1810 2136
2137 my $f = new_from_file cf::object::thawer $self->{load_path};
2138 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2139 $self->_load_objects ($f)
1812 or return; 2140 or return;
1813 2141
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2142 $self->post_load_original
1815 if delete $self->{load_original}; 2143 if delete $self->{load_original};
1816 2144
1817 if (my $uniq = $self->uniq_path) { 2145 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2146 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2147 unless (aio_stat $uniq) {
2148 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2149 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2150 $self->_load_objects ($f);
2151 $f->resolve_delayed_derefs;
2152 }
1822 } 2153 }
1823 } 2154 }
1824 2155
1825 Coro::cede; 2156 $f->resolve_delayed_derefs;
2157
2158 cf::cede_to_tick;
1826 # now do the right thing for maps 2159 # now do the right thing for maps
1827 $self->link_multipart_objects; 2160 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2161 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2162 unless $self->difficulty;
1830 Coro::cede; 2163 cf::cede_to_tick;
1831 2164
1832 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2166 $self->decay_objects;
1834 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
1835 $self->update_buttons; 2168 $self->update_buttons;
1836 Coro::cede; 2169 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2170 $self->activate;
1840 } 2171 }
1841 2172
2173 $self->{last_save} = $cf::RUNTIME;
2174 $self->last_access ($cf::RUNTIME);
2175
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2176 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2177 }
1844 2178
1845 $self->post_load; 2179 $self->post_load;
1846}
1847 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
1848sub customise_for { 2187sub customise_for {
1849 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
1850 2189
1851 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
1852 if $self->per_player; 2191 if $self->per_player;
1856 2195
1857 $self 2196 $self
1858} 2197}
1859 2198
1860# find and load all maps in the 3x3 area around a map 2199# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2200sub load_neighbours {
1862 my ($map) = @_; 2201 my ($map) = @_;
1863 2202
1864 my @diag; # diagonal neighbours 2203 my @neigh; # diagonal neighbours
1865 2204
1866 for (0 .. 3) { 2205 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2206 my $neigh = $map->tile_path ($_)
1868 or next; 2207 or next;
1869 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
1870 or next; 2209 or next;
1871 $neigh->load; 2210 $neigh->load;
1872 2211
2212 # now find the diagonal neighbours
2213 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2216 }
1876 2217
1877 for (@diag) { 2218 for (grep defined $_->[0], @neigh) {
2219 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2220 my $neigh = find $path, $origin
1879 or next; 2221 or next;
1880 $neigh->load; 2222 $neigh->load;
1881 } 2223 }
1882} 2224}
1883 2225
1884sub find_sync { 2226sub find_sync {
1885 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
1886 2228
1887 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
1888} 2233}
1889 2234
1890sub do_load_sync { 2235sub do_load_sync {
1891 my ($map) = @_; 2236 my ($map) = @_;
1892 2237
1893 cf::sync_job { $map->load }; 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 $map->load;
1894} 2242}
1895 2243
1896our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
1898 2246
1899sub find_async { 2247sub find_async {
1900 my ($path, $origin) = @_; 2248 my ($path, $origin, $load) = @_;
1901 2249
1902 $path = normalise $path, $origin && $origin->{path}; 2250 $path = normalise $path, $origin && $origin->{path};
1903 2251
1904 if (my $map = $cf::MAP{$path}) { 2252 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2254 }
1907 2255
1908 undef $MAP_PREFETCH{$path}; 2256 $MAP_PREFETCH{$path} |= $load;
2257
1909 $MAP_PREFETCHER ||= cf::async { 2258 $MAP_PREFETCHER ||= cf::async {
2259 $Coro::current->{desc} = "map prefetcher";
2260
1910 while (%MAP_PREFETCH) { 2261 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2262 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2263 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2264 $map->load if $v;
2265 }
1915 2266
1916 delete $MAP_PREFETCH{$path}; 2267 delete $MAP_PREFETCH{$k};
1917 } 2268 }
1918 } 2269 }
1919 undef $MAP_PREFETCHER; 2270 undef $MAP_PREFETCHER;
1920 }; 2271 };
1921 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
1922 2273
1923 () 2274 ()
1924} 2275}
1925 2276
2277# common code, used by both ->save and ->swapout
1926sub save { 2278sub _save {
1927 my ($self) = @_; 2279 my ($self) = @_;
1928
1929 my $lock = cf::lock_acquire "map_data:" . $self->path;
1930 2280
1931 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
1932 2282
1933 return unless $self->dirty; 2283 return unless $self->dirty;
1934 2284
1940 return if $self->{deny_save}; 2290 return if $self->{deny_save};
1941 2291
1942 local $self->{last_access} = $self->last_access;#d# 2292 local $self->{last_access} = $self->last_access;#d#
1943 2293
1944 cf::async { 2294 cf::async {
2295 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2296 $_->contr->save for $self->players;
1946 }; 2297 };
2298
2299 cf::get_slot 0.02;
1947 2300
1948 if ($uniq) { 2301 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2302 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2303 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2304 } else {
1952 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1953 } 2306 }
1954} 2307}
1955 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
1956sub swap_out { 2317sub swap_out {
1957 my ($self) = @_; 2318 my ($self) = @_;
1958 2319
1959 # save first because save cedes
1960 $self->save;
1961
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2321
2322 return if $self->in_memory != cf::MAP_ACTIVE;
2323 return if $self->{deny_save};
1964 return if $self->players; 2324 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save};
1967 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
1968 $self->clear; 2335 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2336}
1971 2337
1972sub reset_at { 2338sub reset_at {
1973 my ($self) = @_; 2339 my ($self) = @_;
1974 2340
1992 2358
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2360
1995 return if $self->players; 2361 return if $self->players;
1996 2362
1997 warn "resetting map ", $self->path; 2363 cf::trace "resetting map ", $self->path, "\n";
1998 2364
1999 $self->in_memory (cf::MAP_SWAPPED); 2365 $self->in_memory (cf::MAP_SWAPPED);
2000 2366
2001 # need to save uniques path 2367 # need to save uniques path
2002 unless ($self->{deny_save}) { 2368 unless ($self->{deny_save}) {
2006 if $uniq; 2372 if $uniq;
2007 } 2373 }
2008 2374
2009 delete $cf::MAP{$self->path}; 2375 delete $cf::MAP{$self->path};
2010 2376
2377 $self->deactivate;
2378 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2379 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2380
2015 $self->unlink_save; 2381 $self->unlink_save;
2016 $self->destroy; 2382 $self->destroy;
2017} 2383}
2018 2384
2019my $nuke_counter = "aaaa"; 2385my $nuke_counter = "aaaa";
2020 2386
2021sub nuke { 2387sub nuke {
2022 my ($self) = @_; 2388 my ($self) = @_;
2023 2389
2390 {
2391 my $lock = cf::lock_acquire "map_data:$self->{path}";
2392
2024 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2025 2394
2026 $self->unlink_save; 2395 $self->unlink_save;
2027 2396
2028 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2029 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2402
2034 $cf::MAP{$self->path} = $self; 2403 $cf::MAP{$self->path} = $self;
2404 }
2035 2405
2036 $self->reset; # polite request, might not happen 2406 $self->reset; # polite request, might not happen
2037} 2407}
2038 2408
2039=item $maps = cf::map::tmp_maps 2409=item $maps = cf::map::tmp_maps
2081 2451
2082sub unique_maps() { 2452sub unique_maps() {
2083 [ 2453 [
2084 map { 2454 map {
2085 utf8::decode $_; 2455 utf8::decode $_;
2086 /\.map$/ 2456 s/\.map$//; # TODO future compatibility hack
2457 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2458 ? ()
2087 ? normalise $_ 2459 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2461 ]
2091} 2462}
2092 2463
2093package cf; 2464=item cf::map::static_maps
2465
2466Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2467file in the shared directory excluding F</styles> and F</editor>). May
2468block.
2469
2470=cut
2471
2472sub static_maps() {
2473 my @dirs = "";
2474 my @maps;
2475
2476 while (@dirs) {
2477 my $dir = shift @dirs;
2478
2479 next if $dir eq "/styles" || $dir eq "/editor";
2480
2481 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2482 or return;
2483
2484 for (@$files) {
2485 s/\.map$// or next;
2486 utf8::decode $_;
2487 push @maps, "$dir/$_";
2488 }
2489
2490 push @dirs, map "$dir/$_", @$dirs;
2491 }
2492
2493 \@maps
2494}
2094 2495
2095=back 2496=back
2096 2497
2097=head3 cf::object 2498=head3 cf::object
2098 2499
2102 2503
2103=over 4 2504=over 4
2104 2505
2105=item $ob->inv_recursive 2506=item $ob->inv_recursive
2106 2507
2107Returns the inventory of the object _and_ their inventories, recursively. 2508Returns the inventory of the object I<and> their inventories, recursively,
2509but I<not> the object itself.
2108 2510
2109=cut 2511=cut
2110 2512
2111sub inv_recursive_; 2513sub inv_recursive_;
2112sub inv_recursive_ { 2514sub inv_recursive_ {
2115 2517
2116sub inv_recursive { 2518sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2519 inv_recursive_ inv $_[0]
2118} 2520}
2119 2521
2522=item $ref = $ob->ref
2523
2524Creates and returns a persistent reference to an object that can be stored as a string.
2525
2526=item $ob = cf::object::deref ($refstring)
2527
2528returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2529even if the object actually exists. May block.
2530
2531=cut
2532
2533sub deref {
2534 my ($ref) = @_;
2535
2536 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2537 my ($uuid, $name) = ($1, $2);
2538 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2539 or return;
2540 $pl->ob->uuid eq $uuid
2541 or return;
2542
2543 $pl->ob
2544 } else {
2545 warn "$ref: cannot resolve object reference\n";
2546 undef
2547 }
2548}
2549
2120package cf; 2550package cf;
2121 2551
2122=back 2552=back
2123 2553
2124=head3 cf::object::player 2554=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2560Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2561can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2562dialogue with the given NPC character.
2133 2563
2134=cut 2564=cut
2565
2566our $SAY_CHANNEL = {
2567 id => "say",
2568 title => "Map",
2569 reply => "say ",
2570 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2571};
2572
2573our $CHAT_CHANNEL = {
2574 id => "chat",
2575 title => "Chat",
2576 reply => "chat ",
2577 tooltip => "Player chat and shouts, global to the server.",
2578};
2135 2579
2136# rough implementation of a future "reply" method that works 2580# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2581# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2582#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2583sub cf::object::player::reply($$$;$) {
2146 2590
2147 } else { 2591 } else {
2148 my $pl = $self->contr; 2592 my $pl = $self->contr;
2149 2593
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2594 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2595 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2596 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2597
2159 } else { 2598 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2599 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2600 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2601 }
2163 } 2602 }
2603}
2604
2605=item $object->send_msg ($channel, $msg, $color, [extra...])
2606
2607=cut
2608
2609sub cf::object::send_msg {
2610 my $pl = shift->contr
2611 or return;
2612 $pl->send_msg (@_);
2164} 2613}
2165 2614
2166=item $player_object->may ("access") 2615=item $player_object->may ("access")
2167 2616
2168Returns wether the given player is authorized to access resource "access" 2617Returns wether the given player is authorized to access resource "access"
2181 2630
2182=item $player_object->enter_link 2631=item $player_object->enter_link
2183 2632
2184Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2185 2634
2186The player should be reasonably safe there for short amounts of time. You 2635The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2637though, as the player cannot control the character while it is on the link
2638map.
2188 2639
2189Will never block. 2640Will never block.
2190 2641
2191=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2192 2643
2212sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2213 my ($self) = @_; 2664 my ($self) = @_;
2214 2665
2215 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2216 2667
2668 ++$self->{_link_recursion};
2669
2217 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2218 2671
2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2220 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2221 2674
2222 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2223} 2676}
2224 2677
2225sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2226 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2227 2680
2244 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2245 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2246 2699
2247 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2250 2703
2251 $map->load; 2704 $map->load;
2252 $map->load_diag; 2705 $map->load_neighbours;
2253 2706
2254 return unless $self->contr->active; 2707 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2708
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2259} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2260 2716
2717}
2718
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2262 2720
2263Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2724the new (success) or old (failed) map position. In either case, $done will
2725be called at the end of this process.
2726
2727Note that $check will be called with a potentially non-loaded map, so if
2728it needs a loaded map it has to call C<< ->load >>.
2267 2729
2268=cut 2730=cut
2269 2731
2270our $GOTOGEN; 2732our $GOTOGEN;
2271 2733
2272sub cf::object::player::goto { 2734sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2274 2742
2275 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2745
2278 $self->enter_link; 2746 $self->enter_link;
2279 2747
2280 (async { 2748 (async {
2749 $Coro::current->{desc} = "player::goto $path $x $y";
2750
2751 # *tag paths override both path and x|y
2752 if ($path =~ /^\*(.*)$/) {
2753 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2754 my $ob = $obs[rand @obs];
2755
2756 # see if we actually can go there
2757 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2758 $ob = $obs[rand @obs];
2759 } else {
2760 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2761 }
2762 # else put us there anyways for now #d#
2763
2764 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2765 } else {
2766 ($path, $x, $y) = (undef, undef, undef);
2767 }
2768 }
2769
2281 my $map = eval { 2770 my $map = eval {
2282 my $map = cf::map::find $path; 2771 my $map = defined $path ? cf::map::find $path : undef;
2283 2772
2284 if ($map) { 2773 if ($map) {
2285 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2287 } else { 2776 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2778 }
2290 2779
2291 $map 2780 $map
2292 }; 2781 };
2293 2782
2298 2787
2299 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2302 } 2791 }
2792
2793 $done->($self) if $done;
2303 })->prio (1); 2794 })->prio (1);
2304} 2795}
2305 2796
2306=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2307 2798
2327} 2818}
2328 2819
2329sub prepare_random_map { 2820sub prepare_random_map {
2330 my ($exit) = @_; 2821 my ($exit) = @_;
2331 2822
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2823 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2824 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2825 # that depends on the exit object
2337 2826
2338 my $rmp = parse_random_map_params $exit->msg; 2827 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2829 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2830 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2831 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2832 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2833 $rmp->{origin_y} = $exit->y;
2834
2835 $exit->map->touch;
2345 } 2836 }
2346 2837
2347 $rmp->{random_seed} ||= $exit->random_seed; 2838 $rmp->{random_seed} ||= $exit->random_seed;
2348 2839
2349 my $data = cf::to_json $rmp; 2840 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2841 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2842 my $meta = "$RANDOMDIR/$md5.meta";
2352 2843
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2844 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2845 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2846 undef $fh;
2356 aio_rename "$meta~", $meta; 2847 aio_rename "$meta~", $meta;
2357 2848
2849 my $slaying = "?random/$md5";
2850
2851 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2852 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2853 $exit->msg (undef);
2854 }
2360 } 2855 }
2361} 2856}
2362 2857
2363sub cf::object::player::enter_exit { 2858sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2859 my ($self, $exit) = @_;
2365 2860
2366 return unless $self->type == cf::PLAYER; 2861 return unless $self->type == cf::PLAYER;
2367 2862
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2863 $self->enter_link;
2380 2864
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2865 (async {
2386 $self->deactivate_recursive; # just to be sure 2866 $Coro::current->{desc} = "enter_exit";
2867
2387 unless (eval { 2868 unless (eval {
2869 $self->deactivate_recursive; # just to be sure
2870
2871 # random map handling
2872 {
2873 my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875 prepare_random_map $exit
2876 if $exit->slaying eq "/!";
2877 }
2878
2879 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2880 my $x = $exit->stats->hp;
2881 my $y = $exit->stats->sp;
2882
2388 $self->goto ($slaying, $hp, $sp); 2883 $self->goto ($map, $x, $y);
2389 2884
2885 # if exit is damned, update players death & WoR home-position
2886 $self->contr->savebed ($map, $x, $y)
2887 if $exit->flag (cf::FLAG_DAMNED);
2888
2390 1; 2889 1
2391 }) { 2890 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2393 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2394 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2396 2895
2397 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2398 $self->leave_link; 2897 $self->leave_link;
2399 } 2898 }
2400 })->prio (1); 2899 })->prio (1);
2401} 2900}
2402 2901
2416 2915
2417 utf8::encode $text; 2916 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2917 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2918}
2420 2919
2920=item $client->send_big_packet ($pkt)
2921
2922Like C<send_packet>, but tries to compress large packets, and fragments
2923them as required.
2924
2925=cut
2926
2927our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2928
2929sub cf::client::send_big_packet {
2930 my ($self, $pkt) = @_;
2931
2932 # try lzf for large packets
2933 $pkt = "lzf " . Compress::LZF::compress $pkt
2934 if 1024 <= length $pkt and $self->{can_lzf};
2935
2936 # split very large packets
2937 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2938 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2939 $pkt = "frag";
2940 }
2941
2942 $self->send_packet ($pkt);
2943}
2944
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2946
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2947Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2948client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2949the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2950the message unless the client supports the msg packet.
2427 2951
2428=cut 2952=cut
2429 2953
2954# non-persistent channels (usually the info channel)
2955our %CHANNEL = (
2956 "c/motd" => {
2957 id => "infobox",
2958 title => "MOTD",
2959 reply => undef,
2960 tooltip => "The message of the day",
2961 },
2962 "c/identify" => {
2963 id => "infobox",
2964 title => "Identify",
2965 reply => undef,
2966 tooltip => "Items recently identified",
2967 },
2968 "c/examine" => {
2969 id => "infobox",
2970 title => "Examine",
2971 reply => undef,
2972 tooltip => "Signs and other items you examined",
2973 },
2974 "c/shopinfo" => {
2975 id => "infobox",
2976 title => "Shop Info",
2977 reply => undef,
2978 tooltip => "What your bargaining skill tells you about the shop",
2979 },
2980 "c/book" => {
2981 id => "infobox",
2982 title => "Book",
2983 reply => undef,
2984 tooltip => "The contents of a note or book",
2985 },
2986 "c/lookat" => {
2987 id => "infobox",
2988 title => "Look",
2989 reply => undef,
2990 tooltip => "What you saw there",
2991 },
2992 "c/who" => {
2993 id => "infobox",
2994 title => "Players",
2995 reply => undef,
2996 tooltip => "Shows players who are currently online",
2997 },
2998 "c/body" => {
2999 id => "infobox",
3000 title => "Body Parts",
3001 reply => undef,
3002 tooltip => "Shows which body parts you posess and are available",
3003 },
3004 "c/statistics" => {
3005 id => "infobox",
3006 title => "Statistics",
3007 reply => undef,
3008 tooltip => "Shows your primary statistics",
3009 },
3010 "c/skills" => {
3011 id => "infobox",
3012 title => "Skills",
3013 reply => undef,
3014 tooltip => "Shows your experience per skill and item power",
3015 },
3016 "c/shopitems" => {
3017 id => "infobox",
3018 title => "Shop Items",
3019 reply => undef,
3020 tooltip => "Shows the items currently for sale in this shop",
3021 },
3022 "c/resistances" => {
3023 id => "infobox",
3024 title => "Resistances",
3025 reply => undef,
3026 tooltip => "Shows your resistances",
3027 },
3028 "c/pets" => {
3029 id => "infobox",
3030 title => "Pets",
3031 reply => undef,
3032 tooltip => "Shows information abotu your pets/a specific pet",
3033 },
3034 "c/perceiveself" => {
3035 id => "infobox",
3036 title => "Perceive Self",
3037 reply => undef,
3038 tooltip => "You gained detailed knowledge about yourself",
3039 },
3040 "c/uptime" => {
3041 id => "infobox",
3042 title => "Uptime",
3043 reply => undef,
3044 tooltip => "How long the server has been running since last restart",
3045 },
3046 "c/mapinfo" => {
3047 id => "infobox",
3048 title => "Map Info",
3049 reply => undef,
3050 tooltip => "Information related to the maps",
3051 },
3052 "c/party" => {
3053 id => "party",
3054 title => "Party",
3055 reply => "gsay ",
3056 tooltip => "Messages and chat related to your party",
3057 },
3058 "c/death" => {
3059 id => "death",
3060 title => "Death",
3061 reply => undef,
3062 tooltip => "Reason for and more info about your most recent death",
3063 },
3064 "c/say" => $SAY_CHANNEL,
3065 "c/chat" => $CHAT_CHANNEL,
3066);
3067
2430sub cf::client::send_msg { 3068sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2432 3070
2433 $msg = $self->pl->expand_cfpod ($msg); 3071 $msg = $self->pl->expand_cfpod ($msg)
3072 unless $color & cf::NDI_VERBATIM;
3073
3074 $color &= cf::NDI_CLIENT_MASK; # just in case...
3075
3076 # check predefined channels, for the benefit of C
3077 if ($CHANNEL{$channel}) {
3078 $channel = $CHANNEL{$channel};
3079
3080 $self->ext_msg (channel_info => $channel);
3081 $channel = $channel->{id};
3082
3083 } elsif (ref $channel) {
3084 # send meta info to client, if not yet sent
3085 unless (exists $self->{channel}{$channel->{id}}) {
3086 $self->{channel}{$channel->{id}} = $channel;
3087 $self->ext_msg (channel_info => $channel);
3088 }
3089
3090 $channel = $channel->{id};
3091 }
2434 3092
2435 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2436 3094
2437 if ($self->can_msg) { 3095 # default colour, mask it out
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2439 } else { 3097 if $color & cf::NDI_DEF;
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449 3098
2450 if ($color >= 0) { 3099 my $pkt = "msg "
2451 if (0 && $msg =~ /\[/) { 3100 . $self->{json_coder}->encode (
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2453 } else { 3102 );
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460 3103
3104 $self->send_big_packet ($pkt);
3105}
3106
2461=item $client->ext_event ($type, %msg) 3107=item $client->ext_msg ($type, @msg)
2462 3108
2463Sends an ext event to the client. 3109Sends an ext event to the client.
2464 3110
2465=cut 3111=cut
2466 3112
2467sub cf::client::ext_event($$%) { 3113sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 3114 my ($self, $type, @msg) = @_;
2469 3115
3116 if ($self->extcmd == 2) {
3117 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3118 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 3119 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3120 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3121 }
3122}
3123
3124=item $client->ext_reply ($msgid, @msg)
3125
3126Sends an ext reply to the client.
3127
3128=cut
3129
3130sub cf::client::ext_reply($$@) {
3131 my ($self, $id, @msg) = @_;
3132
3133 if ($self->extcmd == 2) {
3134 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3135 } elsif ($self->extcmd == 1) {
3136 #TODO: version 1, remove
3137 unshift @msg, msgtype => "reply", msgid => $id;
3138 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3139 }
2472} 3140}
2473 3141
2474=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2475 3143
2476Queues a query to the client, calling the given callback with 3144Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 3199 my ($ns, $buf) = @_;
2532 3200
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3201 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 3202
2535 if (ref $msg) { 3203 if (ref $msg) {
3204 my ($type, $reply, @payload) =
3205 "ARRAY" eq ref $msg
3206 ? @$msg
3207 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3208
3209 my @reply;
3210
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3211 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3212 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3213 }
3214
3215 $ns->ext_reply ($reply, @reply)
3216 if $reply;
3217
2542 } else { 3218 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 3220 }
2545 3221
2546 cf::override; 3222 cf::override;
2547 }, 3223 },
2548); 3224);
2568 3244
2569 $coro 3245 $coro
2570} 3246}
2571 3247
2572cf::client->attach ( 3248cf::client->attach (
2573 on_destroy => sub { 3249 on_client_destroy => sub {
2574 my ($ns) = @_; 3250 my ($ns) = @_;
2575 3251
2576 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2577 }, 3253 },
2578); 3254);
2593our $safe = new Safe "safe"; 3269our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
2595 3271
2596$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
2597 3273
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3274$safe->permit_only (Opcode::opset qw(
3275 :base_core :base_mem :base_orig :base_math :base_loop
3276 grepstart grepwhile mapstart mapwhile
3277 sort time
3278));
2599 3279
2600# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
2601 3281
2602=pod 3282=pod
2603 3283
2604The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
2605 3285
2606 cf::object 3286 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3287 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3288 insert remove name archname title slaying race decrease split
3289 value
2609 3290
2610 cf::object::player 3291 cf::object::player
2611 player 3292 player
2612 3293
2613 cf::player 3294 cf::player
2618 3299
2619=cut 3300=cut
2620 3301
2621for ( 3302for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3303 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3304 insert remove inv nrof name archname title slaying race
3305 decrease split destroy change_exp value msg lore send_msg)],
2624 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
2626 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
2627) { 3309) {
2628 no strict 'refs';
2629 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
2630 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2631 for @funs; 3312 for @funs;
2632} 3313}
2633 3314
2648 3329
2649 my $qcode = $code; 3330 my $qcode = $code;
2650 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2651 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
2652 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
2653 local $_; 3337 local $_;
2654 local @safe::cf::_safe_eval_args = values %vars;
2655 3338
2656 my $eval = 3339 my $eval =
2657 "do {\n" 3340 "do {\n"
2658 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2659 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
2660 . $code 3343 . $code
2661 . "\n}" 3344 . "\n}"
2662 ; 3345 ;
2663 3346
3347 if ($CFG{safe_eval}) {
2664 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
2665 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2666 sub_generation_inc; 3351 sub_generation_inc;
3352 } else {
3353 local @cf::_safe_eval_args = values %vars;
3354 @res = wantarray ? eval eval : scalar eval $eval;
3355 }
2667 3356
2668 if ($@) { 3357 if ($@) {
2669 warn "$@"; 3358 warn "$@",
2670 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
2671 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
2672 } 3361 }
2673 3362
2674 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
2675} 3364}
2676 3365
2690=cut 3379=cut
2691 3380
2692sub register_script_function { 3381sub register_script_function {
2693 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
2694 3383
2695 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
2696 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
2697} 3386}
2698 3387
2699=back 3388=back
2700 3389
2701=cut 3390=cut
2704# the server's init and main functions 3393# the server's init and main functions
2705 3394
2706sub load_facedata($) { 3395sub load_facedata($) {
2707 my ($path) = @_; 3396 my ($path) = @_;
2708 3397
3398 # HACK to clear player env face cache, we need some signal framework
3399 # for this (global event?)
3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3401
3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3403
2709 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
2710 3405
2711 my $facedata;
2712 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
2713 or die "$path: $!"; 3407 or die "$path: $!";
2714 3408
2715 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
2716 3410
2717 $facedata->{version} == 2 3411 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3413
3414 # patch in the exptable
3415 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3416 $facedata->{resource}{"res/exp_table"} = {
3417 type => FT_RSRC,
3418 data => $exp_table,
3419 hash => (Digest::MD5::md5 $exp_table),
3420 };
3421 cf::cede_to_tick;
3422
2720 { 3423 {
2721 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
2722 3425
2723 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3428
2725 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2729 3434
2730 cf::cede_to_tick; 3435 cf::cede_to_tick;
2731 } 3436 }
2732 3437
2733 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
2734 next unless $info->{smooth}; 3439 next unless $info->{smooth};
3440
2735 my $idx = cf::face::find $face 3441 my $idx = cf::face::find $face
2736 or next; 3442 or next;
3443
2737 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2740 } else { 3447 } else {
2741 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
2742 } 3449 }
2743 3450
2744 cf::cede_to_tick; 3451 cf::cede_to_tick;
2745 } 3452 }
2746 } 3453 }
2755 3462
2756 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
2757 } 3464 }
2758 3465
2759 { 3466 {
2760 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource}; 3467 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764 3468
2765 while (my ($name, $info) = each %$res) { 3469 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 3470 if (defined $info->{type}) {
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO#
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3472
3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2775 cf::face::set_type $idx, 1; 3474 cf::face::set_type $idx, $info->{type};
2776 cf::face::set_data $idx, 0, $data, $chk; 3475 } else {
3476 $RESOURCE{$name} = $info; # unused
3477 }
2777 3478
2778 cf::cede_to_tick; 3479 cf::cede_to_tick;
2779 } 3480 }
2780 } 3481 }
2781 3482
3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3484
2782 1 3485 1
2783} 3486}
2784 3487
3488register_exticmd fx_want => sub {
3489 my ($ns, $want) = @_;
3490
3491 while (my ($k, $v) = each %$want) {
3492 $ns->fx_want ($k, $v);
3493 }
3494};
3495
3496sub load_resource_file($) {
3497 my $guard = lock_acquire "load_resource_file";
3498
3499 my $status = load_resource_file_ $_[0];
3500 get_slot 0.1, 100;
3501 cf::arch::commit_load;
3502
3503 $status
3504}
3505
2785sub reload_regions { 3506sub reload_regions {
3507 # HACK to clear player env face cache, we need some signal framework
3508 # for this (global event?)
3509 %ext::player_env::MUSIC_FACE_CACHE = ();
3510
2786 load_resource_file "$MAPDIR/regions" 3511 load_resource_file "$MAPDIR/regions"
2787 or die "unable to load regions file\n"; 3512 or die "unable to load regions file\n";
3513
3514 for (cf::region::list) {
3515 $_->{match} = qr/$_->{match}/
3516 if exists $_->{match};
3517 }
2788} 3518}
2789 3519
2790sub reload_facedata { 3520sub reload_facedata {
2791 load_facedata "$DATADIR/facedata" 3521 load_facedata "$DATADIR/facedata"
2792 or die "unable to load facedata\n"; 3522 or die "unable to load facedata\n";
2793} 3523}
2794 3524
2795sub reload_archetypes { 3525sub reload_archetypes {
2796 load_resource_file "$DATADIR/archetypes" 3526 load_resource_file "$DATADIR/archetypes"
2797 or die "unable to load archetypes\n"; 3527 or die "unable to load archetypes\n";
2798 #d# NEED to laod twice to resolve forward references
2799 # this really needs to be done in an extra post-pass
2800 # (which needs to be synchronous, so solve it differently)
2801 load_resource_file "$DATADIR/archetypes"
2802 or die "unable to load archetypes\n";
2803} 3528}
2804 3529
2805sub reload_treasures { 3530sub reload_treasures {
2806 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
2807 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
2808} 3533}
2809 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
2810sub reload_resources { 3558sub reload_resources {
2811 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
2812 3560
3561 reload_exp_table;
3562 reload_materials;
3563 reload_facedata;
3564 reload_sound;
3565 reload_archetypes;
2813 reload_regions; 3566 reload_regions;
2814 reload_facedata;
2815 #reload_archetypes;#d#
2816 reload_archetypes;
2817 reload_treasures; 3567 reload_treasures;
2818 3568
2819 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
2820} 3570}
2821 3571
2822sub init { 3572sub reload_config {
2823 reload_resources; 3573 trace "reloading config file...\n";
2824}
2825 3574
2826sub cfg_load { 3575 0 < aio_load "$CONFDIR/config", my $config
2827 open my $fh, "<:utf8", "$CONFDIR/config" 3576 or die "$CONFDIR/config: $!";
2828 or return;
2829 3577
2830 local $/; 3578 utf8::decode $config;
2831 *CFG = YAML::Syck::Load <$fh>; 3579 *CFG = yaml_load $config;
2832 3580
2833 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2834 3582
2835 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2836 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2837 3585
2838 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
2842 }; 3590 };
2843 warn $@ if $@; 3591 warn $@ if $@;
2844 } 3592 }
2845} 3593}
2846 3594
3595sub pidfile() {
3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3597 or die "$PIDFILE: $!";
3598 flock $fh, &Fcntl::LOCK_EX
3599 or die "$PIDFILE: flock: $!";
3600 $fh
3601}
3602
3603# make sure only one server instance is running at any one time
3604sub atomic {
3605 my $fh = pidfile;
3606
3607 my $pid = <$fh>;
3608 kill 9, $pid if $pid > 0;
3609
3610 seek $fh, 0, 0;
3611 print $fh $$;
3612}
3613
3614sub main_loop {
3615 trace "EV::loop starting\n";
3616 if (1) {
3617 EV::loop;
3618 }
3619 trace "EV::loop returned\n";
3620 goto &main_loop unless $REALLY_UNLOOP;
3621}
3622
2847sub main { 3623sub main {
3624 cf::init_globals; # initialise logging
3625
3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630
3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3632
2848 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
2849 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
2850 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3635 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2851 (async { 3636 (async {
2852 Event::one_event; 3637 $Coro::current->{desc} = "IDLE BUG HANDLER";
3638 EV::loop EV::LOOP_ONESHOT;
2853 })->prio (Coro::PRIO_MAX); 3639 })->prio (Coro::PRIO_MAX);
2854 }; 3640 };
2855 3641
2856 cfg_load; 3642 evthread_start IO::AIO::poll_fileno;
3643
3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3651 cf::load_settings;
3652
3653 reload_resources;
3654 reload_config;
2857 db_init; 3655 db_init;
3656
3657 cf::init_uuid;
3658 cf::init_signals;
3659 cf::init_skills;
3660
3661 cf::init_beforeplay;
3662
3663 atomic;
3664
2858 load_extensions; 3665 load_extensions;
2859 3666
2860 $TICK_WATCHER->start; 3667 utime time, time, $RUNTIMEFILE;
2861 Event::loop; 3668
3669 # no (long-running) fork's whatsoever before this point(!)
3670 use POSIX ();
3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3672
3673 cf::_post_init 0;
3674 };
3675
3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3684 goto &main_loop;
2862} 3685}
2863 3686
2864############################################################################# 3687#############################################################################
2865# initialisation and cleanup 3688# initialisation and cleanup
2866 3689
2867# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
2868BEGIN { 3691BEGIN {
3692 our %SIGWATCHER = ();
2869 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
2870 Event->signal ( 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2871 reentrant => 0,
2872 data => WF_AUTOCANCEL,
2873 signal => $signal,
2874 prio => 0,
2875 cb => sub {
2876 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
2877 },
2878 ); 3696 };
2879 } 3697 }
2880} 3698}
2881 3699
2882sub write_runtime { 3700sub write_runtime_sync {
2883 my $runtime = "$LOCALDIR/runtime"; 3701 my $t0 = AE::time;
2884 3702
2885 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
2886 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
2887 3705
2888 IO::AIO::aio_utime $runtime, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2889 3707
2890 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
2891 3709
2892 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2893 or return; 3711 or return;
2894 3712
2895 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
2896 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
2897 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
2907 aio_utime $fh, undef, undef; 3725 aio_utime $fh, undef, undef;
2908 3726
2909 close $fh 3727 close $fh
2910 or return; 3728 or return;
2911 3729
2912 aio_rename "$runtime~", $runtime 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2913 and return; 3731 and return;
2914 3732
2915 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2916 3734
2917 1 3735 1
3736}
3737
3738our $uuid_lock;
3739our $uuid_skip;
3740
3741sub write_uuid_sync($) {
3742 $uuid_skip ||= $_[0];
3743
3744 return if $uuid_lock;
3745 local $uuid_lock = 1;
3746
3747 my $uuid = "$LOCALDIR/uuid";
3748
3749 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3750 or return;
3751
3752 my $value = uuid_seq uuid_cur;
3753
3754 unless ($value) {
3755 info "cowardly refusing to write zero uuid value!\n";
3756 return;
3757 }
3758
3759 my $value = uuid_str $value + $uuid_skip;
3760 $uuid_skip = 0;
3761
3762 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3763 and return;
3764
3765 # always fsync - this file is important
3766 aio_fsync $fh
3767 and return;
3768
3769 close $fh
3770 or return;
3771
3772 aio_rename "$uuid~", $uuid
3773 and return;
3774
3775 trace "uuid file written ($value).\n";
3776
3777 1
3778
3779}
3780
3781sub write_uuid($$) {
3782 my ($skip, $sync) = @_;
3783
3784 $sync ? write_uuid_sync $skip
3785 : async { write_uuid_sync $skip };
2918} 3786}
2919 3787
2920sub emergency_save() { 3788sub emergency_save() {
2921 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
2922 3790
2923 warn "enter emergency perl save\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
2924 3797
2925 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
2926 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
2927 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
2928 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
2929 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
2930 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
2931 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
2932 $pl->valid or next; 3807 $pl->valid or next;
3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2933 $pl->save; 3809 $pl->save;
2934 } 3810 }
2935 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
2936 3812
2937 warn "begin emergency map save\n"; 3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3815 info "emergency_perl_save: begin map save\n";
2938 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
2939 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
2940 $map->valid or next; 3818 $map->valid or next;
2941 $map->save; 3819 $map->save;
2942 } 3820 }
2943 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
2944 3822
2945 warn "begin emergency database checkpoint\n"; 3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3825 info "emergency_perl_save: begin database checkpoint\n";
2946 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
2947 warn "end emergency database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3828
3829 info "emergency_perl_save: begin write uuid\n";
3830 write_uuid_sync 1;
3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
2948 }; 3851 };
2949 3852
2950 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
2951} 3854}
2952 3855
2953sub post_cleanup { 3856sub post_cleanup {
2954 my ($make_core) = @_; 3857 my ($make_core) = @_;
2955 3858
3859 IO::AIO::flush;
3860
2956 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
2957 if $make_core; 3862 if $make_core;
3863
3864 my $fh = pidfile;
3865 unlink $PIDFILE if <$fh> == $$;
3866}
3867
3868# a safer delete_package, copied from Symbol
3869sub clear_package($) {
3870 my $pkg = shift;
3871
3872 # expand to full symbol table name if needed
3873 unless ($pkg =~ /^main::.*::$/) {
3874 $pkg = "main$pkg" if $pkg =~ /^::/;
3875 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3876 $pkg .= '::' unless $pkg =~ /::$/;
3877 }
3878
3879 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3880 my $stem_symtab = *{$stem}{HASH};
3881
3882 defined $stem_symtab and exists $stem_symtab->{$leaf}
3883 or return;
3884
3885 # clear all symbols
3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3887 for my $name (keys %$leaf_symtab) {
3888 _gv_clear *{"$pkg$name"};
3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3890 }
2958} 3891}
2959 3892
2960sub do_reload_perl() { 3893sub do_reload_perl() {
2961 # can/must only be called in main 3894 # can/must only be called in main
2962 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
2963 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
2964 return; 3897 return;
2965 } 3898 }
2966 3899
2967 warn "reloading..."; 3900 return if $RELOAD++;
2968 3901
2969 warn "entering sync_job"; 3902 my $t1 = AE::time;
2970 3903
3904 while ($RELOAD) {
3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3907
3908 trace "perl_reload: entering sync_job";
3909
2971 cf::sync_job { 3910 cf::sync_job {
2972 cf::write_runtime; # external watchdog should not bark
2973 cf::emergency_save; 3911 #cf::emergency_save;
2974 cf::write_runtime; # external watchdog should not bark
2975 3912
2976 warn "syncing database to disk";
2977 BDB::db_env_txn_checkpoint $DB_ENV;
2978
2979 # if anything goes wrong in here, we should simply crash as we already saved
2980
2981 warn "cancelling all WF_AUTOCANCEL watchers";
2982 for (Event::all_watchers) {
2983 $_->cancel if $_->data & WF_AUTOCANCEL;
2984 }
2985
2986 warn "flushing outstanding aio requests";
2987 for (;;) {
2988 BDB::flush;
2989 IO::AIO::flush;
2990 Coro::cede;
2991 last unless IO::AIO::nreqs || BDB::nreqs;
2992 warn "iterate...";
2993 }
2994
2995 ++$RELOAD;
2996
2997 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
2998 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
2999 %EXT_CORO = (); 3915 %EXT_CORO = ();
3000 3916
3001 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3002 %COMMAND = (); 3918 %COMMAND = ();
3003 3919
3004 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3005 %EXTCMD = (); 3921 %EXTCMD = ();
3006 %EXTICMD = (); 3922 %EXTICMD = ();
3007 3923
3008 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3009 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3010 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3011 3927
3012 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3013 eval { 3929 eval {
3014 $cb->($pkg); 3930 $cb->($pkg);
3015 1 3931 1
3016 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3933 }
3934
3935 trace "... clearing $pkg";
3936 clear_package $pkg;
3017 } 3937 }
3018 3938
3019 warn "... nuking $pkg";
3020 Symbol::delete_package $pkg;
3021 }
3022
3023 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3024 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3025 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3026 3942
3027 warn "... unloading $k"; 3943 trace "... unloading $k";
3028 delete $INC{$k}; 3944 delete $INC{$k};
3029 3945
3030 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3031 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3032 3948
3033 if (my $cb = $k->can ("unload_module")) { 3949 if (my $cb = $k->can ("unload_module")) {
3034 $cb->(); 3950 $cb->();
3951 }
3952
3953 clear_package $k;
3035 } 3954 }
3036 3955
3037 Symbol::delete_package $k;
3038 }
3039
3040 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3041 Symbol::delete_package "safe::$_" 3957 clear_package "safe::$_"
3042 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3043 3959
3044 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3045 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3046 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3047 3963
3048 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3049 # and global variables created in xs 3965 # and global variables created in xs
3050 #Symbol::delete_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3051 3967
3052 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3053 3969
3054 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3055 require cf; 3971 require cf;
3056 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3057 3973
3058 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3059 cf::cfg_load; 3975 cf::reload_config;
3060 3976
3061 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3062 cf::load_extensions; 3978 cf::load_extensions;
3063 3979
3980 if ($REATTACH_ON_RELOAD) {
3064 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3065 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3066 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3067 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3068 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3069 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3070 3988
3071 warn "leaving sync_job"; 3989 cf::_post_init 1;
3072 3990
3991 trace "perl_reload: leaving sync_job";
3992
3073 1 3993 1
3074 } or do { 3994 } or do {
3075 warn $@; 3995 error $@;
3076 warn "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3077 exit 1; 3997 };
3998
3999 --$RELOAD;
3078 }; 4000 }
3079 4001
3080 warn "reloaded"; 4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3081}; 4004};
3082 4005
3083our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3084 4007
3085sub reload_perl() { 4008sub reload_perl() {
3086 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3087 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3088 4011
3089 $RELOAD_WATCHER ||= Event->timer ( 4012 $RELOAD_WATCHER ||= cf::async {
3090 reentrant => 0, 4013 Coro::AIO::aio_wait cache_extensions;
3091 after => 0, 4014
3092 data => WF_AUTOCANCEL, 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3093 cb => sub {
3094 do_reload_perl; 4016 do_reload_perl;
3095 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3096 }, 4018 };
3097 ); 4019 };
3098} 4020}
3099 4021
3100register_command "reload" => sub { 4022register_command "reload" => sub {
3101 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
3102 4024
3103 if ($who->flag (FLAG_WIZ)) { 4025 if ($who->flag (FLAG_WIZ)) {
3104 $who->message ("reloading server."); 4026 $who->message ("reloading server.");
4027 async {
4028 $Coro::current->{desc} = "perl_reload";
3105 async { reload_perl }; 4029 reload_perl;
4030 };
3106 } 4031 }
3107}; 4032};
3108 4033
3109unshift @INC, $LIBDIR; 4034#############################################################################
3110 4035
3111my $bug_warning = 0; 4036my $bug_warning = 0;
3112 4037
3113our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3114our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3115 4040
3116sub wait_for_tick { 4041sub wait_for_tick() {
3117 return unless $TICK_WATCHER->is_active;
3118 return if $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3119 4043
3120 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3121 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3122 $signal->wait; 4046 $signal->wait;
3123} 4047}
3124 4048
3125sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3126 return unless $TICK_WATCHER->is_active;
3127 return if $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3128 4051
3129 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3130 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3131 $signal->wait; 4054 $signal->wait;
3132} 4055}
3133 4056
3134 my $min = 1e6;#d# 4057sub tick {
3135 my $avg = 10;
3136$TICK_WATCHER = Event->timer (
3137 reentrant => 0,
3138 parked => 1,
3139 prio => 0,
3140 at => $NEXT_TICK || $TICK,
3141 data => WF_AUTOCANCEL,
3142 cb => sub {
3143 if ($Coro::current != $Coro::main) { 4058 if ($Coro::current != $Coro::main) {
3144 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4059 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3145 unless ++$bug_warning > 10; 4060 unless ++$bug_warning > 10;
3146 return; 4061 return;
3147 } 4062 }
3148 4063
3149 $NOW = $tick_start = Event::time;
3150
3151 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3152 4065
3153 0 && sync_job {#d# 4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3154 for(1..10) {
3155 my $t = Event::time;
3156 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3157 or die;
3158 4067
3159 $map->width (50); 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3160 $map->height (50); 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3161 $map->alloc; 4070 Coro::async_pool {
3162 $map->_load_objects ("/tmp/x.map", 1); 4071 $Coro::current->{desc} = "runtime saver";
3163 my $t = Event::time - $t; 4072 write_runtime_sync
3164 4073 or error "ERROR: unable to write runtime file: $!";
3165 #next unless $t < 0.0013;#d#
3166 if ($t < $min) {
3167 $min = $t;
3168 }
3169 $avg = $avg * 0.99 + $t * 0.01;
3170 }
3171 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3172 exit 0;
3173 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3174 }; 4074 };
4075 }
3175 4076
3176 $RUNTIME += $TICK;
3177 $NEXT_TICK += $TICK;
3178
3179 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3180 $NEXT_RUNTIME_WRITE = $NOW + 10;
3181 Coro::async_pool {
3182 write_runtime
3183 or warn "ERROR: unable to write runtime file: $!";
3184 };
3185 }
3186
3187# my $AFTER = Event::time;
3188# warn $AFTER - $NOW;#d#
3189
3190 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3191 $sig->send; 4078 $sig->send;
3192 } 4079 }
3193 while (my $sig = shift @WAIT_FOR_TICK) { 4080 while (my $sig = shift @WAIT_FOR_TICK) {
3194 $sig->send; 4081 $sig->send;
3195 } 4082 }
3196 4083
3197 $NOW = Event::time; 4084 $LOAD = ($NOW - $TICK_START) / $TICK;
3198
3199 # if we are delayed by four ticks or more, skip them all
3200 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3201
3202 $TICK_WATCHER->at ($NEXT_TICK);
3203 $TICK_WATCHER->start;
3204
3205 $LOAD = ($NOW - $tick_start) / $TICK;
3206 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3207 4086
3208 _post_tick; 4087 if (0) {
3209 4088 if ($NEXT_TICK) {
3210 4089 my $jitter = $TICK_START - $NEXT_TICK;
4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4091 debug "jitter $JITTER\n";#d#
4092 }
3211 }, 4093 }
3212); 4094}
3213 4095
3214{ 4096{
3215 BDB::max_poll_time $TICK * 0.1; 4097 # configure BDB
3216 $BDB_POLL_WATCHER = Event->io ( 4098
3217 reentrant => 0,
3218 fd => BDB::poll_fileno,
3219 poll => 'r',
3220 prio => 0,
3221 data => WF_AUTOCANCEL,
3222 cb => \&BDB::poll_cb,
3223 );
3224 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3225 4100 BDB::max_poll_reqs $TICK * 0.1;
3226 BDB::set_sync_prepare { 4101 $AnyEvent::BDB::WATCHER->priority (1);
3227 my $status;
3228 my $current = $Coro::current;
3229 (
3230 sub {
3231 $status = $!;
3232 $current->ready; undef $current;
3233 },
3234 sub {
3235 Coro::schedule while defined $current;
3236 $! = $status;
3237 },
3238 )
3239 };
3240 4102
3241 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3242 $DB_ENV = BDB::db_env_create; 4104 $DB_ENV = BDB::db_env_create;
4105 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4106 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4107 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4108 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4109 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3243 4110
3244 cf::sync_job { 4111 cf::sync_job {
3245 eval { 4112 eval {
3246 BDB::db_env_open 4113 BDB::db_env_open
3247 $DB_ENV, 4114 $DB_ENV,
3249 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4116 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3250 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4117 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3251 0666; 4118 0666;
3252 4119
3253 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4120 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3254
3255 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3256 $DB_ENV->set_lk_detect;
3257 }; 4121 };
3258 4122
3259 cf::cleanup "db_env_open(db): $@" if $@; 4123 cf::cleanup "db_env_open(db): $@" if $@;
3260 }; 4124 };
3261 } 4125 }
4126
4127 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4128 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4129 };
4130 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4131 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4132 };
4133 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4134 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4135 };
3262} 4136}
3263 4137
3264{ 4138{
4139 # configure IO::AIO
4140
3265 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3266
3267 undef $Coro::AIO::WATCHER;
3268 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3269 $AIO_POLL_WATCHER = Event->io ( 4143 undef $AnyEvent::AIO::WATCHER;
3270 reentrant => 0,
3271 data => WF_AUTOCANCEL,
3272 fd => IO::AIO::poll_fileno,
3273 poll => 'r',
3274 prio => 6,
3275 cb => \&IO::AIO::poll_cb,
3276 );
3277} 4144}
3278 4145
3279my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3280 4148
3281sub _log_backtrace { 4149sub _log_backtrace {
3282 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3283 4151
3284 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3285 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3286 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3287 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3288 ++$_log_backtrace; 4160 ++$_log_backtrace;
4161 my $perl_bt = Carp::longmess $msg;
3289 async { 4162 async {
4163 $Coro::current->{desc} = "abt $msg";
4164
3290 my @bt = fork_call { 4165 my @bt = fork_call {
3291 @addr = map { sprintf "%x", $_ } @addr; 4166 @addr = map { sprintf "%x", $_ } @addr;
3292 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4167 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3293 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4168 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3294 or die "addr2line: $!"; 4169 or die "addr2line: $!";
3302 } 4177 }
3303 4178
3304 @funcs 4179 @funcs
3305 }; 4180 };
3306 4181
3307 LOG llevInfo, "[ABT] $msg\n"; 4182 LOG llevInfo, "[ABT] $perl_bt\n";
4183 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3308 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3309 --$_log_backtrace; 4185 --$_log_backtrace;
3310 }; 4186 };
3311 } else { 4187 } else {
3312 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3313 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3314 } 4190 }
3315} 4191}
3316 4192
3317# load additional modules 4193# load additional modules
3318use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3319 4196
3320END { cf::emergency_save } 4197END { cf::emergency_save }
3321 4198
33221 41991
3323 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines