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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.588 by root, Thu Nov 1 13:02:52 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines