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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines