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.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
36 40
37use Coro (); 41use Coro ();
38use Coro::State; 42use Coro::State;
39use Coro::Handle; 43use Coro::Handle;
40use Coro::EV; 44use Coro::EV;
41use Coro::AnyEvent; 45use Coro::AnyEvent;
42use Coro::Timer; 46use Coro::Timer;
43use Coro::Signal; 47use Coro::Signal;
44use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
45use Coro::AnyEvent; 50use Coro::AnyEvent;
46use Coro::AIO; 51use Coro::AIO;
47use Coro::BDB 1.6; 52use Coro::BDB 1.6;
48use Coro::Storable; 53use Coro::Storable;
49use Coro::Util (); 54use Coro::Util ();
50 55
56use Guard ();
51use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
52use BDB (); 58use BDB ();
53use Data::Dumper; 59use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 60use Fcntl;
56use YAML (); 61use YAML::XS ();
57use IO::AIO (); 62use IO::AIO ();
58use Time::HiRes; 63use Time::HiRes;
59use Compress::LZF; 64use Compress::LZF;
60use Digest::MD5 (); 65use Digest::MD5 ();
61 66
63 68
64# configure various modules to our taste 69# configure various modules to our taste
65# 70#
66$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 79
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 82
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
73 86
74our %COMMAND = (); 87our %COMMAND = ();
75our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
76 89
77our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 91our %EXTCMD = ();
79our %EXTICMD = (); 92our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
82 95
83our $RELOAD; # number of reloads so far 96our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
85 100
86our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
87our $DATADIR = datadir; 103our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
91our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE; 114our $PIDFILE = "$LOCALDIR/pid";
115our $RUNTIMEFILE = "$LOCALDIR/runtime";
116
117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
98 124
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 127our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
103 129
104our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 133our $DB_ENV;
108 134
135our @EXTRA_MODULES = qw(pod match mapscript incloader);
136
109our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
110 139
111our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
113our $NOW; 143our $NOW;
114 144
115our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
116our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
117our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 152our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 153our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 154our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
126 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;
164
127binmode STDOUT; 165binmode STDOUT;
128binmode STDERR; 166binmode STDERR;
129 167
130# read virtual server time, if available 168# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 169unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 170 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
135} 173}
174
175eval "sub TICK() { $TICK } 1" or die;
136 176
137mkdir $_ 177mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 179
140our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
141 181
142sub cf::map::normalise; 182sub cf::map::normalise;
143 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
144############################################################################# 188#############################################################################
145 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
146=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
147 202
148=over 4 203=over 4
149 204
150=item $cf::UPTIME 205=item $cf::UPTIME
151 206
152The 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.
153 223
154=item $cf::RUNTIME 224=item $cf::RUNTIME
155 225
156The 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
157every server tick. 227every server tick.
158 228
159=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
160$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
161$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
162 232
163Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
164directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
165unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
166database environment. 236database environment.
167 237
168=item $cf::NOW
169
170The time of the last (current) server tick.
171
172=item $cf::TICK
173
174The interval between server ticks, in seconds.
175
176=item $cf::LOADAVG 238=item $cf::LOADAVG
177 239
178The 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
179(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
180objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
189from wherever your confdir points to. 251from wherever your confdir points to.
190 252
191=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
192 254
193These 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
194returns 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
195per 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.
196 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
197=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
198 277
199This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 280that call.
202 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
203=back 288=back
204 289
205=cut 290=cut
206 291
207BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
208 *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 {
209 my $msg = join "", @_; 299 my $msg = join "", @_;
210 300
211 $msg .= "\n" 301 $msg .= "\n"
212 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
213 303
214 $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;
215 305
216 LOG llevError, $msg; 306 LOG llevWarn, $msg;
217 }; 307};
218}
219 308
220$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
222 311
223 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 316 return;#d#
226 }#d# 317 }#d#
227 318
228 # kill coroutine otherwise 319 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 320 Coro::terminate
231}; 321};
232
233$SIG{__DIE__} = sub { }; #d#?
234 322
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 340)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 342}
255 343
256$EV::DIED = sub { 344$EV::DIED = sub {
257 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
258}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
259 352
260############################################################################# 353#############################################################################
261 354
262=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
263 356
284 $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;
285 $d 378 $d
286 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
287} 380}
288 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
289=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
290 435
291Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
292 437
293=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
299our $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
300 445
301sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 511=item cf::lock_wait $string
305 512
306Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
307 514
308=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
309 516
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
313returned. 520returned.
314 521
315Locks 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
316deadlocked coro. 523deadlocked coro.
322 529
323Return 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.
324 531
325=cut 532=cut
326 533
327our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 535
330sub lock_wait($) { 536sub lock_wait($) {
331 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 538}
344 539
345sub lock_acquire($) { 540sub lock_acquire($) {
346 my ($key) = @_; 541 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 542}
360 543
361sub lock_active($) { 544sub lock_active($) {
362 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 546}
366 547
367sub freeze_mainloop { 548sub freeze_mainloop {
368 tick_inhibit_inc; 549 tick_inhibit_inc;
369 550
370 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
371} 552}
372 553
373=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
374 555
375Like 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
376get spread over timer. 557get spread over time.
377 558
378=cut 559=cut
379 560
380sub periodic($$) { 561sub periodic($$) {
381 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
386} 567}
387 568
388=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
389 570
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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.
393 578
394The 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
395used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
396 581
397Useful for short background jobs. 582Useful for short background jobs.
398 583
399=cut 584=cut
400 585
401our @SLOT_QUEUE; 586our @SLOT_QUEUE;
402our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
403 589
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
407 593
408 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
409 596
410 while () { 597 while () {
411 next_job: 598 next_job:
599
412 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 601
414 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 606 $job->[2]->send;
418 Coro::cede; 607 Coro::cede;
419 goto next_job; 608 goto next_job;
420 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 611 }
422 } 612 }
423 613
424 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 617 } else {
618 $busy = 0;
429 Coro::schedule; 619 Coro::schedule;
430 } 620 }
431 } 621 }
432}; 622};
433 623
434sub get_slot($;$$) { 624sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
436 626
437 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
438 628
439 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
440 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
441 632
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
470=cut 661=cut
471 662
472sub sync_job(&) { 663sub sync_job(&) {
473 my ($job) = @_; 664 my ($job) = @_;
474 665
475 if ($Coro::current == $Coro::main) { 666 if (in_main) {
476 my $time = EV::time; 667 my $time = AE::time;
477 668
478 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
480 671
481 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
482 673
483 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
484 675
485 my $busy = 1; 676 my $busy = 1;
486 my @res; 677 my @res;
487 678
488 (async { 679 (async {
489 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 681 @res = eval { $job->() };
491 warn $@ if $@; 682 error $@ if $@;
492 undef $busy; 683 undef $busy;
493 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
494 685
495 while ($busy) { 686 while ($busy) {
496 if (Coro::nready) { 687 if (Coro::nready) {
498 } else { 689 } else {
499 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
500 } 691 }
501 } 692 }
502 693
503 my $time = EV::time - $time; 694 my $time = AE::time - $time;
504 695
505 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
506 697
507 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
508 } else { 699 } else {
530 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
531 722
532 $coro 723 $coro
533} 724}
534 725
535=item fork_call { }, $args 726=item fork_call { }, @args
536 727
537Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 731never block itself or use any form of event handling.
541 732
542=cut 733=cut
543 734
735sub post_fork {
736 reset_signals;
737}
738
544sub fork_call(&@) { 739sub fork_call(&@) {
545 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
546 741
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
550 745
551 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
552 reset_signals; 747 cf::post_fork;
553 &$cb 748 &$cb
554 }, @args; 749 } @args;
555 750
556 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 )
557} 763}
558 764
559=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
560 766
561=cut 767=cut
598within each server. 804within each server.
599 805
600=cut 806=cut
601 807
602sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
603 my ($name) = @_; 812 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
605 814
606 eval { 815 eval {
607 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
617} 826}
618 827
619our $DB; 828our $DB;
620 829
621sub db_init { 830sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
624 };
625} 832}
626 833
627sub db_get($$) { 834sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
629 836
630 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
631 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
632 841
633 $! ? () 842 $! ? ()
634 : $data 843 : $data
635 }
636} 844}
637 845
638sub db_put($$$) { 846sub db_put($$$) {
639 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 876
669 my @data; 877 my @data;
670 my $md5; 878 my $md5;
671 879
672 for (0 .. $#$src) { 880 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 882 }
676 883
677 # if processing is expensive, check 884 # if processing is expensive, check
678 # checksum first 885 # checksum first
679 if (1) { 886 if (1) {
696 903
697 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 905 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
700 907
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 909
703 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
706 913
716 923
717=cut 924=cut
718 925
719sub datalog($@) { 926sub datalog($@) {
720 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 929}
723 930
724=back 931=back
725 932
726=cut 933=cut
727 934
728############################################################################# 935#############################################################################
729 936
730=head2 ATTACHABLE OBJECTS 937=head2 ATTACHABLE OBJECTS
731 938
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 940attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 941to it. All such attachable objects support the following methods.
735 942
736In 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>
737C<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
787=item cf::CLASS::attachment $name, ... 994=item cf::CLASS::attachment $name, ...
788 995
789Register an attachment by C<$name> through which attachable objects of the 996Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 997given CLASS can refer to this attachment.
791 998
792Some classes such as crossfire maps and objects can specify attachments 999Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 1001
795These calls expect any number of the following handler/hook descriptions: 1002These calls expect any number of the following handler/hook descriptions:
796 1003
797=over 4 1004=over 4
921 1128
922 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1131
925 } elsif (ref $type) { 1132 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
927 1134
928 } else { 1135 } else {
929 shift @arg; 1136 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
931 } 1138 }
932 } 1139 }
933} 1140}
934 1141
935sub _object_attach { 1142sub _object_attach {
945 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
946 } 1153 }
947 1154
948 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
949 } else { 1156 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1158 }
952 1159
953 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
954} 1161}
955 1162
1014 1221
1015 for (@$callbacks) { 1222 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1017 1224
1018 if ($@) { 1225 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1227 override;
1022 } 1228 }
1023 1229
1024 return 1 if $override; 1230 return 1 if $override;
1025 } 1231 }
1104 for (@$attach) { 1310 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1107 } 1313 }
1108 } else { 1314 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1316 }
1111 } 1317 }
1112} 1318}
1113 1319
1114cf::attachable->attach ( 1320cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1142 1348
1143 sync_job { 1349 sync_job {
1144 if (length $$rdata) { 1350 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1148 1355
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1363 aio_close $fh;
1154 1364
1155 if (@$objs) { 1365 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1374 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1376 }
1164 } else { 1377 } else {
1165 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1166 } 1379 }
1167 1380
1168 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1382
1383 $filename =~ s%/[^/]+$%%;
1384 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1385 } else {
1170 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1171 } 1387 }
1172 } else { 1388 } else {
1173 aio_unlink $filename; 1389 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1175 } 1391 }
1199 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1416 $av = $st->{objs};
1201 } 1417 }
1202 1418
1203 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1206 1423
1207 ($data, $av) 1424 ($data, $av)
1208} 1425}
1209 1426
1210=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1214=cut 1431=cut
1215 1432
1216############################################################################# 1433#############################################################################
1217# command handling &c 1434# command handling &c
1218 1435
1219=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1220 1437
1221Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1222$name. 1439$name.
1223 1440
1224=cut 1441=cut
1230 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1231 1448
1232 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1233} 1450}
1234 1451
1235=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1236 1453
1237Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1238extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1239received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1240the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1241has logged in successfully. 1458has logged in successfully.
1242 1459
1243If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1244called. 1461called.
1245 1462
1246=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1247 1464
1248Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1249exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1250are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1251is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
1266 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1267 1484
1268 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1269} 1486}
1270 1487
1488use File::Glob ();
1489
1271cf::player->attach ( 1490cf::player->attach (
1272 on_command => sub { 1491 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1274 1493
1275 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1276 or return; 1495 or return;
1277 1496
1285 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1286 1505
1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1288 1507
1289 if (ref $msg) { 1508 if (ref $msg) {
1290 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1291 "ARRAY" eq ref $msg
1292 ? @$msg
1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1294 1510
1295 my @reply; 1511 my @reply;
1296 1512
1297 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1298 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1299 } 1515 }
1300 1516
1301 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1302 if $reply; 1518 if $reply;
1303 1519
1304 } else { 1520 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1522 }
1307 1523
1308 cf::override; 1524 cf::override;
1309 }, 1525 },
1310); 1526);
1311 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
1312sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1313 cf::sync_job { 1557 cf::sync_job {
1314 my %todo; 1558 my %todo;
1315 1559
1316 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1561 next unless -r $path;
1335 1579
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1582
1339 $ext{source} = 1583 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1342 . $source 1586 . $source
1343 . "\n};\n1"; 1587 . "\n};\n1";
1344 1588
1345 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1346 } 1590 }
1347 1591
1592 my $pass = 0;
1348 my %done; 1593 my %done;
1349 while (%todo) { 1594 while (%todo) {
1350 my $progress; 1595 my $progress;
1351 1596
1597 ++$pass;
1598
1599 ext:
1352 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1602 next ext
1355 unless exists $done{$_}; 1603 unless exists $done{$_};
1356 } 1604 }
1357 1605
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1607
1360 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 $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1621
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1623 if exists $v->{meta}{mandatory};
1368 1624
1369 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1370 } 1634 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1635 }
1376 1636
1377 skip: 1637 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1647 }
1381 }; 1648 };
1382} 1649}
1383 1650
1384############################################################################# 1651#############################################################################
1385 1652
1386=back 1653=back
1387 1654
1388=head2 CORE EXTENSIONS 1655=head2 CORE EXTENSIONS
1389 1656
1390Functions and methods that extend core crossfire objects. 1657Functions and methods that extend core deliantra objects.
1391 1658
1392=cut 1659=cut
1393 1660
1394package cf::player; 1661package cf::player;
1395 1662
1438 1705
1439sub exists($) { 1706sub exists($) {
1440 my ($login) = @_; 1707 my ($login) = @_;
1441 1708
1442 $cf::PLAYER{$login} 1709 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1710 or !aio_stat path $login
1444} 1711}
1445 1712
1446sub find($) { 1713sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1714 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1715 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1469 } 1736 }
1470 } 1737 }
1471} 1738}
1472 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
1473sub save($) { 1753sub save($) {
1474 my ($pl) = @_; 1754 my ($pl) = @_;
1475 1755
1476 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1477 1757
1482 1762
1483 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1485 1765
1486 cf::get_slot 0.01; 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];
1487 1770
1488 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1772 cf::cede_to_tick;
1490} 1773}
1491 1774
1523 my ($pl) = @_; 1806 my ($pl) = @_;
1524 1807
1525 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1526 1809
1527 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1528 $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
1529 1812
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1531 $pl->deactivate; 1814 $pl->deactivate;
1815
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1535 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1536 1821
1537 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1593 \@logins 1878 \@logins
1594} 1879}
1595 1880
1596=item $player->maps 1881=item $player->maps
1597 1882
1883=item cf::player::maps $login
1884
1598Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1599player. May block. 1886player. May block.
1600 1887
1601=cut 1888=cut
1602 1889
1619 } 1906 }
1620 1907
1621 \@paths 1908 \@paths
1622} 1909}
1623 1910
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1912
1626Expand crossfire pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718
1719=item $player->ext_reply ($msgid, @msg)
1720
1721Sends an ext reply to the player.
1722
1723=cut
1724
1725sub ext_reply($$@) {
1726 my ($self, $id, @msg) = @_;
1727
1728 $self->ns->ext_reply ($id, @msg)
1729}
1730 1914
1731=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1732 1916
1733Sends an ext event to the client. 1917Sends an ext event to the client.
1734 1918
1754 1938
1755=cut 1939=cut
1756 1940
1757sub find_by_path($) { 1941sub find_by_path($) {
1758 my ($path) = @_; 1942 my ($path) = @_;
1943
1944 $path =~ s/^~[^\/]*//; # skip ~login
1759 1945
1760 my ($match, $specificity); 1946 my ($match, $specificity);
1761 1947
1762 for my $region (list) { 1948 for my $region (list) {
1763 if ($region->{match} && $path =~ $region->{match}) { 1949 if ($region->{match} && $path =~ $region->{match}) {
1792sub generate_random_map { 1978sub generate_random_map {
1793 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1794 1980
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796 1982
1797 # mit "rum" bekleckern, nicht
1798 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1802 $rmp->{exit_on_final_map},
1803 $rmp->{xsize}, $rmp->{ysize},
1804 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1805 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1806 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1807 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1808 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1809 (cf::region::find $rmp->{region}), $rmp->{custom}
1810 )
1811} 1984}
1812 1985
1813=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1814 1987
1815Register a handler for the map path matching the given regex at the 1988Register a handler for the map path matching the given regex at the
1820 1993
1821sub register { 1994sub register {
1822 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1823 my $pkg = caller; 1996 my $pkg = caller;
1824 1997
1825 no strict;
1826 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1827 1999
1828 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1829} 2001}
1830 2002
1831# also paths starting with '/' 2003# also paths starting with '/'
1832$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2004$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1833 2005
1834sub thawer_merge { 2006sub thawer_merge {
1835 my ($self, $merge) = @_; 2007 my ($self, $merge) = @_;
1836 2008
1837 # we have to keep some variables in memory intact 2009 # we have to keep some variables in memory intact
1842} 2014}
1843 2015
1844sub normalise { 2016sub normalise {
1845 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1846 2018
1847 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1848 2020
1849 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1850 2022
1851 # map plan: 2023 # map plan:
1852 # 2024 #
1867 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1868 $path = "$base/$path"; 2040 $path = "$base/$path";
1869 } 2041 }
1870 2042
1871 for ($path) { 2043 for ($path) {
1872 redo if s{//}{/};
1873 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1874 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1875 } 2046 }
1876 2047
1877 $path 2048 $path
1891 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1892 return $self; 2063 return $self;
1893 } 2064 }
1894 } 2065 }
1895 2066
1896 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1897 () 2068 ()
1898} 2069}
1899 2070
2071# may re-bless or do other evil things
1900sub init { 2072sub init {
1901 my ($self) = @_; 2073 my ($self) = @_;
1902 2074
1903 $self 2075 $self
1904} 2076}
1935 2107
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 2109 "$UNIQUEDIR/$path"
1938} 2110}
1939 2111
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 2112sub decay_objects {
1950 my ($self) = @_; 2113 my ($self) = @_;
1951 2114
1952 return if $self->{deny_reset}; 2115 return if $self->{deny_reset};
1953 2116
1978 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1979 2142
1980 1 2143 1
1981} 2144}
1982 2145
2146# used to laod the header of an original map
1983sub load_header_orig { 2147sub load_header_orig {
1984 my ($self) = @_; 2148 my ($self) = @_;
1985 2149
1986 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1987} 2151}
1988 2152
2153# used to laod the header of an instantiated map
1989sub load_header_temp { 2154sub load_header_temp {
1990 my ($self) = @_; 2155 my ($self) = @_;
1991 2156
1992 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1993} 2158}
1994 2159
2160# called after loading the header from an instantiated map
1995sub prepare_temp { 2161sub prepare_temp {
1996 my ($self) = @_; 2162 my ($self) = @_;
1997 2163
1998 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
1999 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
2000 # safety 2166 # safety
2001 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
2002 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
2003} 2169}
2004 2170
2171# called after loading the header from an original map
2005sub prepare_orig { 2172sub prepare_orig {
2006 my ($self) = @_; 2173 my ($self) = @_;
2007 2174
2008 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
2009 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
2033 2200
2034sub find; 2201sub find;
2035sub find { 2202sub find {
2036 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
2037 2204
2205 cf::cede_to_tick;
2206
2038 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
2039 2208
2040 cf::lock_wait "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2211
2043 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 2213 my $map = new_from_path cf::map $path
2048 or return; 2214 or return;
2049 2215
2050 $map->{last_save} = $cf::RUNTIME; 2216 $map->{last_save} = $cf::RUNTIME;
2051 2217
2063 2229
2064 $cf::MAP{$path} = $map 2230 $cf::MAP{$path} = $map
2065 } 2231 }
2066} 2232}
2067 2233
2068sub pre_load { } 2234sub pre_load { }
2069sub post_load { } 2235#sub post_load { } # XS
2070 2236
2071sub load { 2237sub load {
2072 my ($self) = @_; 2238 my ($self) = @_;
2073 2239
2074 local $self->{deny_reset} = 1; # loading can take a long time 2240 local $self->{deny_reset} = 1; # loading can take a long time
2077 2243
2078 { 2244 {
2079 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2080 2246
2081 return unless $self->valid; 2247 return unless $self->valid;
2082 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2083
2084 $self->in_memory (cf::MAP_LOADING);
2085 2249
2086 $self->alloc; 2250 $self->alloc;
2087 2251
2088 $self->pre_load; 2252 $self->pre_load;
2089 cf::cede_to_tick; 2253 cf::cede_to_tick;
2090 2254
2255 if (exists $self->{load_path}) {
2091 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block; 2257 $f->skip_block;
2093 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2094 or return; 2259 or return;
2095 2260
2096 $self->post_load_original 2261 $self->post_load_original
2097 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2098 2263
2099 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2100 utf8::encode $uniq; 2265 utf8::encode $uniq;
2101 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2103 $self->clear_unique_items; 2268 $self->clear_unique_items;
2104 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2106 } 2272 }
2107 } 2273 }
2108 }
2109 2274
2110 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2111 2282
2112 cf::cede_to_tick; 2283 cf::cede_to_tick;
2113 # now do the right thing for maps 2284 # now do the right thing for maps
2114 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2115 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
2119 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2291 $self->decay_objects;
2121 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2122 $self->update_buttons; 2293 $self->update_buttons;
2123 cf::cede_to_tick; 2294 cf::cede_to_tick;
2124 $self->set_darkness_map; 2295 #$self->activate; # no longer activate maps automatically
2125 cf::cede_to_tick;
2126 $self->activate;
2127 } 2296 }
2128 2297
2129 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2131
2132 $self->in_memory (cf::MAP_ACTIVE);
2133 } 2300 }
2134 2301
2135 $self->post_load; 2302 $self->post_load;
2136}
2137 2303
2304 1
2305}
2306
2307# customize the map for a given player, i.e.
2308# return the _real_ map. used by e.g. per-player
2309# maps to change the path to ~playername/mappath
2138sub customise_for { 2310sub customise_for {
2139 my ($self, $ob) = @_; 2311 my ($self, $ob) = @_;
2140 2312
2141 return find "~" . $ob->name . "/" . $self->{path} 2313 return find "~" . $ob->name . "/" . $self->{path}
2142 if $self->per_player; 2314 if $self->per_player;
2145# if $self->per_party; 2317# if $self->per_party;
2146 2318
2147 $self 2319 $self
2148} 2320}
2149 2321
2150# find and load all maps in the 3x3 area around a map
2151sub load_neighbours {
2152 my ($map) = @_;
2153
2154 my @neigh; # diagonal neighbours
2155
2156 for (0 .. 3) {
2157 my $neigh = $map->tile_path ($_)
2158 or next;
2159 $neigh = find $neigh, $map
2160 or next;
2161 $neigh->load;
2162
2163 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 }
2167
2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
2170 my $neigh = find $path, $origin
2171 or next;
2172 $neigh->load;
2173 }
2174}
2175
2176sub find_sync { 2322sub find_sync {
2177 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2178 2324
2179 cf::sync_job { find $path, $origin } 2325 # it's a bug to call this from the main context
2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2327 if $Coro::current == $Coro::main;
2328
2329 find $path, $origin
2180} 2330}
2181 2331
2182sub do_load_sync { 2332sub do_load_sync {
2183 my ($map) = @_; 2333 my ($map) = @_;
2184 2334
2335 # it's a bug to call this from the main context
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2187 2338
2188 cf::sync_job { $map->load }; 2339 $map->load;
2189} 2340}
2190 2341
2191our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2193 2344
2194sub find_async { 2345sub find_async {
2195 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2196 2347
2197 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2198 2349
2199 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2201 } 2352 }
2202 2353
2203 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2204 2355
2205 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
2219 $MAP_PREFETCHER->prio (6); 2370 $MAP_PREFETCHER->prio (6);
2220 2371
2221 () 2372 ()
2222} 2373}
2223 2374
2375# common code, used by both ->save and ->swapout
2224sub save { 2376sub _save {
2225 my ($self) = @_; 2377 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2378
2229 $self->{last_save} = $cf::RUNTIME; 2379 $self->{last_save} = $cf::RUNTIME;
2230 2380
2231 return unless $self->dirty; 2381 return unless $self->dirty;
2232 2382
2252 } else { 2402 } else {
2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2403 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2254 } 2404 }
2255} 2405}
2256 2406
2407sub save {
2408 my ($self) = @_;
2409
2410 my $lock = cf::lock_acquire "map_data:$self->{path}";
2411
2412 $self->_save;
2413}
2414
2257sub swap_out { 2415sub swap_out {
2258 my ($self) = @_; 2416 my ($self) = @_;
2259 2417
2260 # save first because save cedes
2261 $self->save;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2419
2420 return if !$self->linkable;
2421 return if $self->{deny_save};
2265 return if $self->players; 2422 return if $self->players;
2266 return if $self->in_memory != cf::MAP_ACTIVE; 2423
2424 # first deactivate the map and "unlink" it from the core
2425 $self->deactivate;
2426 $_->clear_links_to ($self) for values %cf::MAP;
2427 $self->state (cf::MAP_SWAPPED);
2428
2429 # then atomically save
2430 $self->_save;
2431
2432 # then free the map
2433 $self->clear;
2434}
2435
2436sub reset_at {
2437 my ($self) = @_;
2438
2439 # TODO: safety, remove and allow resettable per-player maps
2267 return if $self->{deny_save}; 2440 return 1e99 if $self->{deny_reset};
2268 2441
2442 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2443 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2444
2445 $time + $to
2446}
2447
2448sub should_reset {
2449 my ($self) = @_;
2450
2451 $self->reset_at <= $cf::RUNTIME
2452}
2453
2454sub reset {
2455 my ($self) = @_;
2456
2457 my $lock = cf::lock_acquire "map_data:$self->{path}";
2458
2459 return if $self->players;
2460
2461 cf::trace "resetting map ", $self->path, "\n";
2462
2269 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2464
2465 # need to save uniques path
2466 unless ($self->{deny_save}) {
2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2468
2469 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2470 if $uniq;
2471 }
2472
2473 delete $cf::MAP{$self->path};
2270 2474
2271 $self->deactivate; 2475 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP; 2476 $_->clear_links_to ($self) for values %cf::MAP;
2273 $self->clear; 2477 $self->clear;
2274}
2275
2276sub reset_at {
2277 my ($self) = @_;
2278
2279 # TODO: safety, remove and allow resettable per-player maps
2280 return 1e99 if $self->{deny_reset};
2281
2282 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2283 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2284
2285 $time + $to
2286}
2287
2288sub should_reset {
2289 my ($self) = @_;
2290
2291 $self->reset_at <= $cf::RUNTIME
2292}
2293
2294sub reset {
2295 my ($self) = @_;
2296
2297 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298
2299 return if $self->players;
2300
2301 warn "resetting map ", $self->path;
2302
2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # need to save uniques path
2306 unless ($self->{deny_save}) {
2307 my $uniq = $self->uniq_path; utf8::encode $uniq;
2308
2309 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2310 if $uniq;
2311 }
2312
2313 delete $cf::MAP{$self->path};
2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2317 $self->clear;
2318 2478
2319 $self->unlink_save; 2479 $self->unlink_save;
2320 $self->destroy; 2480 $self->destroy;
2321} 2481}
2322 2482
2330 2490
2331 delete $cf::MAP{$self->path}; 2491 delete $cf::MAP{$self->path};
2332 2492
2333 $self->unlink_save; 2493 $self->unlink_save;
2334 2494
2335 bless $self, "cf::map"; 2495 bless $self, "cf::map::wrap";
2336 delete $self->{deny_reset}; 2496 delete $self->{deny_reset};
2337 $self->{deny_save} = 1; 2497 $self->{deny_save} = 1;
2338 $self->reset_timeout (1); 2498 $self->reset_timeout (1);
2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2499 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2340 2500
2397 : normalise $_ 2557 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2558 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2559 ]
2400} 2560}
2401 2561
2562=item cf::map::static_maps
2563
2564Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2565file in the shared directory excluding F</styles> and F</editor>). May
2566block.
2567
2568=cut
2569
2570sub static_maps() {
2571 my @dirs = "";
2572 my @maps;
2573
2574 while (@dirs) {
2575 my $dir = shift @dirs;
2576
2577 next if $dir eq "/styles" || $dir eq "/editor";
2578
2579 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2580 or return;
2581
2582 for (@$files) {
2583 s/\.map$// or next;
2584 utf8::decode $_;
2585 push @maps, "$dir/$_";
2586 }
2587
2588 push @dirs, map "$dir/$_", @$dirs;
2589 }
2590
2591 \@maps
2592}
2593
2402=back 2594=back
2403 2595
2404=head3 cf::object 2596=head3 cf::object
2405 2597
2406=cut 2598=cut
2471 2663
2472our $SAY_CHANNEL = { 2664our $SAY_CHANNEL = {
2473 id => "say", 2665 id => "say",
2474 title => "Map", 2666 title => "Map",
2475 reply => "say ", 2667 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2668 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2669};
2478 2670
2479our $CHAT_CHANNEL = { 2671our $CHAT_CHANNEL = {
2480 id => "chat", 2672 id => "chat",
2481 title => "Chat", 2673 title => "Chat",
2536 2728
2537=item $player_object->enter_link 2729=item $player_object->enter_link
2538 2730
2539Freezes the player and moves him/her to a special map (C<{link}>). 2731Freezes the player and moves him/her to a special map (C<{link}>).
2540 2732
2541The player should be reasonably safe there for short amounts of time. You 2733The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2734for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2735though, as the player cannot control the character while it is on the link
2736map.
2543 2737
2544Will never block. 2738Will never block.
2545 2739
2546=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
2547 2741
2567sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2568 my ($self) = @_; 2762 my ($self) = @_;
2569 2763
2570 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2571 2765
2766 ++$self->{_link_recursion};
2767
2572 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2573 2769
2574 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2575 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2576 2772
2577 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2773 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2578} 2774}
2579 2775
2580sub cf::object::player::leave_link { 2776sub cf::object::player::leave_link {
2581 my ($self, $map, $x, $y) = @_; 2777 my ($self, $map, $x, $y) = @_;
2582 2778
2599 ($x, $y) = (-1, -1) 2795 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2796 unless (defined $x) && (defined $y);
2601 2797
2602 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2605 2801
2606 $map->load; 2802 $map->load;
2607 $map->load_neighbours;
2608 2803
2609 return unless $self->contr->active; 2804 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2805
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2614} 2808 # entering was successful
2809 delete $self->{_link_recursion};
2810 # only activate afterwards, to support waiting in hooks
2811 $self->activate_recursive;
2812 }
2615 2813
2814}
2815
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2816=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2617 2817
2618Moves the player to the given map-path and coordinates by first freezing 2818Moves the player to the given map-path and coordinates by first freezing
2619her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2620that has to return the map if sucecssful, and then unfreezes the player on 2820that has to return the map if sucecssful, and then unfreezes the player on
2621the new (success) or old (failed) map position. In either case, $done will 2821the new (success) or old (failed) map position. In either case, $done will
2628 2828
2629our $GOTOGEN; 2829our $GOTOGEN;
2630 2830
2631sub cf::object::player::goto { 2831sub cf::object::player::goto {
2632 my ($self, $path, $x, $y, $check, $done) = @_; 2832 my ($self, $path, $x, $y, $check, $done) = @_;
2833
2834 if ($self->{_link_recursion} >= $MAX_LINKS) {
2835 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2836 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2837 ($path, $x, $y) = @$EMERGENCY_POSITION;
2838 }
2633 2839
2634 # do generation counting so two concurrent goto's will be executed in-order 2840 # do generation counting so two concurrent goto's will be executed in-order
2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2636 2842
2637 $self->enter_link; 2843 $self->enter_link;
2657 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2658 } 2864 }
2659 } 2865 }
2660 2866
2661 my $map = eval { 2867 my $map = eval {
2662 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2663 2869
2664 if ($map) { 2870 if ($map) {
2665 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2666 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2667 } else { 2873 } else {
2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2874 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2669 } 2875 }
2670 2876
2671 $map 2877 $map
2679 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2680 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2681 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2682 } 2888 }
2683 2889
2684 $done->() if $done; 2890 $done->($self) if $done;
2685 })->prio (1); 2891 })->prio (1);
2686} 2892}
2687 2893
2688=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2689 2895
2757 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2758 2964
2759 unless (eval { 2965 unless (eval {
2760 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2761 2967
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2771 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2773 2994
2774 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2775 2996
2776 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2999 if $exit->flag (cf::FLAG_DAMNED);
2779 3000
2780 1 3001 1
2781 }) { 3002 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 3004 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2786 3007
2787 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2788 $self->leave_link; 3009 $self->leave_link;
2789 } 3010 }
2790 })->prio (1); 3011 })->prio (1);
2791} 3012}
2792 3013
2804sub cf::client::send_drawinfo { 3025sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 3026 my ($self, $text, $flags) = @_;
2806 3027
2807 utf8::encode $text; 3028 utf8::encode $text;
2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3029 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3030}
3031
3032=item $client->send_big_packet ($pkt)
3033
3034Like C<send_packet>, but tries to compress large packets, and fragments
3035them as required.
3036
3037=cut
3038
3039our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3040
3041sub cf::client::send_big_packet {
3042 my ($self, $pkt) = @_;
3043
3044 # try lzf for large packets
3045 $pkt = "lzf " . Compress::LZF::compress $pkt
3046 if 1024 <= length $pkt and $self->{can_lzf};
3047
3048 # split very large packets
3049 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3050 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3051 $pkt = "frag";
3052 }
3053
3054 $self->send_packet ($pkt);
2809} 3055}
2810 3056
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 3057=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 3058
2813Send a drawinfo or msg packet to the client, formatting the msg for the 3059Send a drawinfo or msg packet to the client, formatting the msg for the
2817 3063
2818=cut 3064=cut
2819 3065
2820# non-persistent channels (usually the info channel) 3066# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 3067our %CHANNEL = (
3068 "c/motd" => {
3069 id => "infobox",
3070 title => "MOTD",
3071 reply => undef,
3072 tooltip => "The message of the day",
3073 },
2822 "c/identify" => { 3074 "c/identify" => {
2823 id => "infobox", 3075 id => "infobox",
2824 title => "Identify", 3076 title => "Identify",
2825 reply => undef, 3077 reply => undef,
2826 tooltip => "Items recently identified", 3078 tooltip => "Items recently identified",
2828 "c/examine" => { 3080 "c/examine" => {
2829 id => "infobox", 3081 id => "infobox",
2830 title => "Examine", 3082 title => "Examine",
2831 reply => undef, 3083 reply => undef,
2832 tooltip => "Signs and other items you examined", 3084 tooltip => "Signs and other items you examined",
3085 },
3086 "c/shopinfo" => {
3087 id => "infobox",
3088 title => "Shop Info",
3089 reply => undef,
3090 tooltip => "What your bargaining skill tells you about the shop",
2833 }, 3091 },
2834 "c/book" => { 3092 "c/book" => {
2835 id => "infobox", 3093 id => "infobox",
2836 title => "Book", 3094 title => "Book",
2837 reply => undef, 3095 reply => undef,
2853 id => "infobox", 3111 id => "infobox",
2854 title => "Body Parts", 3112 title => "Body Parts",
2855 reply => undef, 3113 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 3114 tooltip => "Shows which body parts you posess and are available",
2857 }, 3115 },
3116 "c/statistics" => {
3117 id => "infobox",
3118 title => "Statistics",
3119 reply => undef,
3120 tooltip => "Shows your primary statistics",
3121 },
3122 "c/skills" => {
3123 id => "infobox",
3124 title => "Skills",
3125 reply => undef,
3126 tooltip => "Shows your experience per skill and item power",
3127 },
3128 "c/shopitems" => {
3129 id => "infobox",
3130 title => "Shop Items",
3131 reply => undef,
3132 tooltip => "Shows the items currently for sale in this shop",
3133 },
3134 "c/resistances" => {
3135 id => "infobox",
3136 title => "Resistances",
3137 reply => undef,
3138 tooltip => "Shows your resistances",
3139 },
3140 "c/pets" => {
3141 id => "infobox",
3142 title => "Pets",
3143 reply => undef,
3144 tooltip => "Shows information abotu your pets/a specific pet",
3145 },
3146 "c/perceiveself" => {
3147 id => "infobox",
3148 title => "Perceive Self",
3149 reply => undef,
3150 tooltip => "You gained detailed knowledge about yourself",
3151 },
2858 "c/uptime" => { 3152 "c/uptime" => {
2859 id => "infobox", 3153 id => "infobox",
2860 title => "Uptime", 3154 title => "Uptime",
2861 reply => undef, 3155 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 3156 tooltip => "How long the server has been running since last restart",
2871 id => "party", 3165 id => "party",
2872 title => "Party", 3166 title => "Party",
2873 reply => "gsay ", 3167 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 3168 tooltip => "Messages and chat related to your party",
2875 }, 3169 },
3170 "c/death" => {
3171 id => "death",
3172 title => "Death",
3173 reply => undef,
3174 tooltip => "Reason for and more info about your most recent death",
3175 },
3176 "c/say" => $SAY_CHANNEL,
3177 "c/chat" => $CHAT_CHANNEL,
2876); 3178);
2877 3179
2878sub cf::client::send_msg { 3180sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 3181 my ($self, $channel, $msg, $color, @extra) = @_;
2880 3182
2881 $msg = $self->pl->expand_cfpod ($msg); 3183 $msg = $self->pl->expand_cfpod ($msg)
3184 unless $color & cf::NDI_VERBATIM;
2882 3185
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 3186 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 3187
2885 # check predefined channels, for the benefit of C 3188 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 3189 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 3190 $channel = $CHANNEL{$channel};
2888 3191
2889 $self->ext_msg (channel_info => $channel) 3192 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 3193 $channel = $channel->{id};
2893 3194
2894 } elsif (ref $channel) { 3195 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 3196 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 3197 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 3198 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 3199 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 3200 }
2901 3201
2902 $channel = $channel->{id}; 3202 $channel = $channel->{id};
2903 } 3203 }
2904 3204
2905 return unless @extra || length $msg; 3205 return unless @extra || length $msg;
2906 3206
2907 if ($self->can_msg) {
2908 # default colour, mask it out 3207 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3208 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 3209 if $color & cf::NDI_DEF;
2911 3210
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3211 my $pkt = "msg "
3212 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3213 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 3214 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 3215
2926 $color &= cf::NDI_COLOR_MASK; 3216 $self->send_big_packet ($pkt);
2927
2928 utf8::encode $msg;
2929
2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 }
2939} 3217}
2940 3218
2941=item $client->ext_msg ($type, @msg) 3219=item $client->ext_msg ($type, @msg)
2942 3220
2943Sends an ext event to the client. 3221Sends an ext event to the client.
2945=cut 3223=cut
2946 3224
2947sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
2948 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
2949 3227
2950 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove
2953 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 }
2956}
2957
2958=item $client->ext_reply ($msgid, @msg)
2959
2960Sends an ext reply to the client.
2961
2962=cut
2963
2964sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_;
2966
2967 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 }
2974} 3229}
2975 3230
2976=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
2977 3232
2978Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
3033 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
3034 3289
3035 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3036 3291
3037 if (ref $msg) { 3292 if (ref $msg) {
3038 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3039 "ARRAY" eq ref $msg
3040 ? @$msg
3041 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3042 3294
3043 my @reply; 3295 my @reply;
3044 3296
3045 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3046 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3047 } 3299 }
3048 3300
3049 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3050 if $reply; 3302 if $reply;
3051 3303
3052 } else { 3304 } else {
3053 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3054 } 3306 }
3055 3307
3056 cf::override; 3308 cf::override;
3057 }, 3309 },
3058); 3310);
3078 3330
3079 $coro 3331 $coro
3080} 3332}
3081 3333
3082cf::client->attach ( 3334cf::client->attach (
3083 on_destroy => sub { 3335 on_client_destroy => sub {
3084 my ($ns) = @_; 3336 my ($ns) = @_;
3085 3337
3086 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3338 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3087 }, 3339 },
3088); 3340);
3104our $safe_hole = new Safe::Hole; 3356our $safe_hole = new Safe::Hole;
3105 3357
3106$SIG{FPE} = 'IGNORE'; 3358$SIG{FPE} = 'IGNORE';
3107 3359
3108$safe->permit_only (Opcode::opset qw( 3360$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math 3361 :base_core :base_mem :base_orig :base_math :base_loop
3110 grepstart grepwhile mapstart mapwhile 3362 grepstart grepwhile mapstart mapwhile
3111 sort time 3363 sort time
3112)); 3364));
3113 3365
3114# here we export the classes and methods available to script code 3366# here we export the classes and methods available to script code
3118The following functions and methods are available within a safe environment: 3370The following functions and methods are available within a safe environment:
3119 3371
3120 cf::object 3372 cf::object
3121 contr pay_amount pay_player map x y force_find force_add destroy 3373 contr pay_amount pay_player map x y force_find force_add destroy
3122 insert remove name archname title slaying race decrease split 3374 insert remove name archname title slaying race decrease split
3375 value
3123 3376
3124 cf::object::player 3377 cf::object::player
3125 player 3378 player
3126 3379
3127 cf::player 3380 cf::player
3133=cut 3386=cut
3134 3387
3135for ( 3388for (
3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3389 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3137 insert remove inv nrof name archname title slaying race 3390 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3393 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3142) { 3395) {
3143 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3146 for @funs; 3398 for @funs;
3147} 3399}
3148 3400
3163 3415
3164 my $qcode = $code; 3416 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3417 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3418 $qcode =~ s/\n/\\n/g;
3167 3419
3420 %vars = (_dummy => 0) unless %vars;
3421
3422 my @res;
3168 local $_; 3423 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars;
3170 3424
3171 my $eval = 3425 my $eval =
3172 "do {\n" 3426 "do {\n"
3173 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3427 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3174 . "#line 0 \"{$qcode}\"\n" 3428 . "#line 0 \"{$qcode}\"\n"
3175 . $code 3429 . $code
3176 . "\n}" 3430 . "\n}"
3177 ; 3431 ;
3178 3432
3433 if ($CFG{safe_eval}) {
3179 sub_generation_inc; 3434 sub_generation_inc;
3435 local @safe::cf::_safe_eval_args = values %vars;
3180 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3436 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3181 sub_generation_inc; 3437 sub_generation_inc;
3438 } else {
3439 local @cf::_safe_eval_args = values %vars;
3440 @res = wantarray ? eval eval : scalar eval $eval;
3441 }
3182 3442
3183 if ($@) { 3443 if ($@) {
3184 warn "$@"; 3444 warn "$@",
3185 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3186 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3187 } 3447 }
3188 3448
3189 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3190} 3450}
3191 3451
3205=cut 3465=cut
3206 3466
3207sub register_script_function { 3467sub register_script_function {
3208 my ($fun, $cb) = @_; 3468 my ($fun, $cb) = @_;
3209 3469
3210 no strict 'refs'; 3470 $fun = "safe::$fun" if $CFG{safe_eval};
3211 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3471 *$fun = $safe_hole->wrap ($cb);
3212} 3472}
3213 3473
3214=back 3474=back
3215 3475
3216=cut 3476=cut
3217 3477
3218############################################################################# 3478#############################################################################
3219# the server's init and main functions 3479# the server's init and main functions
3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3220 3504
3221sub load_facedata($) { 3505sub load_facedata($) {
3222 my ($path) = @_; 3506 my ($path) = @_;
3223 3507
3224 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3225 # for this (global event?) 3509 # for this (global event?)
3226 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3227 3511
3228 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3229 3513
3230 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3231 3515
3232 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3233 0 < aio_load $path, $facedata
3234 or die "$path: $!";
3235
3236 $facedata = Coro::Storable::thaw $facedata;
3237 3517
3238 $facedata->{version} == 2 3518 $facedata->{version} == 2
3239 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3240 3520
3241 # patch in the exptable
3242 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3245 };
3246 cf::cede_to_tick; 3521 cf::cede_to_tick;
3247 3522
3248 { 3523 {
3249 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3250 3525
3251 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3252 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253 3529
3254 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3258 3536
3259 cf::cede_to_tick; 3537 cf::cede_to_tick;
3260 } 3538 }
3261 3539
3262 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
3267 3545
3268 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3269 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3271 } else { 3549 } else {
3272 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3273 } 3551 }
3274 3552
3275 cf::cede_to_tick; 3553 cf::cede_to_tick;
3276 } 3554 }
3277 } 3555 }
3286 3564
3287 cf::anim::invalidate_all; # d'oh 3565 cf::anim::invalidate_all; # d'oh
3288 } 3566 }
3289 3567
3290 { 3568 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3294 3570
3295 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299 3575
3300 if ($info->{type} & 1) {
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type}; 3576 cf::face::set_type $idx, $type;
3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3315 } else { 3580 } else {
3316 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3317 } 3582 }
3318 3583
3319 cf::cede_to_tick; 3584 cf::cede_to_tick;
3320 } 3585 }
3321 } 3586 }
3322 3587
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3324 3589
3325 1 3590 1
3326} 3591}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3347 3592
3348register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3349 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3350 3595
3351 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
3359 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3361 cf::arch::commit_load; 3606 cf::arch::commit_load;
3362 3607
3363 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3364} 3622}
3365 3623
3366sub reload_regions { 3624sub reload_regions {
3367 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?) 3626 # for this (global event?)
3383} 3641}
3384 3642
3385sub reload_archetypes { 3643sub reload_archetypes {
3386 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3387 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3388} 3655}
3389 3656
3390sub reload_treasures { 3657sub reload_treasures {
3391 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3392 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3393} 3660}
3394 3661
3662sub reload_sound {
3663 trace "loading sound config from $DATADIR/sound\n";
3664
3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3666
3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3668 my $sound = $soundconf->{compat}[$_]
3669 or next;
3670
3671 my $face = cf::face::find "sound/$sound->[1]";
3672 cf::sound::set $sound->[0] => $face;
3673 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3674 }
3675
3676 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face;
3679 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3395sub reload_resources { 3744sub reload_resources {
3396 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3397 3746
3747 reload_materials;
3398 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3399 reload_archetypes; 3751 reload_archetypes;
3400 reload_regions; 3752 reload_regions;
3401 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3402 3755
3403 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3404}
3405
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412} 3757}
3413 3758
3414sub reload_config { 3759sub reload_config {
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3760 trace "reloading config file...\n";
3416 or return;
3417 3761
3418 local $/; 3762 my $config = load_file "$CONFDIR/config";
3419 *CFG = YAML::Load <$fh>; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3420 3765
3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3422 3767
3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3425 3770
3426 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
3430 }; 3775 };
3431 warn $@ if $@; 3776 warn $@ if $@;
3432 } 3777 }
3433} 3778}
3434 3779
3780sub pidfile() {
3781 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3782 or die "$PIDFILE: $!";
3783 flock $fh, &Fcntl::LOCK_EX
3784 or die "$PIDFILE: flock: $!";
3785 $fh
3786}
3787
3788# make sure only one server instance is running at any one time
3789sub atomic {
3790 my $fh = pidfile;
3791
3792 my $pid = <$fh>;
3793 kill 9, $pid if $pid > 0;
3794
3795 seek $fh, 0, 0;
3796 print $fh $$;
3797}
3798
3799sub main_loop {
3800 trace "EV::loop starting\n";
3801 if (1) {
3802 EV::loop;
3803 }
3804 trace "EV::loop returned\n";
3805 goto &main_loop unless $REALLY_UNLOOP;
3806}
3807
3435sub main { 3808sub main {
3809 cf::init_globals; # initialise logging
3810
3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3815
3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3817
3436 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3821 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3443 }; 3825 };
3444 3826
3445 { 3827 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3828
3829 cf::sync_job {
3830 cf::incloader::init ();
3831
3832 db_init;
3833
3834 cf::init_anim;
3835 cf::init_attackmess;
3836 cf::init_dynamic;
3837
3838 cf::load_settings;
3839
3840 reload_resources;
3447 reload_config; 3841 reload_config;
3448 db_init; 3842
3843 cf::init_uuid;
3844 cf::init_signals;
3845 cf::init_skills;
3846
3847 cf::init_beforeplay;
3848
3849 atomic;
3850
3449 load_extensions; 3851 load_extensions;
3450 3852
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3853 utime time, time, $RUNTIMEFILE;
3854
3855 # no (long-running) fork's whatsoever before this point(!)
3856 use POSIX ();
3857 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3858
3859 cf::_post_init 0;
3452 } 3860 };
3453 3861
3454 EV::loop; 3862 cf::object::thawer::errors_are_fatal 0;
3863 info "parse errors in files are no longer fatal from this point on.\n";
3864
3865 AE::postpone {
3866 undef &main; # free gobs of memory :)
3867 };
3868
3869 goto &main_loop;
3455} 3870}
3456 3871
3457############################################################################# 3872#############################################################################
3458# initialisation and cleanup 3873# initialisation and cleanup
3459 3874
3460# install some emergency cleanup handlers 3875# install some emergency cleanup handlers
3461BEGIN { 3876BEGIN {
3462 our %SIGWATCHER = (); 3877 our %SIGWATCHER = ();
3463 for my $signal (qw(INT HUP TERM)) { 3878 for my $signal (qw(INT HUP TERM)) {
3464 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3879 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3465 cf::cleanup "SIG$signal"; 3880 cf::cleanup "SIG$signal";
3466 }; 3881 };
3467 } 3882 }
3468} 3883}
3469 3884
3470sub write_runtime_sync { 3885sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime"; 3886 my $t0 = AE::time;
3472 3887
3473 # first touch the runtime file to show we are still running: 3888 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3889 # the fsync below can take a very very long time.
3475 3890
3476 IO::AIO::aio_utime $runtime, undef, undef; 3891 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3892
3478 my $guard = cf::lock_acquire "write_runtime"; 3893 my $guard = cf::lock_acquire "write_runtime";
3479 3894
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3895 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3481 or return; 3896 or return;
3482 3897
3483 my $value = $cf::RUNTIME + 90 + 10; 3898 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3899 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3900 # 60 allows for the watchdog to kill the server.
3495 aio_utime $fh, undef, undef; 3910 aio_utime $fh, undef, undef;
3496 3911
3497 close $fh 3912 close $fh
3498 or return; 3913 or return;
3499 3914
3500 aio_rename "$runtime~", $runtime 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3916 and return;
3502 3917
3503 warn "runtime file written.\n"; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3504 3919
3505 1 3920 1
3506} 3921}
3507 3922
3508our $uuid_lock; 3923our $uuid_lock;
3517 my $uuid = "$LOCALDIR/uuid"; 3932 my $uuid = "$LOCALDIR/uuid";
3518 3933
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3934 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3935 or return;
3521 3936
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3937 my $value = uuid_seq uuid_cur;
3938
3939 unless ($value) {
3940 info "cowardly refusing to write zero uuid value!\n";
3941 return;
3942 }
3943
3944 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3945 $uuid_skip = 0;
3524 3946
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3947 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3948 and return;
3527 3949
3533 or return; 3955 or return;
3534 3956
3535 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3536 and return; 3958 and return;
3537 3959
3538 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3539 3961
3540 1 3962 1
3541 3963
3542} 3964}
3543 3965
3549} 3971}
3550 3972
3551sub emergency_save() { 3973sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3553 3975
3554 warn "enter emergency perl save\n"; 3976 info "emergency_perl_save: enter\n";
3977
3978 # this is a trade-off: we want to be very quick here, so
3979 # save all maps without fsync, and later call a global sync
3980 # (which in turn might be very very slow)
3981 local $USE_FSYNC = 0;
3555 3982
3556 cf::sync_job { 3983 cf::sync_job {
3984 cf::write_runtime_sync; # external watchdog should not bark
3985
3557 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3992 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3994 $pl->save;
3566 } 3995 }
3567 warn "end emergency player save\n"; 3996 info "emergency_perl_save: end player save\n";
3568 3997
3569 warn "begin emergency map save\n"; 3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 info "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 4003 $map->valid or next;
3573 $map->save; 4004 $map->save;
3574 } 4005 }
3575 warn "end emergency map save\n"; 4006 info "emergency_perl_save: end map save\n";
3576 4007
3577 warn "begin emergency database checkpoint\n"; 4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 info "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3580 4013
3581 warn "begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 4015 write_uuid_sync 1;
3583 warn "end write uuid\n"; 4016 info "emergency_perl_save: end write uuid\n";
4017
4018 cf::write_runtime_sync; # external watchdog should not bark
4019
4020 trace "emergency_perl_save: syncing database to disk";
4021 BDB::db_env_txn_checkpoint $DB_ENV;
4022
4023 info "emergency_perl_save: starting sync\n";
4024 IO::AIO::aio_sync sub {
4025 info "emergency_perl_save: finished sync\n";
4026 };
4027
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
4030 trace "emergency_perl_save: flushing outstanding aio requests";
4031 while (IO::AIO::nreqs || BDB::nreqs) {
4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4033 }
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
3584 }; 4036 };
3585 4037
3586 warn "leave emergency perl save\n"; 4038 info "emergency_perl_save: leave\n";
3587} 4039}
3588 4040
3589sub post_cleanup { 4041sub post_cleanup {
3590 my ($make_core) = @_; 4042 my ($make_core) = @_;
3591 4043
4044 IO::AIO::flush;
4045
3592 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 4047 if $make_core;
4048
4049 my $fh = pidfile;
4050 unlink $PIDFILE if <$fh> == $$;
3594} 4051}
3595 4052
3596# a safer delete_package, copied from Symbol 4053# a safer delete_package, copied from Symbol
3597sub clear_package($) { 4054sub clear_package($) {
3598 my $pkg = shift; 4055 my $pkg = shift;
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4071 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 4072 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 4073 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4074# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 4075 }
3619 warn "cleared package #$pkg\n";#d#
3620} 4076}
3621
3622our $RELOAD; # how many times to reload
3623 4077
3624sub do_reload_perl() { 4078sub do_reload_perl() {
3625 # can/must only be called in main 4079 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 4080 unless (in_main) {
3627 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3628 return; 4082 return;
3629 } 4083 }
3630 4084
3631 return if $RELOAD++; 4085 return if $RELOAD++;
3632 4086
4087 my $t1 = AE::time;
4088
3633 while ($RELOAD) { 4089 while ($RELOAD) {
3634 warn "reloading..."; 4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
3635 4092
3636 warn "entering sync_job"; 4093 trace "perl_reload: entering sync_job";
3637 4094
3638 cf::sync_job { 4095 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 4096 #cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 4097
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 4100 %EXT_CORO = ();
3656 4101
3657 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3658 %COMMAND = (); 4103 %COMMAND = ();
3659 4104
3660 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3661 %EXTCMD = (); 4106 %EXTCMD = ();
3662 %EXTICMD = (); 4107 %EXTICMD = ();
3663 4108
3664 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3667 4112
3668 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3669 eval { 4114 eval {
3670 $cb->($pkg); 4115 $cb->($pkg);
3671 1 4116 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
3673 } 4118 }
3674 4119
3675 warn "... clearing $pkg"; 4120 trace "... clearing $pkg";
3676 clear_package $pkg; 4121 clear_package $pkg;
3677 } 4122 }
3678 4123
3679 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 4127
3683 warn "... unloading $k"; 4128 trace "... unloading $k";
3684 delete $INC{$k}; 4129 delete $INC{$k};
3685 4130
3686 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3688 4133
3691 } 4136 }
3692 4137
3693 clear_package $k; 4138 clear_package $k;
3694 } 4139 }
3695 4140
3696 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 4142 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4143 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 4144
3700 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 4148
3704 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3705 # and global variables created in xs 4150 # and global variables created in xs
3706 #clear_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3707 4152
3708 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3709 4154
3710 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3711 require cf; 4156 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4157 cf::_connect_to_perl_1;
3713 4158
3714 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3715 cf::reload_config; 4160 cf::reload_config;
3716 4161
3717 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3718 cf::load_extensions; 4163 cf::load_extensions;
3719 4164
4165 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3723 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
4172 }
3726 4173
3727 warn "leaving sync_job"; 4174 cf::_post_init 1;
4175
4176 trace "perl_reload: leaving sync_job";
3728 4177
3729 1 4178 1
3730 } or do { 4179 } or do {
3731 warn $@; 4180 error $@;
3732 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3733 }; 4182 };
3734 4183
3735 warn "reloaded";
3736 --$RELOAD; 4184 --$RELOAD;
3737 } 4185 }
4186
4187 $t1 = AE::time - $t1;
4188 info "perl_reload: completed in ${t1}s\n";
3738}; 4189};
3739 4190
3740our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3741 4192
3742sub reload_perl() { 4193sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 4194 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 4195 # coro crashes during coro_state_free->destroy here.
3745 4196
4197 $RELOAD_WATCHER ||= cf::async {
4198 Coro::AIO::aio_wait cache_extensions;
4199
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4200 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 4201 do_reload_perl;
3748 undef $RELOAD_WATCHER; 4202 undef $RELOAD_WATCHER;
4203 };
3749 }; 4204 };
3750} 4205}
3751 4206
3752register_command "reload" => sub { 4207register_command "reload" => sub {
3753 my ($who, $arg) = @_; 4208 my ($who, $arg) = @_;
3759 reload_perl; 4214 reload_perl;
3760 }; 4215 };
3761 } 4216 }
3762}; 4217};
3763 4218
3764unshift @INC, $LIBDIR; 4219#############################################################################
3765 4220
3766my $bug_warning = 0; 4221my $bug_warning = 0;
3767 4222
3768our @WAIT_FOR_TICK;
3769our @WAIT_FOR_TICK_BEGIN;
3770
3771sub wait_for_tick { 4223sub wait_for_tick() {
3772 return if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3773 4225
3774 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3775 push @WAIT_FOR_TICK, $signal;
3776 $signal->wait;
3777} 4227}
3778 4228
3779sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3781 4231
3782 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3784 $signal->wait; 4234 $signal->wait;
3785} 4235}
3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3790 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3791 return; 4241 return;
3792 } 4242 }
3793 4243
3794 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
4245
4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3795 4247
3796 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3798 Coro::async_pool { 4250 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3800 write_runtime_sync 4252 write_runtime_sync
3801 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3802 }; 4254 };
3803 } 4255 }
3804 4256
3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3806 $sig->send; 4258 $sig->send;
3807 } 4259 }
3808 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
3809 $sig->send;
3810 }
3811 4261
3812 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3814 4264
3815 if (0) { 4265 if (0) {
3816 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
3817 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
3820 } 4270 }
3821 } 4271 }
3822} 4272}
3823 4273
3824{ 4274{
3825 # configure BDB 4275 # configure BDB
4276 info "initialising database";
3826 4277
3827 BDB::min_parallel 8; 4278 BDB::min_parallel 16;
3828 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
3829 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
3830 4281
3831 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
3832 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3860 }; 4311 };
3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3863 }; 4314 };
4315
4316 info "database initialised";
3864} 4317}
3865 4318
3866{ 4319{
3867 # configure IO::AIO 4320 # configure IO::AIO
3868 4321
4322 info "initialising aio";
3869 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
3870 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
3871 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
3872} 4327}
3873 4328
3874my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
3875 4331
3876sub _log_backtrace { 4332sub _log_backtrace {
3877 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
3878 4334
3879 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
3880 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3881 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
3883 ++$_log_backtrace; 4343 ++$_log_backtrace;
4344 my $perl_bt = Carp::longmess $msg;
3884 async { 4345 async {
3885 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
3886 4347
3887 my @bt = fork_call { 4348 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 4349 @addr = map { sprintf "%x", $_ } @addr;
3899 } 4360 }
3900 4361
3901 @funcs 4362 @funcs
3902 }; 4363 };
3903 4364
3904 LOG llevInfo, "[ABT] $msg\n"; 4365 LOG llevInfo, "[ABT] $perl_bt\n";
4366 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 4368 --$_log_backtrace;
3907 }; 4369 };
3908 } else { 4370 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3911 } 4373 }
3912} 4374}
3913 4375
3914# load additional modules 4376# load additional modules
3915use cf::pod; 4377require "cf/$_.pm" for @EXTRA_MODULES;
4378cf::_connect_to_perl_2;
3916 4379
3917END { cf::emergency_save } 4380END { cf::emergency_save }
3918 4381
39191 43821
3920 4383

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines