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.298 by root, Sun Jul 8 14:50:07 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;
61use Digest::MD5 ();
62
63AnyEvent::detect;
34 64
35# configure various modules to our taste 65# configure various modules to our taste
36# 66#
37$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40 75
41$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
42 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
63our $DATADIR = datadir; 99our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
67our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
72our $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;
73 120
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 123our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
81 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
84 132
85our %CFG; 133our %CFG;
86 134
87our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 136our $RUNTIME;
137our $NOW;
89 138
90our %PLAYER; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 140our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
93 142
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 145
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
99our $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 :)
100 155
101binmode STDOUT; 156binmode STDOUT;
102binmode STDERR; 157binmode STDERR;
103 158
104# read virtual server time, if available 159# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
109} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
110 167
111mkdir $_ 168mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 170
114our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
115 172
116sub 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::"} };
117 189
118############################################################################# 190#############################################################################
119 191
120=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
121 193
157 229
158The raw value load value from the last tick. 230The raw value load value from the last tick.
159 231
160=item %cf::CFG 232=item %cf::CFG
161 233
162Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 235from wherever your confdir points to.
164 236
165=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
166 238
167These 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
168returns 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
169per 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.
170 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
171=back 260=back
172 261
173=cut 262=cut
174 263
175BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
176 *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 {
177 my $msg = join "", @_; 271 my $msg = join "", @_;
178 272
179 $msg .= "\n" 273 $msg .= "\n"
180 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
181 275
182 $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;
183 277
184 utf8::encode $msg;
185 LOG llevError, $msg; 278 LOG llevWarn, $msg;
186 }; 279};
187} 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};
188 294
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 305for my $pkg (qw(
200 cf::global cf::attachable 306 cf::global cf::attachable
201 cf::object cf::object::player 307 cf::object cf::object::player
202 cf::client cf::player 308 cf::client cf::player
203 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
204 cf::map cf::party cf::region 311 cf::party cf::region
205)) { 312)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 314}
209 315
210$Event::DIED = sub { 316$EV::DIED = sub {
211 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
212}; 318};
213 319
214############################################################################# 320#############################################################################
215 321
216=head2 UTILITY FUNCTIONS 322=head2 UTILITY FUNCTIONS
238 $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;
239 $d 345 $d
240 } || "[unable to dump $_[0]: '$@']"; 346 } || "[unable to dump $_[0]: '$@']";
241} 347}
242 348
243=item $ref = cf::from_json $json 349=item $ref = cf::decode_json $json
244 350
245Converts a JSON string into the corresponding perl data structure. 351Converts a JSON string into the corresponding perl data structure.
246 352
247=item $json = cf::to_json $ref 353=item $json = cf::encode_json $ref
248 354
249Converts a perl data structure into its JSON representation. 355Converts a perl data structure into its JSON representation.
250 356
251=cut 357=cut
252 358
253our $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
254 360
255sub to_json ($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
256sub 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}
257 406
258=item cf::lock_wait $string 407=item cf::lock_wait $string
259 408
260Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
261 410
262=item my $lock = cf::lock_acquire $string 411=item my $lock = cf::lock_acquire $string
263 412
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 415for example when the coroutine gets canceled), the lock is automatically
267returned. 416returned.
268 417
418Locks are *not* recursive, locking from the same coro twice results in a
419deadlocked coro.
420
269Lock 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
270uses map_find and cf::map::load uses map_load). 422uses map_find and cf::map::load uses map_load).
271 423
272=item $locked = cf::lock_active $string 424=item $locked = cf::lock_active $string
273 425
274Return 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.
275 427
276=cut 428=cut
277 429
278our %LOCK; 430our $LOCKS = new Coro::SemaphoreSet;
279 431
280sub lock_wait($) { 432sub lock_wait($) {
281 my ($key) = @_; 433 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 434}
289 435
290sub lock_acquire($) { 436sub lock_acquire($) {
291 my ($key) = @_; 437 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 438}
303 439
304sub lock_active($) { 440sub lock_active($) {
305 my ($key) = @_; 441 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 442}
309 443
310sub freeze_mainloop { 444sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 445 tick_inhibit_inc;
312 446
313 my $guard = Coro::guard { 447 &Guard::guard (\&tick_inhibit_dec);
314 $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 }
315 }; 514 }
316 $TICK_WATCHER->stop; 515};
317 $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;
318} 530}
319 531
320=item cf::async { BLOCK } 532=item cf::async { BLOCK }
321 533
322Currently the same as Coro::async_pool, meaning you cannot use 534Currently the same as Coro::async_pool, meaning you cannot use
327 539
328BEGIN { *async = \&Coro::async_pool } 540BEGIN { *async = \&Coro::async_pool }
329 541
330=item cf::sync_job { BLOCK } 542=item cf::sync_job { BLOCK }
331 543
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 544The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 545is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 546partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 547acceptable.
336 548
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 550the given BLOCK in another coroutine while waiting for the result. The
342=cut 554=cut
343 555
344sub sync_job(&) { 556sub sync_job(&) {
345 my ($job) = @_; 557 my ($job) = @_;
346 558
347 if ($Coro::current == $Coro::main) { 559 if (in_main) {
348 my $time = Event::time; 560 my $time = AE::time;
349 561
350 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
352 564
353 # TODO: use suspend/resume instead 565 #LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 566
355 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
356 568
357 my $busy = 1; 569 my $busy = 1;
358 my @res; 570 my @res;
359 571
360 (async { 572 (async {
573 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 574 @res = eval { $job->() };
362 warn $@ if $@; 575 error $@ if $@;
363 undef $busy; 576 undef $busy;
364 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
365 578
366 while ($busy) { 579 while ($busy) {
367 Coro::cede or Event::one_event; 580 if (Coro::nready) {
581 Coro::cede_notself;
582 } else {
583 EV::loop EV::LOOP_ONESHOT;
368 } 584 }
585 }
369 586
370 $time = Event::time - $time; 587 my $time = AE::time - $time;
371 588
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
376 590
377 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
378 } else { 592 } else {
379 # we are in another coroutine, how wonderful, everything just works 593 # we are in another coroutine, how wonderful, everything just works
380 594
400 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
401 615
402 $coro 616 $coro
403} 617}
404 618
405=item fork_call { }, $args 619=item fork_call { }, @args
406 620
407Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 624never block itself or use any form of event handling.
411 625
412=cut 626=cut
627
628sub post_fork {
629 reset_signals;
630}
413 631
414sub fork_call(&@) { 632sub fork_call(&@) {
415 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
416 634
417# 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,
418# or die "socketpair: $!"; 636 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 637 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 638
422 if (my $pid = fork) { 639 my @res = Coro::Util::fork_eval {
423 close $fh2; 640 cf::post_fork;
641 &$cb
642 } @args;
424 643
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 644 wantarray ? @res : $res[-1]
426 warn "pst<$res>" unless $res =~ /^pst/; 645}
427 $res = Coro::Storable::thaw $res;
428 646
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 647sub objinfo {
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals;
436 local $SIG{__WARN__};
437 local $SIG{__DIE__};
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442
443 my @res = eval { $cb->(@args) };
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 } 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
460} 683}
461 684
462=item $value = cf::db_get $family => $key 685=item $value = cf::db_get $family => $key
463 686
464Returns a single value from the environment database. 687Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 689=item cf::db_put $family => $key => $value
467 690
468Stores 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
469data 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).
470 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
471=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}
472 720
473our $DB; 721our $DB;
474 722
475sub db_init { 723sub db_init {
476 unless ($DB) { 724 $DB ||= db_table "db";
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job {
480 eval {
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 }
490} 725}
491 726
492sub db_get($$) { 727sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
494 729
495 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
496 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
497 734
498 $! ? () 735 $! ? ()
499 : $data 736 : $data
500 }
501} 737}
502 738
503sub db_put($$$) { 739sub db_put($$$) {
504 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
505 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
544 if (1) { 780 if (1) {
545 $md5 = 781 $md5 =
546 join "\x00", 782 join "\x00",
547 $processversion, 783 $processversion,
548 map { 784 map {
549 Coro::cede; 785 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 786 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 787 } 0.. $#$src;
552 788
553 789
554 my $dbmd5 = db_get cache => "$id/md5"; 790 my $dbmd5 = db_get cache => "$id/md5";
561 797
562 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
563 my $data = $process->(\@data); 799 my $data = $process->(\@data);
564 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
565 801
566 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
567 803
568 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
569 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
570 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
571 807
581 817
582=cut 818=cut
583 819
584sub datalog($@) { 820sub datalog($@) {
585 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
586 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
587} 823}
588 824
589=back 825=back
590 826
591=cut 827=cut
592 828
593############################################################################# 829#############################################################################
594 830
595=head2 ATTACHABLE OBJECTS 831=head2 ATTACHABLE OBJECTS
596 832
597Many 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
598attach callbacks/event handlers (a collection of which is called an "attachment") 834attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 835to it. All such attachable objects support the following methods.
600 836
601In 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>
602C<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
603Crossfire TRT). 839Deliantra).
604 840
605=over 4 841=over 4
606 842
607=item $attachable->attach ($attachment, key => $value...) 843=item $attachable->attach ($attachment, key => $value...)
608 844
652=item cf::CLASS::attachment $name, ... 888=item cf::CLASS::attachment $name, ...
653 889
654Register an attachment by C<$name> through which attachable objects of the 890Register an attachment by C<$name> through which attachable objects of the
655given CLASS can refer to this attachment. 891given CLASS can refer to this attachment.
656 892
657Some classes such as crossfire maps and objects can specify attachments 893Some classes such as deliantra maps and objects can specify attachments
658that 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.
659 895
660These calls expect any number of the following handler/hook descriptions: 896These calls expect any number of the following handler/hook descriptions:
661 897
662=over 4 898=over 4
786 1022
787 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
788 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
789 1025
790 } elsif (ref $type) { 1026 } elsif (ref $type) {
791 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
792 1028
793 } else { 1029 } else {
794 shift @arg; 1030 shift @arg;
795 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
796 } 1032 }
797 } 1033 }
798} 1034}
799 1035
800sub _object_attach { 1036sub _object_attach {
810 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
811 } 1047 }
812 1048
813 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
814 } else { 1050 } else {
815 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
816 } 1052 }
817 1053
818 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
819} 1055}
820 1056
860 "; 1096 ";
861 die if $@; 1097 die if $@;
862} 1098}
863 1099
864our $override; 1100our $override;
865our @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?
866 1102
867sub override { 1103sub override {
868 $override = 1; 1104 $override = 1;
869 @invoke_results = (); 1105 @INVOKE_RESULTS = (@_);
870} 1106}
871 1107
872sub do_invoke { 1108sub do_invoke {
873 my $event = shift; 1109 my $event = shift;
874 my $callbacks = shift; 1110 my $callbacks = shift;
875 1111
876 @invoke_results = (); 1112 @INVOKE_RESULTS = ();
877 1113
878 local $override; 1114 local $override;
879 1115
880 for (@$callbacks) { 1116 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
882 1118
883 if ($@) { 1119 if ($@) {
884 warn "$@";
885 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
886 override; 1121 override;
887 } 1122 }
888 1123
889 return 1 if $override; 1124 return 1 if $override;
890 } 1125 }
891 1126
892 0 1127 0
893} 1128}
894 1129
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1131
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1132=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1133
899Generate an object-specific event with the given arguments. 1134Generate an object-specific event with the given arguments.
900 1135
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1138results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1139
905=back 1140=back
906 1141
907=cut 1142=cut
908 1143
909############################################################################# 1144#############################################################################
910# 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}
911 1188
912sub reattach { 1189sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1190 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1191 my ($obj) = @_;
915 1192
1193 # no longer needed after getting rid of delete_package?
916 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
917 1195
918 my $registry = $obj->registry; 1196 my $registry = $obj->registry;
919 1197
920 @$registry = (); 1198 @$registry = ();
921 1199
926 for (@$attach) { 1204 for (@$attach) {
927 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
928 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
929 } 1207 }
930 } else { 1208 } else {
931 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
932 } 1210 }
933 } 1211 }
934} 1212}
935 1213
936cf::attachable->attach ( 1214cf::attachable->attach (
937 prio => -1000000, 1215 prio => -1000000,
938 on_instantiate => sub { 1216 on_instantiate => sub {
939 my ($obj, $data) = @_; 1217 my ($obj, $data) = @_;
940 1218
941 $data = from_json $data; 1219 $data = decode_json $data;
942 1220
943 for (@$data) { 1221 for (@$data) {
944 my ($name, $args) = @$_; 1222 my ($name, $args) = @$_;
945 1223
946 $obj->attach ($name, %{$args || {} }); 1224 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1240sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
964 1242
965 sync_job { 1243 sync_job {
966 if (length $$rdata) { 1244 if (length $$rdata) {
1245 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
969 1249
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1251 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 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 }
974 close $fh; 1257 aio_close $fh;
975 1258
976 if (@$objs) { 1259 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1261 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1262 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1263 aio_write $fh, 0, (length $data), $data, 0;
981 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 }
982 close $fh; 1268 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1269 aio_rename "$filename.pst~", "$filename.pst";
984 } 1270 }
985 } else { 1271 } else {
986 aio_unlink "$filename.pst"; 1272 aio_unlink "$filename.pst";
987 } 1273 }
988 1274
989 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1276
1277 $filename =~ s%/[^/]+$%%;
1278 aio_pathsync $filename if $cf::USE_FSYNC;
990 } else { 1279 } else {
991 warn "FATAL: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
992 } 1281 }
993 } else { 1282 } else {
994 aio_unlink $filename; 1283 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
996 } 1285 }
997 } 1286 };
998} 1287}
999 1288
1000sub object_freezer_as_string { 1289sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1290 my ($rdata, $objs) = @_;
1002 1291
1014 or return; 1303 or return;
1015 1304
1016 unless (aio_stat "$filename.pst") { 1305 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1306 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1307 or return;
1308
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1309 my $st = eval { Coro::Storable::thaw $av };
1310 $av = $st->{objs};
1020 } 1311 }
1021 1312
1313 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1317
1024 return ($data, $av); 1318 ($data, $av)
1025} 1319}
1026 1320
1027=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
1028 1322
1029=over 4 1323=over 4
1083 my ($name, $cb) = @_; 1377 my ($name, $cb) = @_;
1084 1378
1085 $EXTICMD{$name} = $cb; 1379 $EXTICMD{$name} = $cb;
1086} 1380}
1087 1381
1382use File::Glob ();
1383
1088cf::player->attach ( 1384cf::player->attach (
1089 on_command => sub { 1385 on_unknown_command => sub {
1090 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1091 1387
1092 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1093 or return; 1389 or return;
1094 1390
1102 my ($pl, $buf) = @_; 1398 my ($pl, $buf) = @_;
1103 1399
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1400 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1401
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1410 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1411 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1412 }
1413
1414 $pl->ext_reply ($reply, @reply)
1415 if $reply;
1416
1112 } else { 1417 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1419 }
1115 1420
1116 cf::override; 1421 cf::override;
1117 }, 1422 },
1118); 1423);
1119 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
1120sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1121 cf::sync_job { 1441 cf::sync_job {
1122 my %todo; 1442 my %todo;
1123 1443
1124 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1125 next unless -r $path; 1445 next unless -r $path;
1143 1463
1144 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1145 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1146 1466
1147 $ext{source} = 1467 $ext{source} =
1148 "package $pkg; use strict; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1149 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1150 . $source 1470 . $source
1151 . "\n};\n1"; 1471 . "\n};\n1";
1152 1472
1153 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
1154 } 1474 }
1155 1475
1476 my $pass = 0;
1156 my %done; 1477 my %done;
1157 while (%todo) { 1478 while (%todo) {
1158 my $progress; 1479 my $progress;
1159 1480
1481 ++$pass;
1482
1483 ext:
1160 while (my ($k, $v) = each %todo) { 1484 while (my ($k, $v) = each %todo) {
1161 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1162 goto skip 1486 next ext
1163 unless exists $done{$_}; 1487 unless exists $done{$_};
1164 } 1488 }
1165 1489
1166 warn "... loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1167 1491
1168 unless (eval $v->{source}) { 1492 my $active = eval $v->{source};
1493
1494 if (length $@) {
1169 my $msg = $@ ? "$v->{path}: $@\n" 1495 error "$v->{path}: $@\n";
1170 : "$v->{base}: extension inactive.\n";
1171 1496
1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1172 if (exists $v->{meta}{mandatory}) { 1498 if exists $v->{meta}{mandatory};
1173 warn $msg; 1499
1174 warn "mandatory extension failed to load, exiting.\n"; 1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1175 exit 1; 1501 delete $todo{$k};
1176 } 1502 } else {
1177 1503 $done{$k} = delete $todo{$k};
1178 warn $msg; 1504 push @EXTS, $v->{pkg};
1505 $progress = 1;
1506
1507 info "$v->{base}: extension inactive.\n"
1508 unless $active;
1179 } 1509 }
1180
1181 $done{$k} = delete $todo{$k};
1182 push @EXTS, $v->{pkg};
1183 $progress = 1;
1184 } 1510 }
1185 1511
1186 skip: 1512 unless ($progress) {
1187 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1513 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1188 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 }
1189 } 1520 }
1190 }; 1521 };
1191} 1522}
1192 1523
1193############################################################################# 1524#############################################################################
1194 1525
1195=back 1526=back
1196 1527
1197=head2 CORE EXTENSIONS 1528=head2 CORE EXTENSIONS
1198 1529
1199Functions and methods that extend core crossfire objects. 1530Functions and methods that extend core deliantra objects.
1200 1531
1201=cut 1532=cut
1202 1533
1203package cf::player; 1534package cf::player;
1204 1535
1205use Coro::AIO; 1536use Coro::AIO;
1206 1537
1207=head3 cf::player 1538=head3 cf::player
1208 1539
1209=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}
1210 1555
1211=item cf::player::find $login 1556=item cf::player::find $login
1212 1557
1213Returns the given player object, loading it if necessary (might block). 1558Returns the given player object, loading it if necessary (might block).
1214 1559
1233 1578
1234sub exists($) { 1579sub exists($) {
1235 my ($login) = @_; 1580 my ($login) = @_;
1236 1581
1237 $cf::PLAYER{$login} 1582 $cf::PLAYER{$login}
1238 or cf::sync_job { !aio_stat path $login } 1583 or !aio_stat path $login
1239} 1584}
1240 1585
1241sub find($) { 1586sub find($) {
1242 return $cf::PLAYER{$_[0]} || do { 1587 return $cf::PLAYER{$_[0]} || do {
1243 my $login = $_[0]; 1588 my $login = $_[0];
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1595 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1596 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1597 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1598 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1599
1255 my $pl = load_pl path $login 1600 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1258 } 1609 }
1259 } 1610 }
1260} 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);
1261 1625
1262sub save($) { 1626sub save($) {
1263 my ($pl) = @_; 1627 my ($pl) = @_;
1264 1628
1265 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1270 return if $pl->{deny_save}; 1634 return if $pl->{deny_save};
1271 1635
1272 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1274 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
1275 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1276 Coro::cede; 1645 cf::cede_to_tick;
1277} 1646}
1278 1647
1279sub new($) { 1648sub new($) {
1280 my ($login) = @_; 1649 my ($login) = @_;
1281 1650
1287 $cf::PLAYER{$login} = $self; 1656 $cf::PLAYER{$login} = $self;
1288 1657
1289 $self 1658 $self
1290} 1659}
1291 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
1292=item $pl->quit_character 1671=item $pl->quit_character
1293 1672
1294Nukes the player without looking back. If logged in, the connection will 1673Nukes the player without looking back. If logged in, the connection will
1295be destroyed. May block for a long time. 1674be destroyed. May block for a long time.
1296 1675
1300 my ($pl) = @_; 1679 my ($pl) = @_;
1301 1680
1302 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1303 1682
1304 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1305 $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
1306 1685
1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1308 $pl->deactivate; 1687 $pl->deactivate;
1688
1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1309 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1310 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1311 1694
1312 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1313 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1314 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
1349 or return []; 1732 or return [];
1350 1733
1351 my @logins; 1734 my @logins;
1352 1735
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1742 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1743 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1744 $buf !~ /^password -------------$/m or next; # official not-valid tag
1745 }
1357 1746
1358 utf8::decode $login; 1747 utf8::decode $login;
1359 push @logins, $login; 1748 push @logins, $login;
1360 } 1749 }
1361 1750
1362 \@logins 1751 \@logins
1363} 1752}
1364 1753
1365=item $player->maps 1754=item $player->maps
1755
1756=item cf::player::maps $login
1366 1757
1367Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1368player. May block. 1759player. May block.
1369 1760
1370=cut 1761=cut
1388 } 1779 }
1389 1780
1390 \@paths 1781 \@paths
1391} 1782}
1392 1783
1393=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1784=item $protocol_xml = $player->expand_cfpod ($cfpod)
1394 1785
1395Expand crossfire pod fragments into protocol xml. 1786Expand deliantra pod fragments into protocol xml.
1396 1787
1397=cut
1398
1399sub expand_cfpod {
1400 ((my $self), (local $_)) = @_;
1401
1402 # escape & and <
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405
1406 # this is buggy, it needs to properly take care of nested <'s
1407
1408 1 while
1409 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/
1413 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1
1416 }ge
1417 # replace H<hint text>
1418 || s{H<([^\>]*)>}
1419 {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "")
1423 [$self->{hintmode}]
1424 }ge;
1425
1426 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g;
1428
1429 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines
1434
1435 $_
1436}
1437
1438sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode}
1441}
1442
1443=item $player->ext_reply ($msgid, %msg) 1788=item $player->ext_reply ($msgid, @msg)
1444 1789
1445Sends an ext reply to the player. 1790Sends an ext reply to the player.
1446 1791
1447=cut 1792=cut
1448 1793
1449sub ext_reply($$%) { 1794sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1795 my ($self, $id, @msg) = @_;
1451 1796
1452 $msg{msgid} = $id; 1797 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1798}
1455 1799
1456=item $player->ext_event ($type, %msg) 1800=item $player->ext_msg ($type, @msg)
1457 1801
1458Sends an ext event to the client. 1802Sends an ext event to the client.
1459 1803
1460=cut 1804=cut
1461 1805
1462sub ext_event($$%) { 1806sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1807 my ($self, $type, @msg) = @_;
1464 1808
1465 $self->ns->ext_event ($type, %msg); 1809 $self->ns->ext_msg ($type, @msg);
1466} 1810}
1467 1811
1468=head3 cf::region 1812=head3 cf::region
1469 1813
1470=over 4 1814=over 4
1480=cut 1824=cut
1481 1825
1482sub find_by_path($) { 1826sub find_by_path($) {
1483 my ($path) = @_; 1827 my ($path) = @_;
1484 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1485 my ($match, $specificity); 1831 my ($match, $specificity);
1486 1832
1487 for my $region (list) { 1833 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1836 if $region->specificity > $specificity;
1491 } 1837 }
1492 } 1838 }
1493 1839
1514our $MAX_RESET = 3600; 1860our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1861our $DEFAULT_RESET = 3000;
1516 1862
1517sub generate_random_map { 1863sub generate_random_map {
1518 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1519 # mit "rum" bekleckern, nicht 1865
1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1867
1520 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1524 $rmp->{exit_on_final_map},
1525 $rmp->{xsize}, $rmp->{ysize},
1526 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1527 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1528 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1529 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1530 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1531 (cf::region::find $rmp->{region}), $rmp->{custom}
1532 )
1533} 1869}
1534 1870
1535=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1536 1872
1537Register 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
1542 1878
1543sub register { 1879sub register {
1544 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1545 my $pkg = caller; 1881 my $pkg = caller;
1546 1882
1547 no strict;
1548 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1549 1884
1550 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1551} 1886}
1552 1887
1553# also paths starting with '/' 1888# also paths starting with '/'
1554$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1555 1890
1556sub thawer_merge { 1891sub thawer_merge {
1557 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1558 1893
1559 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
1564} 1899}
1565 1900
1566sub normalise { 1901sub normalise {
1567 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1568 1903
1569 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1570 1905
1571 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1572 1907
1573 # map plan: 1908 # map plan:
1574 # 1909 #
1589 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1590 $path = "$base/$path"; 1925 $path = "$base/$path";
1591 } 1926 }
1592 1927
1593 for ($path) { 1928 for ($path) {
1594 redo if s{//}{/};
1595 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1596 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1597 } 1931 }
1598 1932
1599 $path 1933 $path
1613 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1614 return $self; 1948 return $self;
1615 } 1949 }
1616 } 1950 }
1617 1951
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1619 () 1953 ()
1620} 1954}
1621 1955
1622sub init { 1956sub init {
1623 my ($self) = @_; 1957 my ($self) = @_;
1645 1979
1646# the temporary/swap location 1980# the temporary/swap location
1647sub save_path { 1981sub save_path {
1648 my ($self) = @_; 1982 my ($self) = @_;
1649 1983
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1984 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 1985 "$TMPDIR/$path.map"
1652} 1986}
1653 1987
1654# the unique path, undef == no special unique path 1988# the unique path, undef == no special unique path
1655sub uniq_path { 1989sub uniq_path {
1656 my ($self) = @_; 1990 my ($self) = @_;
1657 1991
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1992 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 1993 "$UNIQUEDIR/$path"
1660}
1661
1662# and all this just because we cannot iterate over
1663# all maps in C++...
1664sub change_all_map_light {
1665 my ($change) = @_;
1666
1667 $_->change_map_light ($change)
1668 for grep $_->outdoor, values %cf::MAP;
1669} 1994}
1670 1995
1671sub decay_objects { 1996sub decay_objects {
1672 my ($self) = @_; 1997 my ($self) = @_;
1673 1998
1686 2011
1687sub load_header_from($) { 2012sub load_header_from($) {
1688 my ($self, $path) = @_; 2013 my ($self, $path) = @_;
1689 2014
1690 utf8::encode $path; 2015 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 2016 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 2024
1697 $self->{load_path} = $path; 2025 $self->{load_path} = $path;
1698 2026
1699 1 2027 1
1700} 2028}
1752 2080
1753sub find; 2081sub find;
1754sub find { 2082sub find {
1755 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
1756 2084
2085 cf::cede_to_tick;
2086
1757 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
1758 2088
2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
1760 2091
1761 $cf::MAP{$path} || do { 2092 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path";
1763 my $map = new_from_path cf::map $path 2093 my $map = new_from_path cf::map $path
1764 or return; 2094 or return;
1765 2095
1766 $map->{last_save} = $cf::RUNTIME; 2096 $map->{last_save} = $cf::RUNTIME;
1767 2097
1769 or return; 2099 or return;
1770 2100
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2101 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2102 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2103 #$cf::WAIT_FOR_TICK->wait;
2104 undef $guard2;
2105 undef $guard1;
1774 $map->reset; 2106 $map->reset;
1775 undef $guard;
1776 return find $path; 2107 return find $path;
1777 } 2108 }
1778 2109
1779 $cf::MAP{$path} = $map 2110 $cf::MAP{$path} = $map
1780 } 2111 }
1781} 2112}
1782 2113
1783sub pre_load { } 2114sub pre_load { }
1784sub post_load { } 2115#sub post_load { } # XS
1785 2116
1786sub load { 2117sub load {
1787 my ($self) = @_; 2118 my ($self) = @_;
1788 2119
1789 local $self->{deny_reset} = 1; # loading can take a long time 2120 local $self->{deny_reset} = 1; # loading can take a long time
1790 2121
1791 my $path = $self->{path}; 2122 my $path = $self->{path};
1792 2123
1793 { 2124 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2125 my $guard = cf::lock_acquire "map_data:$path";
1795 2126
2127 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2128 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2129
1798 $self->in_memory (cf::MAP_LOADING); 2130 $self->in_memory (cf::MAP_LOADING);
1799 2131
1800 $self->alloc; 2132 $self->alloc;
1801 2133
1802 $self->pre_load; 2134 $self->pre_load;
1803 Coro::cede; 2135 cf::cede_to_tick;
1804 2136
2137 my $f = new_from_file cf::object::thawer $self->{load_path};
2138 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2139 $self->_load_objects ($f)
1806 or return; 2140 or return;
1807 2141
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2142 $self->post_load_original
1809 if delete $self->{load_original}; 2143 if delete $self->{load_original};
1810 2144
1811 if (my $uniq = $self->uniq_path) { 2145 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2146 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2147 unless (aio_stat $uniq) {
2148 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2149 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2150 $self->_load_objects ($f);
2151 $f->resolve_delayed_derefs;
2152 }
1816 } 2153 }
1817 } 2154 }
1818 2155
1819 Coro::cede; 2156 $f->resolve_delayed_derefs;
2157
2158 cf::cede_to_tick;
1820 # now do the right thing for maps 2159 # now do the right thing for maps
1821 $self->link_multipart_objects; 2160 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2161 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2162 unless $self->difficulty;
1824 Coro::cede; 2163 cf::cede_to_tick;
1825 2164
1826 unless ($self->{deny_activate}) { 2165 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2166 $self->decay_objects;
1828 $self->fix_auto_apply; 2167 $self->fix_auto_apply;
1829 $self->update_buttons; 2168 $self->update_buttons;
1830 Coro::cede; 2169 cf::cede_to_tick;
1831 $self->set_darkness_map;
1832 Coro::cede;
1833 $self->activate; 2170 $self->activate;
1834 } 2171 }
1835 2172
2173 $self->{last_save} = $cf::RUNTIME;
2174 $self->last_access ($cf::RUNTIME);
2175
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2176 $self->in_memory (cf::MAP_ACTIVE);
1837 } 2177 }
1838 2178
1839 $self->post_load; 2179 $self->post_load;
1840}
1841 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
1842sub customise_for { 2187sub customise_for {
1843 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
1844 2189
1845 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
1846 if $self->per_player; 2191 if $self->per_player;
1850 2195
1851 $self 2196 $self
1852} 2197}
1853 2198
1854# 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
1855sub load_diag { 2200sub load_neighbours {
1856 my ($map) = @_; 2201 my ($map) = @_;
1857 2202
1858 my @diag; # diagonal neighbours 2203 my @neigh; # diagonal neighbours
1859 2204
1860 for (0 .. 3) { 2205 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2206 my $neigh = $map->tile_path ($_)
1862 or next; 2207 or next;
1863 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
1864 or next; 2209 or next;
1865 $neigh->load; 2210 $neigh->load;
1866 2211
2212 # now find the diagonal neighbours
2213 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2216 }
1870 2217
1871 for (@diag) { 2218 for (grep defined $_->[0], @neigh) {
2219 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2220 my $neigh = find $path, $origin
1873 or next; 2221 or next;
1874 $neigh->load; 2222 $neigh->load;
1875 } 2223 }
1876} 2224}
1877 2225
1878sub find_sync { 2226sub find_sync {
1879 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
1880 2228
1881 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
1882} 2233}
1883 2234
1884sub do_load_sync { 2235sub do_load_sync {
1885 my ($map) = @_; 2236 my ($map) = @_;
1886 2237
1887 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;
1888} 2242}
1889 2243
1890our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
1892 2246
1893sub find_async { 2247sub find_async {
1894 my ($path, $origin) = @_; 2248 my ($path, $origin, $load) = @_;
1895 2249
1896 $path = normalise $path, $origin && $origin->{path}; 2250 $path = normalise $path, $origin && $origin->{path};
1897 2251
1898 if (my $map = $cf::MAP{$path}) { 2252 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2253 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1900 } 2254 }
1901 2255
1902 undef $MAP_PREFETCH{$path}; 2256 $MAP_PREFETCH{$path} |= $load;
2257
1903 $MAP_PREFETCHER ||= cf::async { 2258 $MAP_PREFETCHER ||= cf::async {
2259 $Coro::current->{desc} = "map prefetcher";
2260
1904 while (%MAP_PREFETCH) { 2261 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2262 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2263 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2264 $map->load if $v;
2265 }
1909 2266
1910 delete $MAP_PREFETCH{$path}; 2267 delete $MAP_PREFETCH{$k};
1911 } 2268 }
1912 } 2269 }
1913 undef $MAP_PREFETCHER; 2270 undef $MAP_PREFETCHER;
1914 }; 2271 };
1915 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
1916 2273
1917 () 2274 ()
1918} 2275}
1919 2276
2277# common code, used by both ->save and ->swapout
1920sub save { 2278sub _save {
1921 my ($self) = @_; 2279 my ($self) = @_;
1922
1923 my $lock = cf::lock_acquire "map_data:" . $self->path;
1924 2280
1925 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
1926 2282
1927 return unless $self->dirty; 2283 return unless $self->dirty;
1928 2284
1934 return if $self->{deny_save}; 2290 return if $self->{deny_save};
1935 2291
1936 local $self->{last_access} = $self->last_access;#d# 2292 local $self->{last_access} = $self->last_access;#d#
1937 2293
1938 cf::async { 2294 cf::async {
2295 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2296 $_->contr->save for $self->players;
1940 }; 2297 };
2298
2299 cf::get_slot 0.02;
1941 2300
1942 if ($uniq) { 2301 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2302 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2303 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2304 } else {
1946 $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);
1947 } 2306 }
1948} 2307}
1949 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
1950sub swap_out { 2317sub swap_out {
1951 my ($self) = @_; 2318 my ($self) = @_;
1952 2319
1953 # save first because save cedes
1954 $self->save;
1955
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2321
2322 return if $self->in_memory != cf::MAP_ACTIVE;
2323 return if $self->{deny_save};
1958 return if $self->players; 2324 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save};
1961 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
1962 $self->clear; 2335 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2336}
1965 2337
1966sub reset_at { 2338sub reset_at {
1967 my ($self) = @_; 2339 my ($self) = @_;
1968 2340
1986 2358
1987 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
1988 2360
1989 return if $self->players; 2361 return if $self->players;
1990 2362
1991 warn "resetting map ", $self->path; 2363 cf::trace "resetting map ", $self->path, "\n";
1992 2364
1993 $self->in_memory (cf::MAP_SWAPPED); 2365 $self->in_memory (cf::MAP_SWAPPED);
1994 2366
1995 # need to save uniques path 2367 # need to save uniques path
1996 unless ($self->{deny_save}) { 2368 unless ($self->{deny_save}) {
2000 if $uniq; 2372 if $uniq;
2001 } 2373 }
2002 2374
2003 delete $cf::MAP{$self->path}; 2375 delete $cf::MAP{$self->path};
2004 2376
2377 $self->deactivate;
2378 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2379 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2380
2009 $self->unlink_save; 2381 $self->unlink_save;
2010 $self->destroy; 2382 $self->destroy;
2011} 2383}
2012 2384
2013my $nuke_counter = "aaaa"; 2385my $nuke_counter = "aaaa";
2014 2386
2015sub nuke { 2387sub nuke {
2016 my ($self) = @_; 2388 my ($self) = @_;
2017 2389
2390 {
2391 my $lock = cf::lock_acquire "map_data:$self->{path}";
2392
2018 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2019 2394
2020 $self->unlink_save; 2395 $self->unlink_save;
2021 2396
2022 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2023 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2402
2028 $cf::MAP{$self->path} = $self; 2403 $cf::MAP{$self->path} = $self;
2404 }
2029 2405
2030 $self->reset; # polite request, might not happen 2406 $self->reset; # polite request, might not happen
2031} 2407}
2032 2408
2033=item $maps = cf::map::tmp_maps 2409=item $maps = cf::map::tmp_maps
2075 2451
2076sub unique_maps() { 2452sub unique_maps() {
2077 [ 2453 [
2078 map { 2454 map {
2079 utf8::decode $_; 2455 utf8::decode $_;
2080 /\.map$/ 2456 s/\.map$//; # TODO future compatibility hack
2457 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2458 ? ()
2081 ? normalise $_ 2459 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2460 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2461 ]
2085} 2462}
2086 2463
2087package 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}
2088 2495
2089=back 2496=back
2090 2497
2091=head3 cf::object 2498=head3 cf::object
2092 2499
2096 2503
2097=over 4 2504=over 4
2098 2505
2099=item $ob->inv_recursive 2506=item $ob->inv_recursive
2100 2507
2101Returns 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.
2102 2510
2103=cut 2511=cut
2104 2512
2105sub inv_recursive_; 2513sub inv_recursive_;
2106sub inv_recursive_ { 2514sub inv_recursive_ {
2109 2517
2110sub inv_recursive { 2518sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2519 inv_recursive_ inv $_[0]
2112} 2520}
2113 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
2114package cf; 2550package cf;
2115 2551
2116=back 2552=back
2117 2553
2118=head3 cf::object::player 2554=head3 cf::object::player
2124Sends 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>
2125can 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
2126dialogue with the given NPC character. 2562dialogue with the given NPC character.
2127 2563
2128=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};
2129 2579
2130# rough implementation of a future "reply" method that works 2580# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2581# with dialog boxes.
2132#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
2133sub cf::object::player::reply($$$;$) { 2583sub cf::object::player::reply($$$;$) {
2140 2590
2141 } else { 2591 } else {
2142 my $pl = $self->contr; 2592 my $pl = $self->contr;
2143 2593
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2594 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2595 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2596 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2597
2153 } else { 2598 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2599 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2600 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2601 }
2157 } 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 (@_);
2158} 2613}
2159 2614
2160=item $player_object->may ("access") 2615=item $player_object->may ("access")
2161 2616
2162Returns wether the given player is authorized to access resource "access" 2617Returns wether the given player is authorized to access resource "access"
2175 2630
2176=item $player_object->enter_link 2631=item $player_object->enter_link
2177 2632
2178Freezes 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}>).
2179 2634
2180The 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.
2181I<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.
2182 2639
2183Will never block. 2640Will never block.
2184 2641
2185=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
2186 2643
2206sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2207 my ($self) = @_; 2664 my ($self) = @_;
2208 2665
2209 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2210 2667
2668 ++$self->{_link_recursion};
2669
2211 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2212 2671
2213 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2214 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2215 2674
2216 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2217} 2676}
2218 2677
2219sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2220 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2221 2680
2238 ($x, $y) = (-1, -1) 2697 ($x, $y) = (-1, -1)
2239 unless (defined $x) && (defined $y); 2698 unless (defined $x) && (defined $y);
2240 2699
2241 # use -1 or undef as default coordinates, not 0, 0 2700 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2701 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2702 if $x <= 0 && $y <= 0;
2244 2703
2245 $map->load; 2704 $map->load;
2246 $map->load_diag; 2705 $map->load_neighbours;
2247 2706
2248 return unless $self->contr->active; 2707 return unless $self->contr->active;
2249 $self->activate_recursive;
2250 2708
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2253} 2711 # entering was successful
2712 delete $self->{_link_recursion};
2713 # only activate afterwards, to support waiting in hooks
2714 $self->activate_recursive;
2715 }
2254 2716
2717}
2718
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2256 2720
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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 >>.
2261 2729
2262=cut 2730=cut
2263 2731
2264our $GOTOGEN; 2732our $GOTOGEN;
2265 2733
2266sub cf::object::player::goto { 2734sub cf::object::player::goto {
2267 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 }
2268 2742
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2745
2272 $self->enter_link; 2746 $self->enter_link;
2273 2747
2274 (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
2275 my $map = eval { 2770 my $map = eval {
2276 my $map = cf::map::find $path; 2771 my $map = defined $path ? cf::map::find $path : undef;
2277 2772
2278 if ($map) { 2773 if ($map) {
2279 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2281 } else { 2776 } else {
2282 $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);
2283 } 2778 }
2284 2779
2285 $map 2780 $map
2286 }; 2781 };
2287 2782
2292 2787
2293 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2296 } 2791 }
2792
2793 $done->($self) if $done;
2297 })->prio (1); 2794 })->prio (1);
2298} 2795}
2299 2796
2300=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2301 2798
2321} 2818}
2322 2819
2323sub prepare_random_map { 2820sub prepare_random_map {
2324 my ($exit) = @_; 2821 my ($exit) = @_;
2325 2822
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2823 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2824 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2825 # that depends on the exit object
2331 2826
2332 my $rmp = parse_random_map_params $exit->msg; 2827 my $rmp = parse_random_map_params $exit->msg;
2334 if ($exit->map) { 2829 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2830 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2831 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2832 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2833 $rmp->{origin_y} = $exit->y;
2834
2835 $exit->map->touch;
2339 } 2836 }
2340 2837
2341 $rmp->{random_seed} ||= $exit->random_seed; 2838 $rmp->{random_seed} ||= $exit->random_seed;
2342 2839
2343 my $data = cf::to_json $rmp; 2840 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2841 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2842 my $meta = "$RANDOMDIR/$md5.meta";
2346 2843
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2844 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2845 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2846 undef $fh;
2350 aio_rename "$meta~", $meta; 2847 aio_rename "$meta~", $meta;
2351 2848
2849 my $slaying = "?random/$md5";
2850
2851 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2852 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2853 $exit->msg (undef);
2854 }
2354 } 2855 }
2355} 2856}
2356 2857
2357sub cf::object::player::enter_exit { 2858sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2859 my ($self, $exit) = @_;
2359 2860
2360 return unless $self->type == cf::PLAYER; 2861 return unless $self->type == cf::PLAYER;
2361 2862
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2863 $self->enter_link;
2374 2864
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2865 (async {
2380 $self->deactivate_recursive; # just to be sure 2866 $Coro::current->{desc} = "enter_exit";
2867
2381 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
2382 $self->goto ($slaying, $hp, $sp); 2883 $self->goto ($map, $x, $y);
2383 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
2384 1; 2889 1
2385 }) { 2890 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2387 . "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. "
2388 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2390 2895
2391 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2392 $self->leave_link; 2897 $self->leave_link;
2393 } 2898 }
2394 })->prio (1); 2899 })->prio (1);
2395} 2900}
2396 2901
2410 2915
2411 utf8::encode $text; 2916 utf8::encode $text;
2412 $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);
2413} 2918}
2414 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
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2945=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2946
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2950the message unless the client supports the msg packet.
2421 2951
2422=cut 2952=cut
2423 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
2424sub cf::client::send_msg { 3068sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 3069 my ($self, $channel, $msg, $color, @extra) = @_;
2426 3070
2427 $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 }
2428 3092
2429 return unless @extra || length $msg; 3093 return unless @extra || length $msg;
2430 3094
2431 if ($self->can_msg) { 3095 # default colour, mask it out
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3096 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2433 } else { 3097 if $color & cf::NDI_DEF;
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443 3098
2444 if ($color >= 0) { 3099 my $pkt = "msg "
2445 if (0 && $msg =~ /\[/) { 3100 . $self->{json_coder}->encode (
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 3101 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2447 } else { 3102 );
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg")
2450 }
2451 }
2452 }
2453}
2454 3103
3104 $self->send_big_packet ($pkt);
3105}
3106
2455=item $client->ext_event ($type, %msg) 3107=item $client->ext_msg ($type, @msg)
2456 3108
2457Sends an ext event to the client. 3109Sends an ext event to the client.
2458 3110
2459=cut 3111=cut
2460 3112
2461sub cf::client::ext_event($$%) { 3113sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 3114 my ($self, $type, @msg) = @_;
2463 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
2464 $msg{msgtype} = "event_$type"; 3119 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 3140}
2467 3141
2468=item $success = $client->query ($flags, "text", \&cb) 3142=item $success = $client->query ($flags, "text", \&cb)
2469 3143
2470Queues a query to the client, calling the given callback with 3144Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 3199 my ($ns, $buf) = @_;
2526 3200
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3201 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 3202
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3211 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 3212 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 3213 }
3214
3215 $ns->ext_reply ($reply, @reply)
3216 if $reply;
3217
2536 } else { 3218 } else {
2537 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";
2538 } 3220 }
2539 3221
2540 cf::override; 3222 cf::override;
2541 }, 3223 },
2542); 3224);
2562 3244
2563 $coro 3245 $coro
2564} 3246}
2565 3247
2566cf::client->attach ( 3248cf::client->attach (
2567 on_destroy => sub { 3249 on_client_destroy => sub {
2568 my ($ns) = @_; 3250 my ($ns) = @_;
2569 3251
2570 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2571 }, 3253 },
2572); 3254);
2587our $safe = new Safe "safe"; 3269our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3270our $safe_hole = new Safe::Hole;
2589 3271
2590$SIG{FPE} = 'IGNORE'; 3272$SIG{FPE} = 'IGNORE';
2591 3273
2592$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));
2593 3279
2594# here we export the classes and methods available to script code 3280# here we export the classes and methods available to script code
2595 3281
2596=pod 3282=pod
2597 3283
2598The following functions and methods are available within a safe environment: 3284The following functions and methods are available within a safe environment:
2599 3285
2600 cf::object 3286 cf::object
2601 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
2602 insert remove 3288 insert remove name archname title slaying race decrease split
3289 value
2603 3290
2604 cf::object::player 3291 cf::object::player
2605 player 3292 player
2606 3293
2607 cf::player 3294 cf::player
2612 3299
2613=cut 3300=cut
2614 3301
2615for ( 3302for (
2616 ["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
2617 insert remove)], 3304 insert remove inv nrof name archname title slaying race
3305 decrease split destroy change_exp value msg lore send_msg)],
2618 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3307 ["cf::player" => qw(peaceful send_msg)],
2620 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
2621) { 3309) {
2622 no strict 'refs';
2623 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
2624 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2625 for @funs; 3312 for @funs;
2626} 3313}
2627 3314
2642 3329
2643 my $qcode = $code; 3330 my $qcode = $code;
2644 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3331 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2645 $qcode =~ s/\n/\\n/g; 3332 $qcode =~ s/\n/\\n/g;
2646 3333
3334 %vars = (_dummy => 0) unless %vars;
3335
3336 my @res;
2647 local $_; 3337 local $_;
2648 local @safe::cf::_safe_eval_args = values %vars;
2649 3338
2650 my $eval = 3339 my $eval =
2651 "do {\n" 3340 "do {\n"
2652 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3341 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2653 . "#line 0 \"{$qcode}\"\n" 3342 . "#line 0 \"{$qcode}\"\n"
2654 . $code 3343 . $code
2655 . "\n}" 3344 . "\n}"
2656 ; 3345 ;
2657 3346
3347 if ($CFG{safe_eval}) {
2658 sub_generation_inc; 3348 sub_generation_inc;
3349 local @safe::cf::_safe_eval_args = values %vars;
2659 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3350 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2660 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 }
2661 3356
2662 if ($@) { 3357 if ($@) {
2663 warn "$@"; 3358 warn "$@",
2664 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
2665 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
2666 } 3361 }
2667 3362
2668 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
2669} 3364}
2670 3365
2684=cut 3379=cut
2685 3380
2686sub register_script_function { 3381sub register_script_function {
2687 my ($fun, $cb) = @_; 3382 my ($fun, $cb) = @_;
2688 3383
2689 no strict 'refs'; 3384 $fun = "safe::$fun" if $CFG{safe_eval};
2690 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3385 *$fun = $safe_hole->wrap ($cb);
2691} 3386}
2692 3387
2693=back 3388=back
2694 3389
2695=cut 3390=cut
2698# the server's init and main functions 3393# the server's init and main functions
2699 3394
2700sub load_facedata($) { 3395sub load_facedata($) {
2701 my ($path) = @_; 3396 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
2704 3405
2705 my $facedata;
2706 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
2707 or die "$path: $!"; 3407 or die "$path: $!";
2708 3408
2709 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
2710 3410
2711 $facedata->{version} == 2 3411 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3412 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3423 {
2715 my $faces = $facedata->{faceinfo}; 3424 my $faces = $facedata->{faceinfo};
2716 3425
2717 while (my ($face, $info) = each %$faces) { 3426 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3427 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3428
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3430 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2722 Coro::cede; 3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3434
3435 cf::cede_to_tick;
2723 } 3436 }
2724 3437
2725 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3439 next unless $info->{smooth};
3440
2727 my $idx = cf::face::find $face 3441 my $idx = cf::face::find $face
2728 or next; 3442 or next;
3443
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3445 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3447 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3449 }
2734 Coro::cede; 3450
3451 cf::cede_to_tick;
2735 } 3452 }
2736 } 3453 }
2737 3454
2738 { 3455 {
2739 my $anims = $facedata->{animinfo}; 3456 my $anims = $facedata->{animinfo};
2740 3457
2741 while (my ($anim, $info) = each %$anims) { 3458 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3459 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3460 cf::cede_to_tick;
2744 } 3461 }
2745 3462
2746 cf::anim::invalidate_all; # d'oh 3463 cf::anim::invalidate_all; # d'oh
2747 } 3464 }
2748 3465
3466 {
3467 my $res = $facedata->{resource};
3468
3469 while (my ($name, $info) = each %$res) {
3470 if (defined $info->{type}) {
3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3472
3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3474 cf::face::set_type $idx, $info->{type};
3475 } else {
3476 $RESOURCE{$name} = $info; # unused
3477 }
3478
3479 cf::cede_to_tick;
3480 }
3481 }
3482
3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3484
2749 1 3485 1
2750} 3486}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3511 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3518}
2756 3519
2757sub reload_facedata { 3520sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3521 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3522 or die "unable to load facedata\n";
2760} 3523}
2761 3524
2762sub reload_archetypes { 3525sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3526 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3527 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3528}
2771 3529
2772sub reload_treasures { 3530sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
2775} 3533}
2776 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
2777sub reload_resources { 3558sub reload_resources {
2778 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
2779 3560
3561 reload_exp_table;
3562 reload_materials;
3563 reload_facedata;
3564 reload_sound;
3565 reload_archetypes;
2780 reload_regions; 3566 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3567 reload_treasures;
2785 3568
2786 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
2787} 3570}
2788 3571
2789sub init { 3572sub reload_config {
2790 reload_resources; 3573 trace "reloading config file...\n";
2791}
2792 3574
2793sub cfg_load { 3575 0 < aio_load "$CONFDIR/config", my $config
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3576 or die "$CONFDIR/config: $!";
2795 or return;
2796 3577
2797 local $/; 3578 utf8::decode $config;
2798 *CFG = YAML::Syck::Load <$fh>; 3579 *CFG = yaml_load $config;
2799 3580
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2801 3582
2802 $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};
2803 $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};
2804 3585
2805 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
2809 }; 3590 };
2810 warn $@ if $@; 3591 warn $@ if $@;
2811 } 3592 }
2812} 3593}
2813 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
2814sub 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
2815 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
2817 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#
2818 (async { 3636 (async {
2819 Event::one_event; 3637 $Coro::current->{desc} = "IDLE BUG HANDLER";
3638 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3639 })->prio (Coro::PRIO_MAX);
2821 }; 3640 };
2822 3641
2823 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;
2824 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
2825 load_extensions; 3665 load_extensions;
2826 3666
2827 $TICK_WATCHER->start; 3667 utime time, time, $RUNTIMEFILE;
2828 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;
2829} 3685}
2830 3686
2831############################################################################# 3687#############################################################################
2832# initialisation and cleanup 3688# initialisation and cleanup
2833 3689
2834# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
2835BEGIN { 3691BEGIN {
3692 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
2844 },
2845 ); 3696 };
2846 } 3697 }
2847} 3698}
2848 3699
2849sub write_runtime { 3700sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime"; 3701 my $t0 = AE::time;
2851 3702
2852 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
2854 3705
2855 IO::AIO::aio_utime $runtime, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2856 3707
2857 my $guard = cf::lock_acquire "write_runtime"; 3708 my $guard = cf::lock_acquire "write_runtime";
2858 3709
2859 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3710 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2860 or return; 3711 or return;
2861 3712
2862 my $value = $cf::RUNTIME + 90 + 10; 3713 my $value = $cf::RUNTIME + 90 + 10;
2863 # 10 is the runtime save interval, for a monotonic clock 3714 # 10 is the runtime save interval, for a monotonic clock
2864 # 60 allows for the watchdog to kill the server. 3715 # 60 allows for the watchdog to kill the server.
2874 aio_utime $fh, undef, undef; 3725 aio_utime $fh, undef, undef;
2875 3726
2876 close $fh 3727 close $fh
2877 or return; 3728 or return;
2878 3729
2879 aio_rename "$runtime~", $runtime 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2880 and return; 3731 and return;
2881 3732
2882 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2883 3734
2884 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 };
2885} 3786}
2886 3787
2887sub emergency_save() { 3788sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
2889 3790
2890 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;
2891 3797
2892 cf::sync_job { 3798 cf::sync_job {
3799 cf::write_runtime_sync; # external watchdog should not bark
3800
2893 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
2894 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
2895 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3804 info "emergency_perl_save: begin player save\n";
2897 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3807 $pl->valid or next;
3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3809 $pl->save;
2901 } 3810 }
2902 warn "end emergency player save\n"; 3811 info "emergency_perl_save: end player save\n";
2903 3812
2904 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";
2905 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
2906 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
2907 $map->valid or next; 3818 $map->valid or next;
2908 $map->save; 3819 $map->save;
2909 } 3820 }
2910 warn "end emergency map save\n"; 3821 info "emergency_perl_save: end map save\n";
2911 3822
2912 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";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
2914 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
2915 }; 3851 };
2916 3852
2917 warn "leave emergency perl save\n"; 3853 info "emergency_perl_save: leave\n";
2918} 3854}
2919 3855
2920sub post_cleanup { 3856sub post_cleanup {
2921 my ($make_core) = @_; 3857 my ($make_core) = @_;
2922 3858
3859 IO::AIO::flush;
3860
2923 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
2924 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 }
2925} 3891}
2926 3892
2927sub do_reload_perl() { 3893sub do_reload_perl() {
2928 # can/must only be called in main 3894 # can/must only be called in main
2929 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
2930 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
2931 return; 3897 return;
2932 } 3898 }
2933 3899
2934 warn "reloading..."; 3900 return if $RELOAD++;
2935 3901
2936 warn "entering sync_job"; 3902 my $t1 = AE::time;
2937 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
2938 cf::sync_job { 3910 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark
2940 cf::emergency_save; 3911 #cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark
2942 3912
2943 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV;
2945
2946 # if anything goes wrong in here, we should simply crash as we already saved
2947
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests";
2954 for (;;) {
2955 BDB::flush;
2956 IO::AIO::flush;
2957 Coro::cede;
2958 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate...";
2960 }
2961
2962 ++$RELOAD;
2963
2964 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
2965 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
2966 %EXT_CORO = (); 3915 %EXT_CORO = ();
2967 3916
2968 warn "removing commands"; 3917 trace "perl_reload: removing commands";
2969 %COMMAND = (); 3918 %COMMAND = ();
2970 3919
2971 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
2972 %EXTCMD = (); 3921 %EXTCMD = ();
2973 %EXTICMD = (); 3922 %EXTICMD = ();
2974 3923
2975 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
2976 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
2977 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
2978 3927
2979 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
2980 eval { 3929 eval {
2981 $cb->($pkg); 3930 $cb->($pkg);
2982 1 3931 1
2983 } 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;
2984 } 3937 }
2985 3938
2986 warn "... nuking $pkg";
2987 Symbol::delete_package $pkg;
2988 }
2989
2990 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2991 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
2992 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2993 3942
2994 warn "... unloading $k"; 3943 trace "... unloading $k";
2995 delete $INC{$k}; 3944 delete $INC{$k};
2996 3945
2997 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
2998 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
2999 3948
3000 if (my $cb = $k->can ("unload_module")) { 3949 if (my $cb = $k->can ("unload_module")) {
3001 $cb->(); 3950 $cb->();
3951 }
3952
3953 clear_package $k;
3002 } 3954 }
3003 3955
3004 Symbol::delete_package $k;
3005 }
3006
3007 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3008 Symbol::delete_package "safe::$_" 3957 clear_package "safe::$_"
3009 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);
3010 3959
3011 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3012 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3013 delete $INC{"cf/pod.pm"}; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3014 3963
3015 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3016 # and global variables created in xs 3965 # and global variables created in xs
3017 #Symbol::delete_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3018 3967
3019 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3020 3969
3021 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3022 require cf; 3971 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3972 cf::_connect_to_perl_1;
3024 3973
3025 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3026 cf::cfg_load; 3975 cf::reload_config;
3027 3976
3028 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3029 cf::load_extensions; 3978 cf::load_extensions;
3030 3979
3980 if ($REATTACH_ON_RELOAD) {
3031 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3032 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3033 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3034 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3035 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3036 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3987 }
3037 3988
3038 warn "leaving sync_job"; 3989 cf::_post_init 1;
3039 3990
3991 trace "perl_reload: leaving sync_job";
3992
3040 1 3993 1
3041 } or do { 3994 } or do {
3042 warn $@; 3995 error $@;
3043 warn "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3044 exit 1; 3997 };
3998
3999 --$RELOAD;
3045 }; 4000 }
3046 4001
3047 warn "reloaded"; 4002 $t1 = AE::time - $t1;
4003 info "perl_reload: completed in ${t1}s\n";
3048}; 4004};
3049 4005
3050our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3051 4007
3052sub reload_perl() { 4008sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 4009 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3055 4011
3056 $RELOAD_WATCHER ||= Event->timer ( 4012 $RELOAD_WATCHER ||= cf::async {
3057 reentrant => 0, 4013 Coro::AIO::aio_wait cache_extensions;
3058 after => 0, 4014
3059 data => WF_AUTOCANCEL, 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3060 cb => sub {
3061 do_reload_perl; 4016 do_reload_perl;
3062 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3063 }, 4018 };
3064 ); 4019 };
3065} 4020}
3066 4021
3067register_command "reload" => sub { 4022register_command "reload" => sub {
3068 my ($who, $arg) = @_; 4023 my ($who, $arg) = @_;
3069 4024
3070 if ($who->flag (FLAG_WIZ)) { 4025 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 4026 $who->message ("reloading server.");
4027 async {
4028 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 4029 reload_perl;
4030 };
3073 } 4031 }
3074}; 4032};
3075 4033
3076unshift @INC, $LIBDIR; 4034#############################################################################
3077 4035
3078my $bug_warning = 0; 4036my $bug_warning = 0;
3079 4037
3080our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3082 4040
3083sub wait_for_tick { 4041sub wait_for_tick() {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3086 4043
3087 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 4046 $signal->wait;
3090} 4047}
3091 4048
3092sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3095 4051
3096 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 4054 $signal->wait;
3099} 4055}
3100 4056
3101 my $min = 1e6;#d# 4057sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 4058 if ($Coro::current != $Coro::main) {
3111 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"
3112 unless ++$bug_warning > 10; 4060 unless ++$bug_warning > 10;
3113 return; 4061 return;
3114 } 4062 }
3115 4063
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3119 4065
3120 0 && sync_job {#d# 4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3121 for(1..10) {
3122 my $t = Event::time;
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3124 or die;
3125 4067
3126 $map->width (50); 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3127 $map->height (50); 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3128 $map->alloc; 4070 Coro::async_pool {
3129 $map->_load_objects ("/tmp/x.map", 1); 4071 $Coro::current->{desc} = "runtime saver";
3130 my $t = Event::time - $t; 4072 write_runtime_sync
3131 4073 or error "ERROR: unable to write runtime file: $!";
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 4074 };
4075 }
3142 4076
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 4078 $sig->send;
3159 } 4079 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 4080 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 4081 $sig->send;
3162 } 4082 }
3163 4083
3164 $NOW = Event::time; 4084 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4085 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 4086
3175 _post_tick; 4087 if (0) {
3176 4088 if ($NEXT_TICK) {
3177 4089 my $jitter = $TICK_START - $NEXT_TICK;
4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4091 debug "jitter $JITTER\n";#d#
4092 }
3178 }, 4093 }
3179); 4094}
3180 4095
3181{ 4096{
3182 BDB::max_poll_time $TICK * 0.1; 4097 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 4098
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 4099 BDB::min_parallel 16;
3192 4100 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 4101 $AnyEvent::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 4102
3208 unless ($DB_ENV) { 4103 unless ($DB_ENV) {
3209 $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);
3210 4110
3211 cf::sync_job { 4111 cf::sync_job {
3212 eval { 4112 eval {
3213 BDB::db_env_open 4113 BDB::db_env_open
3214 $DB_ENV, 4114 $DB_ENV,
3216 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
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4117 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 4118 0666;
3219 4119
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4120 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 4121 };
3225 4122
3226 cf::cleanup "db_env_open(db): $@" if $@; 4123 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 4124 };
3228 } 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 };
3229} 4136}
3230 4137
3231{ 4138{
4139 # configure IO::AIO
4140
3232 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 4143 undef $AnyEvent::AIO::WATCHER;
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 4144}
3245 4145
3246my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
3247 4148
3248sub _log_backtrace { 4149sub _log_backtrace {
3249 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
3250 4151
3251 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
3252 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3253 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
3255 ++$_log_backtrace; 4160 ++$_log_backtrace;
4161 my $perl_bt = Carp::longmess $msg;
3256 async { 4162 async {
4163 $Coro::current->{desc} = "abt $msg";
4164
3257 my @bt = fork_call { 4165 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 4166 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4167 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 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 |"
3261 or die "addr2line: $!"; 4169 or die "addr2line: $!";
3269 } 4177 }
3270 4178
3271 @funcs 4179 @funcs
3272 }; 4180 };
3273 4181
3274 LOG llevInfo, "[ABT] $msg\n"; 4182 LOG llevInfo, "[ABT] $perl_bt\n";
4183 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3275 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
3276 --$_log_backtrace; 4185 --$_log_backtrace;
3277 }; 4186 };
3278 } else { 4187 } else {
3279 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
3280 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3281 } 4190 }
3282} 4191}
3283 4192
3284# load additional modules 4193# load additional modules
3285use cf::pod; 4194require "cf/$_.pm" for @EXTRA_MODULES;
4195cf::_connect_to_perl_2;
3286 4196
3287END { cf::emergency_save } 4197END { cf::emergency_save }
3288 4198
32891 41991
3290 4200

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines