ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines