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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines