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.288 by root, Mon Jun 25 07:40:53 2007 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines