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.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.597 by root, Sun Nov 11 02:14:37 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 = ();
92our %EXTACMD = ();
79our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
82 97
83our $RELOAD; # number of reloads so far 98our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
85 102
86our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
87our $DATADIR = datadir; 105our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
91our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE; 116our $PIDFILE = "$LOCALDIR/pid";
117our $RUNTIMEFILE = "$LOCALDIR/runtime";
118
119#our %RESOURCE; # unused
120
121our $OUTPUT_RATE_MIN = 3000;
122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
98 126
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 129our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
103 131
104our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 135our $DB_ENV;
108 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
109our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
110 141
111our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
113our $NOW; 145our $NOW;
114 146
115our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
116our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
117our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 155our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 156our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 157our $TICK_START; # for load detecting purposes
126 158
159our @POST_INIT;
160
161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
166
127binmode STDOUT; 167binmode STDOUT;
128binmode STDERR; 168binmode STDERR;
129 169
130# read virtual server time, if available 170# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 171unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 172 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
135} 175}
176
177eval "sub TICK() { $TICK } 1" or die;
136 178
137mkdir $_ 179mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 181
140our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
141 183
142sub cf::map::normalise; 184sub cf::map::normalise;
143 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
144############################################################################# 190#############################################################################
145 191
192%REFLECT = ();
193for (@REFLECT) {
194 my $reflect = JSON::XS::decode_json $_;
195 $REFLECT{$reflect->{class}} = $reflect;
196}
197
198# this is decidedly evil
199$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
200
201#############################################################################
202
146=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
147 204
148=over 4 205=over 4
149 206
150=item $cf::UPTIME 207=item $cf::UPTIME
151 208
152The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
153 225
154=item $cf::RUNTIME 226=item $cf::RUNTIME
155 227
156The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
157every server tick. 229every server tick.
158 230
159=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
160$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
161$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
162 234
163Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
164directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
165unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
166database environment. 238database environment.
167 239
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 240=item $cf::LOADAVG
177 241
178The current CPU load on the server (alpha-smoothed), as a value between 0 242The 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 243(none) and 1 (overloaded), indicating how much time is spent on processing
180objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
189from wherever your confdir points to. 253from wherever your confdir points to.
190 254
191=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
192 256
193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These 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 258returns 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. 259per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 260
261Note that cf::Wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
277
197=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
198 279
199This array contains the results of the last C<invoke ()> call. When 280This 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 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 282that call.
202 283
284=item %cf::REFLECT
285
286Contains, for each (C++) class name, a hash reference with information
287about object members (methods, scalars, arrays and flags) and other
288metadata, which is useful for introspection.
289
203=back 290=back
204 291
205=cut 292=cut
206 293
207BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
208 *CORE::GLOBAL::warn = sub { 295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
300$Coro::State::WARNHOOK = sub {
209 my $msg = join "", @_; 301 my $msg = join "", @_;
210 302
211 $msg .= "\n" 303 $msg .= "\n"
212 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
213 305
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 307
216 LOG llevError, $msg; 308 LOG llevWarn, $msg;
217 }; 309};
218}
219 310
220$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
222 313
223 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 318 return;#d#
226 }#d# 319 }#d#
227 320
228 # kill coroutine otherwise 321 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 322 Coro::terminate
231}; 323};
232
233$SIG{__DIE__} = sub { }; #d#?
234 324
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 342)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 344}
255 345
256$EV::DIED = sub { 346$EV::DIED = sub {
257 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
258}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
259 354
260############################################################################# 355#############################################################################
261 356
262=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
263 358
284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
285 $d 380 $d
286 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
287} 382}
288 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
289=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
290 437
291Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
292 439
293=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 447
301sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
303 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
482=item cf::post_init { BLOCK }
483
484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
485but I<before> the server starts ticking again.
486
487The codeblock will have a single boolean argument to indicate whether this
488is a reload or not.
489
490=cut
491
492sub post_init(&) {
493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
511}
512
304=item cf::lock_wait $string 513=item cf::lock_wait $string
305 514
306Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
307 516
308=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
309 518
310Wait until the given lock is available and then acquires it and returns 519Wait 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, 520a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
313returned. 522returned.
314 523
315Locks are *not* recursive, locking from the same coro twice results in a 524Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 525deadlocked coro.
322 531
323Return true if the lock is currently active, i.e. somebody has locked it. 532Return true if the lock is currently active, i.e. somebody has locked it.
324 533
325=cut 534=cut
326 535
327our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 537
330sub lock_wait($) { 538sub lock_wait($) {
331 my ($key) = @_; 539 $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} 540}
344 541
345sub lock_acquire($) { 542sub lock_acquire($) {
346 my ($key) = @_; 543 $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} 544}
360 545
361sub lock_active($) { 546sub lock_active($) {
362 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 548}
366 549
367sub freeze_mainloop { 550sub freeze_mainloop {
368 tick_inhibit_inc; 551 tick_inhibit_inc;
369 552
370 Coro::guard \&tick_inhibit_dec; 553 &Guard::guard (\&tick_inhibit_dec);
371} 554}
372 555
373=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
374 557
375Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 559get spread over time.
377 560
378=cut 561=cut
379 562
380sub periodic($$) { 563sub periodic($$) {
381 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
386} 569}
387 570
388=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
389 572
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
391This call blocks and returns only when you have at least C<$time> seconds 574(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. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority les than zero, interactive jobs
579should use 100 or more.
393 580
394The optional C<$name> can be used to identify the job to run. It might be 581The 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. 582used for statistical purposes and should identify the same time-class.
396 583
397Useful for short background jobs. 584Useful for short background jobs.
398 585
399=cut 586=cut
400 587
401our @SLOT_QUEUE; 588our @SLOT_QUEUE;
402our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
403 591
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
407 595
408 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
409 598
410 while () { 599 while () {
411 next_job: 600 next_job:
601
412 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 603
414 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 608 $job->[2]->send;
418 Coro::cede; 609 Coro::cede;
419 goto next_job; 610 goto next_job;
420 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 613 }
422 } 614 }
423 615
424 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 619 } else {
620 $busy = 0;
429 Coro::schedule; 621 Coro::schedule;
430 } 622 }
431 } 623 }
432}; 624};
433 625
434sub get_slot($;$$) { 626sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
436 628
437 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
438 630
439 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
440 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
441 634
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
470=cut 663=cut
471 664
472sub sync_job(&) { 665sub sync_job(&) {
473 my ($job) = @_; 666 my ($job) = @_;
474 667
475 if ($Coro::current == $Coro::main) { 668 if (in_main) {
476 my $time = EV::time; 669 my $time = AE::time;
477 670
478 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
480 673
481 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
482 675
483 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
484 677
485 my $busy = 1; 678 my $busy = 1;
486 my @res; 679 my @res;
487 680
488 (async { 681 (async {
489 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 683 @res = eval { $job->() };
491 warn $@ if $@; 684 error $@ if $@;
492 undef $busy; 685 undef $busy;
493 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
494 687
495 while ($busy) { 688 while ($busy) {
496 if (Coro::nready) { 689 if (Coro::nready) {
498 } else { 691 } else {
499 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
500 } 693 }
501 } 694 }
502 695
503 my $time = EV::time - $time; 696 my $time = AE::time - $time;
504 697
505 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
506 699
507 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
508 } else { 701 } else {
530 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
531 724
532 $coro 725 $coro
533} 726}
534 727
535=item fork_call { }, $args 728=item fork_call { }, @args
536 729
537Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 733never block itself or use any form of event handling.
541 734
542=cut 735=cut
543 736
737sub post_fork {
738 reset_signals;
739}
740
544sub fork_call(&@) { 741sub fork_call(&@) {
545 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
546 743
547 # we seemingly have to make a local copy of the whole thing, 744 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
550 747
551 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
552 reset_signals; 749 cf::post_fork;
553 &$cb 750 &$cb
554 }, @args; 751 } @args;
555 752
556 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
754}
755
756sub objinfo {
757 (
758 "counter value" => cf::object::object_count,
759 "objects created" => cf::object::create_count,
760 "objects destroyed" => cf::object::destroy_count,
761 "freelist size" => cf::object::free_count,
762 "allocated objects" => cf::object::objects_size,
763 "active objects" => cf::object::actives_size,
764 )
557} 765}
558 766
559=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
560 768
561=cut 769=cut
598within each server. 806within each server.
599 807
600=cut 808=cut
601 809
602sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
603 my ($name) = @_; 814 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
605 816
606 eval { 817 eval {
607 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
617} 828}
618 829
619our $DB; 830our $DB;
620 831
621sub db_init { 832sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
624 };
625} 834}
626 835
627sub db_get($$) { 836sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
629 838
630 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
631 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
632 843
633 $! ? () 844 $! ? ()
634 : $data 845 : $data
635 }
636} 846}
637 847
638sub db_put($$$) { 848sub db_put($$$) {
639 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 878
669 my @data; 879 my @data;
670 my $md5; 880 my $md5;
671 881
672 for (0 .. $#$src) { 882 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 884 }
676 885
677 # if processing is expensive, check 886 # if processing is expensive, check
678 # checksum first 887 # checksum first
679 if (1) { 888 if (1) {
696 905
697 my $t1 = Time::HiRes::time; 906 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 907 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 908 my $t2 = Time::HiRes::time;
700 909
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 911
703 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
706 915
716 925
717=cut 926=cut
718 927
719sub datalog($@) { 928sub datalog($@) {
720 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 931}
723 932
724=back 933=back
725 934
726=cut 935=cut
727 936
728############################################################################# 937#############################################################################
729 938
730=head2 ATTACHABLE OBJECTS 939=head2 ATTACHABLE OBJECTS
731 940
732Many objects in crossfire are so-called attachable objects. That means you can 941Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 942attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 943to it. All such attachable objects support the following methods.
735 944
736In the following description, CLASS can be any of C<global>, C<object> 945In 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 946C<player>, C<client> or C<map> (i.e. the attachable objects in
787=item cf::CLASS::attachment $name, ... 996=item cf::CLASS::attachment $name, ...
788 997
789Register an attachment by C<$name> through which attachable objects of the 998Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 999given CLASS can refer to this attachment.
791 1000
792Some classes such as crossfire maps and objects can specify attachments 1001Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 1002that are attached at load/instantiate time, thus the need for a name.
794 1003
795These calls expect any number of the following handler/hook descriptions: 1004These calls expect any number of the following handler/hook descriptions:
796 1005
797=over 4 1006=over 4
921 1130
922 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1133
925 } elsif (ref $type) { 1134 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
927 1136
928 } else { 1137 } else {
929 shift @arg; 1138 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
931 } 1140 }
932 } 1141 }
933} 1142}
934 1143
935sub _object_attach { 1144sub _object_attach {
945 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
946 } 1155 }
947 1156
948 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
949 } else { 1158 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1160 }
952 1161
953 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
954} 1163}
955 1164
1014 1223
1015 for (@$callbacks) { 1224 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1017 1226
1018 if ($@) { 1227 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1229 override;
1022 } 1230 }
1023 1231
1024 return 1 if $override; 1232 return 1 if $override;
1025 } 1233 }
1104 for (@$attach) { 1312 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1107 } 1315 }
1108 } else { 1316 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1318 }
1111 } 1319 }
1112} 1320}
1113 1321
1114cf::attachable->attach ( 1322cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1142 1350
1143 sync_job { 1351 sync_job {
1144 if (length $$rdata) { 1352 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1148 1357
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1361 if ($cf::USE_FSYNC) {
1362 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;
1363 aio_fsync $fh;
1364 }
1153 aio_close $fh; 1365 aio_close $fh;
1154 1366
1155 if (@$objs) { 1367 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1368 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1369 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1370 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1371 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1372 if ($cf::USE_FSYNC) {
1373 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;
1374 aio_fsync $fh;
1375 }
1161 aio_close $fh; 1376 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1377 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1378 }
1164 } else { 1379 } else {
1165 aio_unlink "$filename.pst"; 1380 aio_unlink "$filename.pst";
1166 } 1381 }
1167 1382
1168 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1384
1385 $filename =~ s%/[^/]+$%%;
1386 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1387 } else {
1170 warn "FATAL: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1171 } 1389 }
1172 } else { 1390 } else {
1173 aio_unlink $filename; 1391 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1175 } 1393 }
1199 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1418 $av = $st->{objs};
1201 } 1419 }
1202 1420
1203 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1206 1425
1207 ($data, $av) 1426 ($data, $av)
1208} 1427}
1209 1428
1210=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1214=cut 1433=cut
1215 1434
1216############################################################################# 1435#############################################################################
1217# command handling &c 1436# command handling &c
1218 1437
1219=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1220 1439
1221Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1222$name. 1441$name.
1223 1442
1224=cut 1443=cut
1230 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1231 1450
1232 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1233} 1452}
1234 1453
1235=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1236 1455
1237Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1238extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1239received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1240the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1241has logged in successfully. 1460has logged in successfully.
1242 1461
1243If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1244called.
1245 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1246=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1247 1470
1248Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1249exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd 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 1473are 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 1474is a client socket. Exti commands can be received anytime, even before
1252log-in. 1475log-in.
1253 1476
1254If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1255called.
1256 1478
1257=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1258 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1259sub register_extcmd { 1486sub register_extcmd($$) {
1260 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1261 1488
1262 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1263} 1490}
1264 1491
1265sub register_exticmd { 1492sub register_async_extcmd($$) {
1266 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1267 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1268 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1269} 1502}
1270 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1510use File::Glob ();
1511
1271cf::player->attach ( 1512cf::player->attach (
1272 on_command => sub { 1513 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1274 1515
1275 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1276 or return; 1517 or return;
1277 1518
1285 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1286 1527
1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1288 1529
1289 if (ref $msg) { 1530 if (ref $msg) {
1290 my ($type, $reply, @payload) = 1531 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 1532
1295 my @reply;
1296
1297 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1298 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1299 } 1551 }
1300 1552
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1304 } else { 1553 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1555 }
1307 1556
1308 cf::override; 1557 cf::override;
1309 }, 1558 },
1310); 1559);
1311 1560
1561# "readahead" all extensions
1562sub cache_extensions {
1563 my $grp = IO::AIO::aio_group;
1564
1565 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1566 for (grep /\.ext$/, @{$_[0]}) {
1567 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1568 }
1569 };
1570
1571 $grp
1572}
1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1312sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1313 cf::sync_job { 1590 cf::sync_job {
1314 my %todo; 1591 my %todo;
1315 1592
1316 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1594 next unless -r $path;
1335 1612
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1615
1339 $ext{source} = 1616 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1342 . $source 1619 . $source
1343 . "\n};\n1"; 1620 . "\n};\n1";
1344 1621
1345 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1346 } 1623 }
1347 1624
1625 my $pass = 0;
1348 my %done; 1626 my %done;
1349 while (%todo) { 1627 while (%todo) {
1350 my $progress; 1628 my $progress;
1351 1629
1630 ++$pass;
1631
1632 ext:
1352 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1635 next ext
1355 unless exists $done{$_}; 1636 unless exists $done{$_};
1356 } 1637 }
1357 1638
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1640
1360 unless (eval $v->{source}) { 1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1650 my $active = eval $source;
1651
1652 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1654
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1656 if exists $v->{meta}{mandatory};
1368 1657
1369 warn $msg; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1659 delete $todo{$k};
1660 } else {
1661 $done{$k} = delete $todo{$k};
1662 push @EXTS, $v->{pkg};
1663 $progress = 1;
1664
1665 info "$v->{base}: extension inactive.\n"
1666 unless $active;
1370 } 1667 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1668 }
1376 1669
1377 skip: 1670 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 unless $progress; 1672
1673 while (my ($k, $v) = each %todo) {
1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1675 if exists $v->{meta}{mandatory};
1676 }
1677
1678 last;
1679 }
1380 } 1680 }
1381 }; 1681 };
1382} 1682}
1383 1683
1384############################################################################# 1684#############################################################################
1385 1685
1386=back 1686=back
1387 1687
1388=head2 CORE EXTENSIONS 1688=head2 CORE EXTENSIONS
1389 1689
1390Functions and methods that extend core crossfire objects. 1690Functions and methods that extend core deliantra objects.
1391 1691
1392=cut 1692=cut
1393 1693
1394package cf::player; 1694package cf::player;
1395 1695
1438 1738
1439sub exists($) { 1739sub exists($) {
1440 my ($login) = @_; 1740 my ($login) = @_;
1441 1741
1442 $cf::PLAYER{$login} 1742 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1743 or !aio_stat path $login
1444} 1744}
1445 1745
1446sub find($) { 1746sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1747 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1748 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1469 } 1769 }
1470 } 1770 }
1471} 1771}
1472 1772
1773cf::player->attach (
1774 on_load => sub {
1775 my ($pl, $path) = @_;
1776
1777 # restore slots saved in save, below
1778 my $slots = delete $pl->{_slots};
1779
1780 $pl->ob->current_weapon ($slots->[0]);
1781 $pl->combat_ob ($slots->[1]);
1782 $pl->ranged_ob ($slots->[2]);
1783 },
1784);
1785
1473sub save($) { 1786sub save($) {
1474 my ($pl) = @_; 1787 my ($pl) = @_;
1475 1788
1476 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1477 1790
1482 1795
1483 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1485 1798
1486 cf::get_slot 0.01; 1799 cf::get_slot 0.01;
1800
1801 # save slots, to be restored later
1802 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1487 1803
1488 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1805 cf::cede_to_tick;
1490} 1806}
1491 1807
1525 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1526 1842
1527 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1845
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1531 $pl->deactivate; 1847 $pl->deactivate;
1848
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1535 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1536 1854
1537 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1593 \@logins 1911 \@logins
1594} 1912}
1595 1913
1596=item $player->maps 1914=item $player->maps
1597 1915
1916=item cf::player::maps $login
1917
1598Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1599player. May block. 1919player. May block.
1600 1920
1601=cut 1921=cut
1602 1922
1619 } 1939 }
1620 1940
1621 \@paths 1941 \@paths
1622} 1942}
1623 1943
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1945
1626Expand crossfire pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1627
1628=item $player->ext_reply ($msgid, @msg)
1629
1630Sends an ext reply to the player.
1631
1632=cut
1633
1634sub ext_reply($$@) {
1635 my ($self, $id, @msg) = @_;
1636
1637 $self->ns->ext_reply ($id, @msg)
1638}
1639 1947
1640=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1641 1949
1642Sends an ext event to the client. 1950Sends an ext event to the client.
1643 1951
1663 1971
1664=cut 1972=cut
1665 1973
1666sub find_by_path($) { 1974sub find_by_path($) {
1667 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1668 1978
1669 my ($match, $specificity); 1979 my ($match, $specificity);
1670 1980
1671 for my $region (list) { 1981 for my $region (list) {
1672 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1701sub generate_random_map { 2011sub generate_random_map {
1702 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1703 2013
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705 2015
1706 # mit "rum" bekleckern, nicht
1707 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1711 $rmp->{exit_on_final_map},
1712 $rmp->{xsize}, $rmp->{ysize},
1713 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1714 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1715 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1716 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1717 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1718 (cf::region::find $rmp->{region}), $rmp->{custom}
1719 )
1720} 2017}
1721 2018
1722=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1723 2020
1724Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1729 2026
1730sub register { 2027sub register {
1731 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1732 my $pkg = caller; 2029 my $pkg = caller;
1733 2030
1734 no strict;
1735 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1736 2032
1737 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1738} 2034}
1739 2035
1740# also paths starting with '/' 2036# also paths starting with '/'
1741$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1742 2038
1743sub thawer_merge { 2039sub thawer_merge {
1744 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1745 2041
1746 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1751} 2047}
1752 2048
1753sub normalise { 2049sub normalise {
1754 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1755 2051
1756 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1757 2053
1758 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1759 2055
1760 # map plan: 2056 # map plan:
1761 # 2057 #
1776 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1777 $path = "$base/$path"; 2073 $path = "$base/$path";
1778 } 2074 }
1779 2075
1780 for ($path) { 2076 for ($path) {
1781 redo if s{//}{/};
1782 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1783 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1784 } 2079 }
1785 2080
1786 $path 2081 $path
1800 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1801 return $self; 2096 return $self;
1802 } 2097 }
1803 } 2098 }
1804 2099
1805 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1806 () 2101 ()
1807} 2102}
1808 2103
2104# may re-bless or do other evil things
1809sub init { 2105sub init {
1810 my ($self) = @_; 2106 my ($self) = @_;
1811 2107
1812 $self 2108 $self
1813} 2109}
1844 2140
1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2141 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846 "$UNIQUEDIR/$path" 2142 "$UNIQUEDIR/$path"
1847} 2143}
1848 2144
1849# and all this just because we cannot iterate over
1850# all maps in C++...
1851sub change_all_map_light {
1852 my ($change) = @_;
1853
1854 $_->change_map_light ($change)
1855 for grep $_->outdoor, values %cf::MAP;
1856}
1857
1858sub decay_objects { 2145sub decay_objects {
1859 my ($self) = @_; 2146 my ($self) = @_;
1860 2147
1861 return if $self->{deny_reset}; 2148 return if $self->{deny_reset};
1862 2149
1887 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1888 2175
1889 1 2176 1
1890} 2177}
1891 2178
2179# used to laod the header of an original map
1892sub load_header_orig { 2180sub load_header_orig {
1893 my ($self) = @_; 2181 my ($self) = @_;
1894 2182
1895 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1896} 2184}
1897 2185
2186# used to laod the header of an instantiated map
1898sub load_header_temp { 2187sub load_header_temp {
1899 my ($self) = @_; 2188 my ($self) = @_;
1900 2189
1901 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1902} 2191}
1903 2192
2193# called after loading the header from an instantiated map
1904sub prepare_temp { 2194sub prepare_temp {
1905 my ($self) = @_; 2195 my ($self) = @_;
1906 2196
1907 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1908 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1909 # safety 2199 # safety
1910 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1911 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1912} 2202}
1913 2203
2204# called after loading the header from an original map
1914sub prepare_orig { 2205sub prepare_orig {
1915 my ($self) = @_; 2206 my ($self) = @_;
1916 2207
1917 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
1918 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
1942 2233
1943sub find; 2234sub find;
1944sub find { 2235sub find {
1945 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
1946 2237
2238 cf::cede_to_tick;
2239
1947 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
1948 2241
1949 cf::lock_wait "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950 cf::lock_wait "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
1951 2244
1952 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956 my $map = new_from_path cf::map $path 2246 my $map = new_from_path cf::map $path
1957 or return; 2247 or return;
1958 2248
1959 $map->{last_save} = $cf::RUNTIME; 2249 $map->{last_save} = $cf::RUNTIME;
1960 2250
1972 2262
1973 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
1974 } 2264 }
1975} 2265}
1976 2266
1977sub pre_load { } 2267sub pre_load { }
1978sub post_load { } 2268#sub post_load { } # XS
1979 2269
1980sub load { 2270sub load {
1981 my ($self) = @_; 2271 my ($self) = @_;
1982 2272
1983 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
1986 2276
1987 { 2277 {
1988 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
1989 2279
1990 return unless $self->valid; 2280 return unless $self->valid;
1991 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
1992
1993 $self->in_memory (cf::MAP_LOADING);
1994 2282
1995 $self->alloc; 2283 $self->alloc;
1996 2284
1997 $self->pre_load; 2285 $self->pre_load;
1998 cf::cede_to_tick; 2286 cf::cede_to_tick;
1999 2287
2288 if (exists $self->{load_path}) {
2000 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2001 $f->skip_block; 2290 $f->skip_block;
2002 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2003 or return; 2292 or return;
2004 2293
2005 $self->post_load_original 2294 $self->post_load_original
2006 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2007 2296
2008 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2009 utf8::encode $uniq; 2298 utf8::encode $uniq;
2010 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2011 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2012 $self->clear_unique_items; 2301 $self->clear_unique_items;
2013 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2014 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2015 } 2305 }
2016 } 2306 }
2017 }
2018 2307
2019 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2020 2315
2021 cf::cede_to_tick; 2316 cf::cede_to_tick;
2022 # now do the right thing for maps 2317 # now do the right thing for maps
2023 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2024 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2028 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2029 $self->decay_objects; 2324 $self->decay_objects;
2030 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2031 $self->update_buttons; 2326 $self->update_buttons;
2032 cf::cede_to_tick; 2327 cf::cede_to_tick;
2033 $self->set_darkness_map; 2328 #$self->activate; # no longer activate maps automatically
2034 cf::cede_to_tick;
2035 $self->activate;
2036 } 2329 }
2037 2330
2038 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2040
2041 $self->in_memory (cf::MAP_ACTIVE);
2042 } 2333 }
2043 2334
2044 $self->post_load; 2335 $self->post_load;
2045}
2046 2336
2337 1
2338}
2339
2340# customize the map for a given player, i.e.
2341# return the _real_ map. used by e.g. per-player
2342# maps to change the path to ~playername/mappath
2047sub customise_for { 2343sub customise_for {
2048 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2049 2345
2050 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2051 if $self->per_player; 2347 if $self->per_player;
2054# if $self->per_party; 2350# if $self->per_party;
2055 2351
2056 $self 2352 $self
2057} 2353}
2058 2354
2059# find and load all maps in the 3x3 area around a map
2060sub load_neighbours {
2061 my ($map) = @_;
2062
2063 my @neigh; # diagonal neighbours
2064
2065 for (0 .. 3) {
2066 my $neigh = $map->tile_path ($_)
2067 or next;
2068 $neigh = find $neigh, $map
2069 or next;
2070 $neigh->load;
2071
2072 push @neigh,
2073 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2074 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2075 }
2076
2077 for (grep defined $_->[0], @neigh) {
2078 my ($path, $origin) = @$_;
2079 my $neigh = find $path, $origin
2080 or next;
2081 $neigh->load;
2082 }
2083}
2084
2085sub find_sync { 2355sub find_sync {
2086 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2087 2357
2088 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2089} 2363}
2090 2364
2091sub do_load_sync { 2365sub do_load_sync {
2092 my ($map) = @_; 2366 my ($map) = @_;
2093 2367
2368 # it's a bug to call this from the main context
2094 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2095 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2096 2371
2097 cf::sync_job { $map->load }; 2372 $map->load;
2098} 2373}
2099 2374
2100our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2101our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2102 2377
2103sub find_async { 2378sub find_async {
2104 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2105 2380
2106 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2107 2382
2108 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2110 } 2385 }
2111 2386
2112 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2113 2388
2114 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2128 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2129 2404
2130 () 2405 ()
2131} 2406}
2132 2407
2408# common code, used by both ->save and ->swapout
2133sub save { 2409sub _save {
2134 my ($self) = @_; 2410 my ($self) = @_;
2135
2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
2137 2411
2138 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2139 2413
2140 return unless $self->dirty; 2414 return unless $self->dirty;
2141 2415
2161 } else { 2435 } else {
2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2436 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2163 } 2437 }
2164} 2438}
2165 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2166sub swap_out { 2448sub swap_out {
2167 my ($self) = @_; 2449 my ($self) = @_;
2168 2450
2169 # save first because save cedes
2170 $self->save;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2174 return if $self->players; 2455 return if $self->players;
2175 return if $self->in_memory != cf::MAP_ACTIVE; 2456
2457 # first deactivate the map and "unlink" it from the core
2458 $self->deactivate;
2459 $_->clear_links_to ($self) for values %cf::MAP;
2460 $self->state (cf::MAP_SWAPPED);
2461
2462 # then atomically save
2463 $self->_save;
2464
2465 # then free the map
2466 $self->clear;
2467}
2468
2469sub reset_at {
2470 my ($self) = @_;
2471
2472 # TODO: safety, remove and allow resettable per-player maps
2176 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2177 2474
2475 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2476 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2477
2478 $time + $to
2479}
2480
2481sub should_reset {
2482 my ($self) = @_;
2483
2484 $self->reset_at <= $cf::RUNTIME
2485}
2486
2487sub reset {
2488 my ($self) = @_;
2489
2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2491
2492 return if $self->players;
2493
2494 cf::trace "resetting map ", $self->path, "\n";
2495
2178 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2497
2498 # need to save uniques path
2499 unless ($self->{deny_save}) {
2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2501
2502 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2503 if $uniq;
2504 }
2505
2506 delete $cf::MAP{$self->path};
2179 2507
2180 $self->deactivate; 2508 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->clear; 2510 $self->clear;
2183}
2184
2185sub reset_at {
2186 my ($self) = @_;
2187
2188 # TODO: safety, remove and allow resettable per-player maps
2189 return 1e99 if $self->{deny_reset};
2190
2191 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2192 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2193
2194 $time + $to
2195}
2196
2197sub should_reset {
2198 my ($self) = @_;
2199
2200 $self->reset_at <= $cf::RUNTIME
2201}
2202
2203sub reset {
2204 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207
2208 return if $self->players;
2209
2210 warn "resetting map ", $self->path;
2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 # need to save uniques path
2215 unless ($self->{deny_save}) {
2216 my $uniq = $self->uniq_path; utf8::encode $uniq;
2217
2218 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2219 if $uniq;
2220 }
2221
2222 delete $cf::MAP{$self->path};
2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
2226 $self->clear;
2227 2511
2228 $self->unlink_save; 2512 $self->unlink_save;
2229 $self->destroy; 2513 $self->destroy;
2230} 2514}
2231 2515
2239 2523
2240 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2241 2525
2242 $self->unlink_save; 2526 $self->unlink_save;
2243 2527
2244 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2245 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2246 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2247 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2249 2533
2306 : normalise $_ 2590 : normalise $_
2307 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2308 ] 2592 ]
2309} 2593}
2310 2594
2595=item cf::map::static_maps
2596
2597Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2598file in the shared directory excluding F</styles> and F</editor>). May
2599block.
2600
2601=cut
2602
2603sub static_maps() {
2604 my @dirs = "";
2605 my @maps;
2606
2607 while (@dirs) {
2608 my $dir = shift @dirs;
2609
2610 next if $dir eq "/styles" || $dir eq "/editor";
2611
2612 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2613 or return;
2614
2615 for (@$files) {
2616 s/\.map$// or next;
2617 utf8::decode $_;
2618 push @maps, "$dir/$_";
2619 }
2620
2621 push @dirs, map "$dir/$_", @$dirs;
2622 }
2623
2624 \@maps
2625}
2626
2311=back 2627=back
2312 2628
2313=head3 cf::object 2629=head3 cf::object
2314 2630
2315=cut 2631=cut
2380 2696
2381our $SAY_CHANNEL = { 2697our $SAY_CHANNEL = {
2382 id => "say", 2698 id => "say",
2383 title => "Map", 2699 title => "Map",
2384 reply => "say ", 2700 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2701 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2386}; 2702};
2387 2703
2388our $CHAT_CHANNEL = { 2704our $CHAT_CHANNEL = {
2389 id => "chat", 2705 id => "chat",
2390 title => "Chat", 2706 title => "Chat",
2445 2761
2446=item $player_object->enter_link 2762=item $player_object->enter_link
2447 2763
2448Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2449 2765
2450The player should be reasonably safe there for short amounts of time. You 2766The player should be reasonably safe there for short amounts of time (e.g.
2451I<MUST> call C<leave_link> as soon as possible, though. 2767for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2768though, as the player cannot control the character while it is on the link
2769map.
2452 2770
2453Will never block. 2771Will never block.
2454 2772
2455=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2456 2774
2476sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2477 my ($self) = @_; 2795 my ($self) = @_;
2478 2796
2479 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2480 2798
2799 ++$self->{_link_recursion};
2800
2481 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2482 2802
2483 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2484 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2485 2805
2486 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2487} 2807}
2488 2808
2489sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2490 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2491 2811
2508 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2509 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2510 2830
2511 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2512 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2513 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2514 2834
2515 $map->load; 2835 $map->load;
2516 $map->load_neighbours;
2517 2836
2518 return unless $self->contr->active; 2837 return unless $self->contr->active;
2519 $self->activate_recursive;
2520 2838
2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2523} 2841 # entering was successful
2842 delete $self->{_link_recursion};
2843 # only activate afterwards, to support waiting in hooks
2844 $self->activate_recursive;
2845 }
2524 2846
2847}
2848
2525=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2526 2850
2527Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2528her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2529that has to return the map if sucecssful, and then unfreezes the player on 2853that has to return the map if sucecssful, and then unfreezes the player on
2530the new (success) or old (failed) map position. In either case, $done will 2854the new (success) or old (failed) map position. In either case, $done will
2537 2861
2538our $GOTOGEN; 2862our $GOTOGEN;
2539 2863
2540sub cf::object::player::goto { 2864sub cf::object::player::goto {
2541 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2542 2872
2543 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2545 2875
2546 $self->enter_link; 2876 $self->enter_link;
2566 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2567 } 2897 }
2568 } 2898 }
2569 2899
2570 my $map = eval { 2900 my $map = eval {
2571 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2572 2902
2573 if ($map) { 2903 if ($map) {
2574 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2575 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2576 } else { 2906 } else {
2577 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 } 2908 }
2579 2909
2580 $map 2910 $map
2588 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2589 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2590 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2591 } 2921 }
2592 2922
2593 $done->() if $done; 2923 $done->($self) if $done;
2594 })->prio (1); 2924 })->prio (1);
2595} 2925}
2596 2926
2597=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2598 2928
2666 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2667 2997
2668 unless (eval { 2998 unless (eval {
2669 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2670 3000
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2680 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2682 3027
2683 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2684 3029
2685 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED); 3032 if $exit->flag (cf::FLAG_DAMNED);
2688 3033
2689 1 3034 1
2690 }) { 3035 }) {
2691 $self->message ("Something went wrong deep within the crossfire server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2692 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2693 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2694 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2695 3040
2696 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2697 $self->leave_link; 3042 $self->leave_link;
2698 } 3043 }
2699 })->prio (1); 3044 })->prio (1);
2700} 3045}
2701 3046
2713sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2714 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2715 3060
2716 utf8::encode $text; 3061 utf8::encode $text;
2717 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3062 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3063}
3064
3065=item $client->send_big_packet ($pkt)
3066
3067Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required.
3069
3070=cut
3071
3072our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3073
3074sub cf::client::send_big_packet {
3075 my ($self, $pkt) = @_;
3076
3077 # try lzf for large packets
3078 $pkt = "lzf " . Compress::LZF::compress $pkt
3079 if 1024 <= length $pkt and $self->{can_lzf};
3080
3081 # split very large packets
3082 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3083 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3084 $pkt = "frag";
3085 }
3086
3087 $self->send_packet ($pkt);
2718} 3088}
2719 3089
2720=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2721 3091
2722Send a drawinfo or msg packet to the client, formatting the msg for the 3092Send a drawinfo or msg packet to the client, formatting the msg for the
2726 3096
2727=cut 3097=cut
2728 3098
2729# non-persistent channels (usually the info channel) 3099# non-persistent channels (usually the info channel)
2730our %CHANNEL = ( 3100our %CHANNEL = (
3101 "c/motd" => {
3102 id => "infobox",
3103 title => "MOTD",
3104 reply => undef,
3105 tooltip => "The message of the day",
3106 },
2731 "c/identify" => { 3107 "c/identify" => {
2732 id => "infobox", 3108 id => "infobox",
2733 title => "Identify", 3109 title => "Identify",
2734 reply => undef, 3110 reply => undef,
2735 tooltip => "Items recently identified", 3111 tooltip => "Items recently identified",
2737 "c/examine" => { 3113 "c/examine" => {
2738 id => "infobox", 3114 id => "infobox",
2739 title => "Examine", 3115 title => "Examine",
2740 reply => undef, 3116 reply => undef,
2741 tooltip => "Signs and other items you examined", 3117 tooltip => "Signs and other items you examined",
3118 },
3119 "c/shopinfo" => {
3120 id => "infobox",
3121 title => "Shop Info",
3122 reply => undef,
3123 tooltip => "What your bargaining skill tells you about the shop",
2742 }, 3124 },
2743 "c/book" => { 3125 "c/book" => {
2744 id => "infobox", 3126 id => "infobox",
2745 title => "Book", 3127 title => "Book",
2746 reply => undef, 3128 reply => undef,
2762 id => "infobox", 3144 id => "infobox",
2763 title => "Body Parts", 3145 title => "Body Parts",
2764 reply => undef, 3146 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available", 3147 tooltip => "Shows which body parts you posess and are available",
2766 }, 3148 },
3149 "c/statistics" => {
3150 id => "infobox",
3151 title => "Statistics",
3152 reply => undef,
3153 tooltip => "Shows your primary statistics",
3154 },
3155 "c/skills" => {
3156 id => "infobox",
3157 title => "Skills",
3158 reply => undef,
3159 tooltip => "Shows your experience per skill and item power",
3160 },
3161 "c/shopitems" => {
3162 id => "infobox",
3163 title => "Shop Items",
3164 reply => undef,
3165 tooltip => "Shows the items currently for sale in this shop",
3166 },
3167 "c/resistances" => {
3168 id => "infobox",
3169 title => "Resistances",
3170 reply => undef,
3171 tooltip => "Shows your resistances",
3172 },
3173 "c/pets" => {
3174 id => "infobox",
3175 title => "Pets",
3176 reply => undef,
3177 tooltip => "Shows information abotu your pets/a specific pet",
3178 },
3179 "c/perceiveself" => {
3180 id => "infobox",
3181 title => "Perceive Self",
3182 reply => undef,
3183 tooltip => "You gained detailed knowledge about yourself",
3184 },
2767 "c/uptime" => { 3185 "c/uptime" => {
2768 id => "infobox", 3186 id => "infobox",
2769 title => "Uptime", 3187 title => "Uptime",
2770 reply => undef, 3188 reply => undef,
2771 tooltip => "How long the server has been running since last restart", 3189 tooltip => "How long the server has been running since last restart",
2780 id => "party", 3198 id => "party",
2781 title => "Party", 3199 title => "Party",
2782 reply => "gsay ", 3200 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party", 3201 tooltip => "Messages and chat related to your party",
2784 }, 3202 },
3203 "c/death" => {
3204 id => "death",
3205 title => "Death",
3206 reply => undef,
3207 tooltip => "Reason for and more info about your most recent death",
3208 },
3209 "c/say" => $SAY_CHANNEL,
3210 "c/chat" => $CHAT_CHANNEL,
2785); 3211);
2786 3212
2787sub cf::client::send_msg { 3213sub cf::client::send_msg {
2788 my ($self, $channel, $msg, $color, @extra) = @_; 3214 my ($self, $channel, $msg, $color, @extra) = @_;
2789 3215
2790 $msg = $self->pl->expand_cfpod ($msg); 3216 $msg = $self->pl->expand_cfpod ($msg)
3217 unless $color & cf::NDI_VERBATIM;
2791 3218
2792 $color &= cf::NDI_CLIENT_MASK; # just in case... 3219 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793 3220
2794 # check predefined channels, for the benefit of C 3221 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) { 3222 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel}; 3223 $channel = $CHANNEL{$channel};
2797 3224
2798 $self->ext_msg (channel_info => $channel) 3225 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id}; 3226 $channel = $channel->{id};
2802 3227
2803 } elsif (ref $channel) { 3228 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent 3229 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) { 3230 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel; 3231 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel) 3232 $self->ext_msg (channel_info => $channel);
2808 if $self->can_msg;
2809 } 3233 }
2810 3234
2811 $channel = $channel->{id}; 3235 $channel = $channel->{id};
2812 } 3236 }
2813 3237
2814 return unless @extra || length $msg; 3238 return unless @extra || length $msg;
2815 3239
2816 if ($self->can_msg) {
2817 # default colour, mask it out 3240 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3241 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF; 3242 if $color & cf::NDI_DEF;
2820 3243
2821 my $pkt = "msg " 3244 my $pkt = "msg "
2822 . $self->{json_coder}->encode ( 3245 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 ); 3247 );
2825 3248
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt); 3249 $self->send_big_packet ($pkt);
2837 } else {
2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2856 } else {
2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2858 $self->send_packet ("drawinfo $color $msg")
2859 }
2860 }
2861 }
2862} 3250}
2863 3251
2864=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2865 3253
2866Sends an ext event to the client. 3254Sends an ext event to the client.
2868=cut 3256=cut
2869 3257
2870sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2871 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2872 3260
2873 if ($self->extcmd == 2) {
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2875 } elsif ($self->extcmd == 1) { # TODO: remove
2876 push @msg, msgtype => "event_$type";
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 }
2879}
2880
2881=item $client->ext_reply ($msgid, @msg)
2882
2883Sends an ext reply to the client.
2884
2885=cut
2886
2887sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_;
2889
2890 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id;
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2896 }
2897} 3262}
2898 3263
2899=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2900 3265
2901Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
2956 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
2957 3322
2958 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2959 3324
2960 if (ref $msg) { 3325 if (ref $msg) {
2961 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2962 "ARRAY" eq ref $msg
2963 ? @$msg
2964 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2965 3327
2966 my @reply;
2967
2968 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
2969 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
2970 } 3346 }
2971
2972 $ns->ext_reply ($reply, @reply)
2973 if $reply;
2974
2975 } else { 3347 } else {
2976 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2977 } 3349 }
2978 3350
2979 cf::override; 3351 cf::override;
2980 }, 3352 },
2981); 3353);
3001 3373
3002 $coro 3374 $coro
3003} 3375}
3004 3376
3005cf::client->attach ( 3377cf::client->attach (
3006 on_destroy => sub { 3378 on_client_destroy => sub {
3007 my ($ns) = @_; 3379 my ($ns) = @_;
3008 3380
3009 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3010 }, 3382 },
3011); 3383);
3027our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3028 3400
3029$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3030 3402
3031$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3033 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3034 sort time 3406 sort time
3035)); 3407));
3036 3408
3037# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3041The following functions and methods are available within a safe environment: 3413The following functions and methods are available within a safe environment:
3042 3414
3043 cf::object 3415 cf::object
3044 contr pay_amount pay_player map x y force_find force_add destroy 3416 contr pay_amount pay_player map x y force_find force_add destroy
3045 insert remove name archname title slaying race decrease split 3417 insert remove name archname title slaying race decrease split
3418 value
3046 3419
3047 cf::object::player 3420 cf::object::player
3048 player 3421 player
3049 3422
3050 cf::player 3423 cf::player
3056=cut 3429=cut
3057 3430
3058for ( 3431for (
3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3432 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3060 insert remove inv nrof name archname title slaying race 3433 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3062 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3063 ["cf::player" => qw(peaceful)], 3436 ["cf::player" => qw(peaceful send_msg)],
3064 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3065) { 3438) {
3066 no strict 'refs';
3067 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3068 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3069 for @funs; 3441 for @funs;
3070} 3442}
3071 3443
3086 3458
3087 my $qcode = $code; 3459 my $qcode = $code;
3088 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3089 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3090 3462
3463 %vars = (_dummy => 0) unless %vars;
3464
3465 my @res;
3091 local $_; 3466 local $_;
3092 local @safe::cf::_safe_eval_args = values %vars;
3093 3467
3094 my $eval = 3468 my $eval =
3095 "do {\n" 3469 "do {\n"
3096 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3097 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3098 . $code 3472 . $code
3099 . "\n}" 3473 . "\n}"
3100 ; 3474 ;
3101 3475
3476 if ($CFG{safe_eval}) {
3102 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3103 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3104 sub_generation_inc; 3480 sub_generation_inc;
3481 } else {
3482 local @cf::_safe_eval_args = values %vars;
3483 @res = wantarray ? eval eval : scalar eval $eval;
3484 }
3105 3485
3106 if ($@) { 3486 if ($@) {
3107 warn "$@"; 3487 warn "$@",
3108 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3109 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3110 } 3490 }
3111 3491
3112 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3113} 3493}
3114 3494
3128=cut 3508=cut
3129 3509
3130sub register_script_function { 3510sub register_script_function {
3131 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3132 3512
3133 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3134 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3135} 3515}
3136 3516
3137=back 3517=back
3138 3518
3139=cut 3519=cut
3140 3520
3141############################################################################# 3521#############################################################################
3142# the server's init and main functions 3522# the server's init and main functions
3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525
3526# internal api, not fianlised
3527sub set_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3143 3547
3144sub load_facedata($) { 3548sub load_facedata($) {
3145 my ($path) = @_; 3549 my ($path) = @_;
3146 3550
3147 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3148 # for this (global event?) 3552 # for this (global event?)
3149 %ext::player_env::MUSIC_FACE_CACHE = (); 3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3150 3554
3151 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3152 3556
3153 warn "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3154 3558
3155 my $facedata; 3559 my $facedata = decode_storable load_file $path;
3156 0 < aio_load $path, $facedata
3157 or die "$path: $!";
3158
3159 $facedata = Coro::Storable::thaw $facedata;
3160 3560
3161 $facedata->{version} == 2 3561 $facedata->{version} == 2
3162 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3163 3563
3164 # patch in the exptable
3165 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC,
3167 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3168 };
3169 cf::cede_to_tick; 3564 cf::cede_to_tick;
3170 3565
3171 { 3566 {
3172 my $faces = $facedata->{faceinfo}; 3567 my $faces = delete $facedata->{faceinfo};
3173 3568
3174 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3175 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176 3572
3177 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3178 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3181 3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3579
3182 cf::cede_to_tick; 3580 cf::cede_to_tick;
3183 } 3581 }
3184 3582
3185 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3186 next unless $info->{smooth}; 3584 next unless $info->{smooth};
3190 3588
3191 if (my $smooth = cf::face::find $info->{smooth}) { 3589 if (my $smooth = cf::face::find $info->{smooth}) {
3192 cf::face::set_smooth $idx, $smooth; 3590 cf::face::set_smooth $idx, $smooth;
3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3194 } else { 3592 } else {
3195 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3593 error "smooth face '$info->{smooth}' not found for face '$face'";
3196 } 3594 }
3197 3595
3198 cf::cede_to_tick; 3596 cf::cede_to_tick;
3199 } 3597 }
3200 } 3598 }
3201 3599
3202 { 3600 {
3203 my $anims = $facedata->{animinfo}; 3601 my $anims = delete $facedata->{animinfo};
3204 3602
3205 while (my ($anim, $info) = each %$anims) { 3603 while (my ($anim, $info) = each %$anims) {
3206 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3604 cf::anim::set $anim, $info->{frames}, $info->{facings};
3207 cf::cede_to_tick; 3605 cf::cede_to_tick;
3208 } 3606 }
3209 3607
3210 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3211 } 3609 }
3212 3610
3213 { 3611 {
3214 # TODO: for gcfclient pleasure, we should give resources
3215 # that gcfclient doesn't grok a >10000 face index.
3216 my $res = $facedata->{resource}; 3612 my $res = delete $facedata->{resource};
3217 3613
3218 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) { 3615 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3220 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
3222 3618
3223 if ($info->{type} & 1) {
3224 # prepend meta info
3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type}; 3619 cf::face::set_type $idx, $type;
3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d#
3238 } else { 3623 } else {
3239 $RESOURCE{$name} = $info; 3624# $RESOURCE{$name} = $info; # unused
3240 } 3625 }
3241 3626
3242 cf::cede_to_tick; 3627 cf::cede_to_tick;
3243 } 3628 }
3244 } 3629 }
3245 3630
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3247 3632
3248 1 3633 1
3249} 3634}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3270 3635
3271register_exticmd fx_want => sub { 3636register_exticmd fx_want => sub {
3272 my ($ns, $want) = @_; 3637 my ($ns, $want) = @_;
3273 3638
3274 while (my ($k, $v) = each %$want) { 3639 while (my ($k, $v) = each %$want) {
3282 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3284 cf::arch::commit_load; 3649 cf::arch::commit_load;
3285 3650
3286 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 set_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3287} 3665}
3288 3666
3289sub reload_regions { 3667sub reload_regions {
3290 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3291 # for this (global event?) 3669 # for this (global event?)
3306} 3684}
3307 3685
3308sub reload_archetypes { 3686sub reload_archetypes {
3309 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3310 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 set_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 set_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3311} 3698}
3312 3699
3313sub reload_treasures { 3700sub reload_treasures {
3314 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3315 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3316} 3703}
3317 3704
3705sub reload_sound {
3706 trace "loading sound config from $DATADIR/sound\n";
3707
3708 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3709
3710 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3711 my $sound = $soundconf->{compat}[$_]
3712 or next;
3713
3714 my $face = cf::face::find "sound/$sound->[1]";
3715 cf::sound::set $sound->[0] => $face;
3716 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3717 }
3718
3719 while (my ($k, $v) = each %{$soundconf->{event}}) {
3720 my $face = cf::face::find "sound/$v";
3721 cf::sound::set $k => $face;
3722 }
3723}
3724
3318sub reload_resources { 3725sub reload_resources {
3319 warn "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3320 3727
3728 reload_materials;
3321 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3731 reload_sound;
3322 reload_archetypes; 3732 reload_archetypes;
3323 reload_regions; 3733 reload_regions;
3324 reload_treasures; 3734 reload_treasures;
3325 3735
3326 warn "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3327}
3328
3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3334 reload_resources;
3335} 3737}
3336 3738
3337sub reload_config { 3739sub reload_config {
3338 open my $fh, "<:utf8", "$CONFDIR/config" 3740 trace "reloading config file...\n";
3339 or return;
3340 3741
3341 local $/; 3742 my $config = load_file "$CONFDIR/config";
3342 *CFG = YAML::Load <$fh>; 3743 utf8::decode $config;
3744 *CFG = decode_yaml $config;
3343 3745
3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3345 3747
3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3348 3750
3349 if (exists $CFG{mlockall}) { 3751 if (exists $CFG{mlockall}) {
3353 }; 3755 };
3354 warn $@ if $@; 3756 warn $@ if $@;
3355 } 3757 }
3356} 3758}
3357 3759
3760sub pidfile() {
3761 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3762 or die "$PIDFILE: $!";
3763 flock $fh, &Fcntl::LOCK_EX
3764 or die "$PIDFILE: flock: $!";
3765 $fh
3766}
3767
3768# make sure only one server instance is running at any one time
3769sub atomic {
3770 my $fh = pidfile;
3771
3772 my $pid = <$fh>;
3773 kill 9, $pid if $pid > 0;
3774
3775 seek $fh, 0, 0;
3776 print $fh $$;
3777}
3778
3779sub main_loop {
3780 trace "EV::loop starting\n";
3781 if (1) {
3782 EV::loop;
3783 }
3784 trace "EV::loop returned\n";
3785 goto &main_loop unless $REALLY_UNLOOP;
3786}
3787
3358sub main { 3788sub main {
3789 cf::init_globals; # initialise logging
3790
3791 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3792 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3793 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3795
3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3797
3359 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3360 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3362 (async { 3801 (async {
3363 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3365 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
3366 }; 3805 };
3367 3806
3368 { 3807 evthread_start IO::AIO::poll_fileno;
3369 my $guard = freeze_mainloop; 3808
3809 cf::sync_job {
3810 cf::incloader::init ();
3811
3812 db_init;
3813
3814 cf::init_anim;
3815 cf::init_attackmess;
3816 cf::init_dynamic;
3817
3818 cf::load_settings;
3819
3820 reload_resources;
3370 reload_config; 3821 reload_config;
3371 db_init; 3822
3823 cf::init_uuid;
3824 cf::init_signals;
3825 cf::init_skills;
3826
3827 cf::init_beforeplay;
3828
3829 atomic;
3830
3372 load_extensions; 3831 load_extensions;
3373 3832
3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3833 utime time, time, $RUNTIMEFILE;
3834
3835 # no (long-running) fork's whatsoever before this point(!)
3836 use POSIX ();
3837 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3838
3839 cf::_post_init 0;
3375 } 3840 };
3376 3841
3377 EV::loop; 3842 cf::object::thawer::errors_are_fatal 0;
3843 info "parse errors in files are no longer fatal from this point on.\n";
3844
3845 AE::postpone {
3846 undef &main; # free gobs of memory :)
3847 };
3848
3849 goto &main_loop;
3378} 3850}
3379 3851
3380############################################################################# 3852#############################################################################
3381# initialisation and cleanup 3853# initialisation and cleanup
3382 3854
3383# install some emergency cleanup handlers 3855# install some emergency cleanup handlers
3384BEGIN { 3856BEGIN {
3385 our %SIGWATCHER = (); 3857 our %SIGWATCHER = ();
3386 for my $signal (qw(INT HUP TERM)) { 3858 for my $signal (qw(INT HUP TERM)) {
3387 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3859 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3388 cf::cleanup "SIG$signal"; 3860 cf::cleanup "SIG$signal";
3389 }; 3861 };
3390 } 3862 }
3391} 3863}
3392 3864
3393sub write_runtime_sync { 3865sub write_runtime_sync {
3394 my $runtime = "$LOCALDIR/runtime"; 3866 my $t0 = AE::time;
3395 3867
3396 # first touch the runtime file to show we are still running: 3868 # first touch the runtime file to show we are still running:
3397 # the fsync below can take a very very long time. 3869 # the fsync below can take a very very long time.
3398 3870
3399 IO::AIO::aio_utime $runtime, undef, undef; 3871 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400 3872
3401 my $guard = cf::lock_acquire "write_runtime"; 3873 my $guard = cf::lock_acquire "write_runtime";
3402 3874
3403 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3875 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3404 or return; 3876 or return;
3405 3877
3406 my $value = $cf::RUNTIME + 90 + 10; 3878 my $value = $cf::RUNTIME + 90 + 10;
3407 # 10 is the runtime save interval, for a monotonic clock 3879 # 10 is the runtime save interval, for a monotonic clock
3408 # 60 allows for the watchdog to kill the server. 3880 # 60 allows for the watchdog to kill the server.
3418 aio_utime $fh, undef, undef; 3890 aio_utime $fh, undef, undef;
3419 3891
3420 close $fh 3892 close $fh
3421 or return; 3893 or return;
3422 3894
3423 aio_rename "$runtime~", $runtime 3895 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424 and return; 3896 and return;
3425 3897
3426 warn "runtime file written.\n"; 3898 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3427 3899
3428 1 3900 1
3429} 3901}
3430 3902
3431our $uuid_lock; 3903our $uuid_lock;
3440 my $uuid = "$LOCALDIR/uuid"; 3912 my $uuid = "$LOCALDIR/uuid";
3441 3913
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3914 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return; 3915 or return;
3444 3916
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3917 my $value = uuid_seq uuid_cur;
3918
3919 unless ($value) {
3920 info "cowardly refusing to write zero uuid value!\n";
3921 return;
3922 }
3923
3924 my $value = uuid_str $value + $uuid_skip;
3446 $uuid_skip = 0; 3925 $uuid_skip = 0;
3447 3926
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3927 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return; 3928 and return;
3450 3929
3456 or return; 3935 or return;
3457 3936
3458 aio_rename "$uuid~", $uuid 3937 aio_rename "$uuid~", $uuid
3459 and return; 3938 and return;
3460 3939
3461 warn "uuid file written ($value).\n"; 3940 trace "uuid file written ($value).\n";
3462 3941
3463 1 3942 1
3464 3943
3465} 3944}
3466 3945
3472} 3951}
3473 3952
3474sub emergency_save() { 3953sub emergency_save() {
3475 my $freeze_guard = cf::freeze_mainloop; 3954 my $freeze_guard = cf::freeze_mainloop;
3476 3955
3477 warn "enter emergency perl save\n"; 3956 info "emergency_perl_save: enter\n";
3957
3958 # this is a trade-off: we want to be very quick here, so
3959 # save all maps without fsync, and later call a global sync
3960 # (which in turn might be very very slow)
3961 local $USE_FSYNC = 0;
3478 3962
3479 cf::sync_job { 3963 cf::sync_job {
3964 cf::write_runtime_sync; # external watchdog should not bark
3965
3480 # use a peculiar iteration method to avoid tripping on perl 3966 # use a peculiar iteration method to avoid tripping on perl
3481 # refcount bugs in for. also avoids problems with players 3967 # refcount bugs in for. also avoids problems with players
3482 # and maps saved/destroyed asynchronously. 3968 # and maps saved/destroyed asynchronously.
3483 warn "begin emergency player save\n"; 3969 info "emergency_perl_save: begin player save\n";
3484 for my $login (keys %cf::PLAYER) { 3970 for my $login (keys %cf::PLAYER) {
3485 my $pl = $cf::PLAYER{$login} or next; 3971 my $pl = $cf::PLAYER{$login} or next;
3486 $pl->valid or next; 3972 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3973 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488 $pl->save; 3974 $pl->save;
3489 } 3975 }
3490 warn "end emergency player save\n"; 3976 info "emergency_perl_save: end player save\n";
3491 3977
3492 warn "begin emergency map save\n"; 3978 cf::write_runtime_sync; # external watchdog should not bark
3979
3980 info "emergency_perl_save: begin map save\n";
3493 for my $path (keys %cf::MAP) { 3981 for my $path (keys %cf::MAP) {
3494 my $map = $cf::MAP{$path} or next; 3982 my $map = $cf::MAP{$path} or next;
3495 $map->valid or next; 3983 $map->valid or next;
3496 $map->save; 3984 $map->save;
3497 } 3985 }
3498 warn "end emergency map save\n"; 3986 info "emergency_perl_save: end map save\n";
3499 3987
3500 warn "begin emergency database checkpoint\n"; 3988 cf::write_runtime_sync; # external watchdog should not bark
3989
3990 info "emergency_perl_save: begin database checkpoint\n";
3501 BDB::db_env_txn_checkpoint $DB_ENV; 3991 BDB::db_env_txn_checkpoint $DB_ENV;
3502 warn "end emergency database checkpoint\n"; 3992 info "emergency_perl_save: end database checkpoint\n";
3503 3993
3504 warn "begin write uuid\n"; 3994 info "emergency_perl_save: begin write uuid\n";
3505 write_uuid_sync 1; 3995 write_uuid_sync 1;
3506 warn "end write uuid\n"; 3996 info "emergency_perl_save: end write uuid\n";
3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 trace "emergency_perl_save: syncing database to disk";
4001 BDB::db_env_txn_checkpoint $DB_ENV;
4002
4003 info "emergency_perl_save: starting sync\n";
4004 IO::AIO::aio_sync sub {
4005 info "emergency_perl_save: finished sync\n";
4006 };
4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 trace "emergency_perl_save: flushing outstanding aio requests";
4011 while (IO::AIO::nreqs || BDB::nreqs) {
4012 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4013 }
4014
4015 cf::write_runtime_sync; # external watchdog should not bark
3507 }; 4016 };
3508 4017
3509 warn "leave emergency perl save\n"; 4018 info "emergency_perl_save: leave\n";
3510} 4019}
3511 4020
3512sub post_cleanup { 4021sub post_cleanup {
3513 my ($make_core) = @_; 4022 my ($make_core) = @_;
3514 4023
4024 IO::AIO::flush;
4025
3515 warn Carp::longmess "post_cleanup backtrace" 4026 error Carp::longmess "post_cleanup backtrace"
3516 if $make_core; 4027 if $make_core;
4028
4029 my $fh = pidfile;
4030 unlink $PIDFILE if <$fh> == $$;
3517} 4031}
3518 4032
3519# a safer delete_package, copied from Symbol 4033# a safer delete_package, copied from Symbol
3520sub clear_package($) { 4034sub clear_package($) {
3521 my $pkg = shift; 4035 my $pkg = shift;
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4051 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) { 4052 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"}; 4053 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4054# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 } 4055 }
3542 warn "cleared package #$pkg\n";#d#
3543} 4056}
3544
3545our $RELOAD; # how many times to reload
3546 4057
3547sub do_reload_perl() { 4058sub do_reload_perl() {
3548 # can/must only be called in main 4059 # can/must only be called in main
3549 if ($Coro::current != $Coro::main) { 4060 unless (in_main) {
3550 warn "can only reload from main coroutine"; 4061 error "can only reload from main coroutine";
3551 return; 4062 return;
3552 } 4063 }
3553 4064
3554 return if $RELOAD++; 4065 return if $RELOAD++;
3555 4066
4067 my $t1 = AE::time;
4068
3556 while ($RELOAD) { 4069 while ($RELOAD) {
3557 warn "reloading..."; 4070 cf::get_slot 0.1, -1, "reload_perl";
4071 info "perl_reload: reloading...";
3558 4072
3559 warn "entering sync_job"; 4073 trace "perl_reload: entering sync_job";
3560 4074
3561 cf::sync_job { 4075 cf::sync_job {
3562 cf::write_runtime_sync; # external watchdog should not bark
3563 cf::emergency_save; 4076 #cf::emergency_save;
3564 cf::write_runtime_sync; # external watchdog should not bark
3565 4077
3566 warn "syncing database to disk";
3567 BDB::db_env_txn_checkpoint $DB_ENV;
3568
3569 # if anything goes wrong in here, we should simply crash as we already saved
3570
3571 warn "flushing outstanding aio requests";
3572 while (IO::AIO::nreqs || BDB::nreqs) {
3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 warn "cancelling all extension coros"; 4078 trace "perl_reload: cancelling all extension coros";
3577 $_->cancel for values %EXT_CORO; 4079 $_->cancel for values %EXT_CORO;
3578 %EXT_CORO = (); 4080 %EXT_CORO = ();
3579 4081
3580 warn "removing commands"; 4082 trace "perl_reload: removing commands";
3581 %COMMAND = (); 4083 %COMMAND = ();
3582 4084
3583 warn "removing ext/exti commands"; 4085 trace "perl_reload: removing ext/exti commands";
3584 %EXTCMD = (); 4086 %EXTCMD = ();
3585 %EXTICMD = (); 4087 %EXTICMD = ();
3586 4088
3587 warn "unloading/nuking all extensions"; 4089 trace "perl_reload: unloading/nuking all extensions";
3588 for my $pkg (@EXTS) { 4090 for my $pkg (@EXTS) {
3589 warn "... unloading $pkg"; 4091 trace "... unloading $pkg";
3590 4092
3591 if (my $cb = $pkg->can ("unload")) { 4093 if (my $cb = $pkg->can ("unload")) {
3592 eval { 4094 eval {
3593 $cb->($pkg); 4095 $cb->($pkg);
3594 1 4096 1
3595 } or warn "$pkg unloaded, but with errors: $@"; 4097 } or error "$pkg unloaded, but with errors: $@";
3596 } 4098 }
3597 4099
3598 warn "... clearing $pkg"; 4100 trace "... clearing $pkg";
3599 clear_package $pkg; 4101 clear_package $pkg;
3600 } 4102 }
3601 4103
3602 warn "unloading all perl modules loaded from $LIBDIR"; 4104 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) { 4105 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4106 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605 4107
3606 warn "... unloading $k"; 4108 trace "... unloading $k";
3607 delete $INC{$k}; 4109 delete $INC{$k};
3608 4110
3609 $k =~ s/\.pm$//; 4111 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g; 4112 $k =~ s/\//::/g;
3611 4113
3614 } 4116 }
3615 4117
3616 clear_package $k; 4118 clear_package $k;
3617 } 4119 }
3618 4120
3619 warn "getting rid of safe::, as good as possible"; 4121 trace "perl_reload: getting rid of safe::, as good as possible";
3620 clear_package "safe::$_" 4122 clear_package "safe::$_"
3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4123 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3622 4124
3623 warn "unloading cf.pm \"a bit\""; 4125 trace "perl_reload: unloading cf.pm \"a bit\"";
3624 delete $INC{"cf.pm"}; 4126 delete $INC{"cf.pm"};
3625 delete $INC{"cf/pod.pm"}; 4127 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626 4128
3627 # don't, removes xs symbols, too, 4129 # don't, removes xs symbols, too,
3628 # and global variables created in xs 4130 # and global variables created in xs
3629 #clear_package __PACKAGE__; 4131 #clear_package __PACKAGE__;
3630 4132
3631 warn "unload completed, starting to reload now"; 4133 info "perl_reload: unload completed, starting to reload now";
3632 4134
3633 warn "reloading cf.pm"; 4135 trace "perl_reload: reloading cf.pm";
3634 require cf; 4136 require cf;
3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4137 cf::_connect_to_perl_1;
3636 4138
3637 warn "loading config and database again"; 4139 trace "perl_reload: loading config and database again";
3638 cf::reload_config; 4140 cf::reload_config;
3639 4141
3640 warn "loading extensions"; 4142 trace "perl_reload: loading extensions";
3641 cf::load_extensions; 4143 cf::load_extensions;
3642 4144
4145 if ($REATTACH_ON_RELOAD) {
3643 warn "reattaching attachments to objects/players"; 4146 trace "perl_reload: reattaching attachments to objects/players";
3644 _global_reattach; # objects, sockets 4147 _global_reattach; # objects, sockets
3645 warn "reattaching attachments to maps"; 4148 trace "perl_reload: reattaching attachments to maps";
3646 reattach $_ for values %MAP; 4149 reattach $_ for values %MAP;
3647 warn "reattaching attachments to players"; 4150 trace "perl_reload: reattaching attachments to players";
3648 reattach $_ for values %PLAYER; 4151 reattach $_ for values %PLAYER;
4152 }
3649 4153
3650 warn "leaving sync_job"; 4154 cf::_post_init 1;
4155
4156 trace "perl_reload: leaving sync_job";
3651 4157
3652 1 4158 1
3653 } or do { 4159 } or do {
3654 warn $@; 4160 error $@;
3655 cf::cleanup "error while reloading, exiting."; 4161 cf::cleanup "perl_reload: error, exiting.";
3656 }; 4162 };
3657 4163
3658 warn "reloaded";
3659 --$RELOAD; 4164 --$RELOAD;
3660 } 4165 }
4166
4167 $t1 = AE::time - $t1;
4168 info "perl_reload: completed in ${t1}s\n";
3661}; 4169};
3662 4170
3663our $RELOAD_WATCHER; # used only during reload 4171our $RELOAD_WATCHER; # used only during reload
3664 4172
3665sub reload_perl() { 4173sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 4174 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 4175 # coro crashes during coro_state_free->destroy here.
3668 4176
4177 $RELOAD_WATCHER ||= cf::async {
4178 Coro::AIO::aio_wait cache_extensions;
4179
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4180 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4181 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4182 undef $RELOAD_WATCHER;
4183 };
3672 }; 4184 };
3673} 4185}
3674 4186
3675register_command "reload" => sub { 4187register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4188 my ($who, $arg) = @_;
3682 reload_perl; 4194 reload_perl;
3683 }; 4195 };
3684 } 4196 }
3685}; 4197};
3686 4198
3687unshift @INC, $LIBDIR; 4199#############################################################################
3688 4200
3689my $bug_warning = 0; 4201my $bug_warning = 0;
3690 4202
3691our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN;
3693
3694sub wait_for_tick { 4203sub wait_for_tick() {
3695 return if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3696 4205
3697 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
3698 push @WAIT_FOR_TICK, $signal;
3699 $signal->wait;
3700} 4207}
3701 4208
3702sub wait_for_tick_begin { 4209sub wait_for_tick_begin() {
3703 return if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3704 4211
3705 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
3706 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
3707 $signal->wait; 4214 $signal->wait;
3708} 4215}
3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4219 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3713 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
3714 return; 4221 return;
3715 } 4222 }
3716 4223
3717 cf::server_tick; # one server iteration 4224 cf::one_tick; # one server iteration
4225
4226 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3718 4227
3719 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4229 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3721 Coro::async_pool { 4230 Coro::async_pool {
3722 $Coro::current->{desc} = "runtime saver"; 4231 $Coro::current->{desc} = "runtime saver";
3723 write_runtime_sync 4232 write_runtime_sync
3724 or warn "ERROR: unable to write runtime file: $!"; 4233 or error "ERROR: unable to write runtime file: $!";
3725 }; 4234 };
3726 } 4235 }
3727 4236
3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3729 $sig->send; 4238 $sig->send;
3730 } 4239 }
3731 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
3732 $sig->send;
3733 }
3734 4241
3735 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3737 4244
3738 if (0) { 4245 if (0) {
3739 if ($NEXT_TICK) { 4246 if ($NEXT_TICK) {
3740 my $jitter = $TICK_START - $NEXT_TICK; 4247 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4248 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d# 4249 debug "jitter $JITTER\n";#d#
3743 } 4250 }
3744 } 4251 }
3745} 4252}
3746 4253
3747{ 4254{
3748 # configure BDB 4255 # configure BDB
4256 info "initialising database";
3749 4257
3750 BDB::min_parallel 8; 4258 BDB::min_parallel 16;
3751 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
3752 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
3753 4261
3754 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
3755 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3782 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3783 }; 4291 };
3784 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3785 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3786 }; 4294 };
4295
4296 info "database initialised";
3787} 4297}
3788 4298
3789{ 4299{
3790 # configure IO::AIO 4300 # configure IO::AIO
3791 4301
4302 info "initialising aio";
3792 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
3793 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
3794 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
3795} 4307}
3796 4308
3797my $_log_backtrace; 4309our $_log_backtrace;
4310our $_log_backtrace_last;
3798 4311
3799sub _log_backtrace { 4312sub _log_backtrace {
3800 my ($msg, @addr) = @_; 4313 my ($msg, @addr) = @_;
3801 4314
3802 $msg =~ s/\n//; 4315 $msg =~ s/\n$//;
3803 4316
4317 if ($_log_backtrace_last eq $msg) {
4318 LOG llevInfo, "[ABT] $msg\n";
4319 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3804 # limit the # of concurrent backtraces 4320 # limit the # of concurrent backtraces
3805 if ($_log_backtrace < 2) { 4321 } elsif ($_log_backtrace < 2) {
4322 $_log_backtrace_last = $msg;
3806 ++$_log_backtrace; 4323 ++$_log_backtrace;
4324 my $perl_bt = Carp::longmess $msg;
3807 async { 4325 async {
3808 $Coro::current->{desc} = "abt $msg"; 4326 $Coro::current->{desc} = "abt $msg";
3809 4327
3810 my @bt = fork_call { 4328 my @bt = fork_call {
3811 @addr = map { sprintf "%x", $_ } @addr; 4329 @addr = map { sprintf "%x", $_ } @addr;
3822 } 4340 }
3823 4341
3824 @funcs 4342 @funcs
3825 }; 4343 };
3826 4344
3827 LOG llevInfo, "[ABT] $msg\n"; 4345 LOG llevInfo, "[ABT] $perl_bt\n";
4346 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828 LOG llevInfo, "[ABT] $_\n" for @bt; 4347 LOG llevInfo, "[ABT] $_\n" for @bt;
3829 --$_log_backtrace; 4348 --$_log_backtrace;
3830 }; 4349 };
3831 } else { 4350 } else {
3832 LOG llevInfo, "[ABT] $msg\n"; 4351 LOG llevInfo, "[ABT] $msg\n";
3833 LOG llevInfo, "[ABT] [suppressed]\n"; 4352 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3834 } 4353 }
3835} 4354}
3836 4355
3837# load additional modules 4356# load additional modules
3838use cf::pod; 4357require "cf/$_.pm" for @EXTRA_MODULES;
4358cf::_connect_to_perl_2;
3839 4359
3840END { cf::emergency_save } 4360END { cf::emergency_save }
3841 4361
38421 43621
3843 4363

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines