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.434 by root, Thu May 29 03:27:37 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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
35 40
36use Coro (); 41use Coro ();
37use Coro::State; 42use Coro::State;
38use Coro::Handle; 43use Coro::Handle;
44use Coro::EV;
39use Coro::AnyEvent; 45use Coro::AnyEvent;
40use Coro::Timer; 46use Coro::Timer;
41use Coro::Signal; 47use Coro::Signal;
42use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
43use Coro::AnyEvent; 50use Coro::AnyEvent;
44use Coro::AIO; 51use Coro::AIO;
45use Coro::BDB; 52use Coro::BDB 1.6;
46use Coro::Storable; 53use Coro::Storable;
47use Coro::Util (); 54use Coro::Util ();
48 55
56use Guard ();
49use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
50use BDB (); 58use BDB ();
51use Data::Dumper; 59use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 60use Fcntl;
54use YAML (); 61use YAML::XS ();
55use IO::AIO (); 62use IO::AIO ();
56use Time::HiRes; 63use Time::HiRes;
57use Compress::LZF; 64use Compress::LZF;
58use Digest::MD5 (); 65use Digest::MD5 ();
59 66
60AnyEvent::detect; 67AnyEvent::detect;
61 68
62IO::AIO::max_poll_reqs 1;#d#
63
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';
245for my $pkg (qw( 335for my $pkg (qw(
246 cf::global cf::attachable 336 cf::global cf::attachable
247 cf::object cf::object::player 337 cf::object cf::object::player
248 cf::client cf::player 338 cf::client cf::player
249 cf::arch cf::living 339 cf::arch cf::living
340 cf::map cf::mapspace
250 cf::map cf::party cf::region 341 cf::party cf::region
251)) { 342)) {
252 no strict 'refs';
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 }
1088 1296
1089sub reattach { 1297sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1298 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1299 my ($obj) = @_;
1092 1300
1301 # no longer needed after getting rid of delete_package?
1093 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1302 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1094 1303
1095 my $registry = $obj->registry; 1304 my $registry = $obj->registry;
1096 1305
1097 @$registry = (); 1306 @$registry = ();
1098 1307
1103 for (@$attach) { 1312 for (@$attach) {
1104 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1105 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1106 } 1315 }
1107 } else { 1316 } else {
1108 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1109 } 1318 }
1110 } 1319 }
1111} 1320}
1112 1321
1113cf::attachable->attach ( 1322cf::attachable->attach (
1140 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1141 1350
1142 sync_job { 1351 sync_job {
1143 if (length $$rdata) { 1352 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1145 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1146 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1147 1357
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 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 }
1152 aio_close $fh; 1365 aio_close $fh;
1153 1366
1154 if (@$objs) { 1367 if (@$objs) {
1155 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) {
1156 aio_chmod $fh, SAVE_MODE; 1369 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1370 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1371 aio_write $fh, 0, (length $data), $data, 0;
1159 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 }
1160 aio_close $fh; 1376 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1377 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1378 }
1163 } else { 1379 } else {
1164 aio_unlink "$filename.pst"; 1380 aio_unlink "$filename.pst";
1165 } 1381 }
1166 1382
1167 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1384
1385 $filename =~ s%/[^/]+$%%;
1386 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1387 } else {
1169 warn "FATAL: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1170 } 1389 }
1171 } else { 1390 } else {
1172 aio_unlink $filename; 1391 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1174 } 1393 }
1198 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs}; 1418 $av = $st->{objs};
1200 } 1419 }
1201 1420
1202 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1203 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1204 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1205 1425
1206 ($data, $av) 1426 ($data, $av)
1207} 1427}
1208 1428
1209=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1213=cut 1433=cut
1214 1434
1215############################################################################# 1435#############################################################################
1216# command handling &c 1436# command handling &c
1217 1437
1218=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1219 1439
1220Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1221$name. 1441$name.
1222 1442
1223=cut 1443=cut
1229 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1230 1450
1231 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1232} 1452}
1233 1453
1234=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1235 1455
1236Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1237extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1238received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1239the 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
1240has logged in successfully. 1460has logged in successfully.
1241 1461
1242If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1243called.
1244 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
1245=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1246 1470
1247Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1248exticmd 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
1249are 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
1250is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1251log-in. 1475log-in.
1252 1476
1253If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1254called.
1255 1478
1256=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1257 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
1258sub register_extcmd { 1486sub register_extcmd($$) {
1259 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1260 1488
1261 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1262} 1490}
1263 1491
1264sub register_exticmd { 1492sub register_async_extcmd($$) {
1265 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1266 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1267 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1268} 1502}
1269 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1510use File::Glob ();
1511
1270cf::player->attach ( 1512cf::player->attach (
1271 on_command => sub { 1513 on_unknown_command => sub {
1272 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1273 1515
1274 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1275 or return; 1517 or return;
1276 1518
1284 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1285 1527
1286 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1287 1529
1288 if (ref $msg) { 1530 if (ref $msg) {
1289 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1290 "ARRAY" eq ref $msg
1291 ? @$msg
1292 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1293 1532
1294 my @reply;
1295
1296 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}) {
1297 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1298 } 1551 }
1299 1552
1300 $pl->ext_reply ($reply, @reply)
1301 if $reply;
1302
1303 } else { 1553 } else {
1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1305 } 1555 }
1306 1556
1307 cf::override; 1557 cf::override;
1308 }, 1558 },
1309); 1559);
1310 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
1311sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1312 cf::sync_job { 1590 cf::sync_job {
1313 my %todo; 1591 my %todo;
1314 1592
1315 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1316 next unless -r $path; 1594 next unless -r $path;
1334 1612
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1615
1338 $ext{source} = 1616 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1340 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1341 . $source 1619 . $source
1342 . "\n};\n1"; 1620 . "\n};\n1";
1343 1621
1344 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1345 } 1623 }
1346 1624
1625 my $pass = 0;
1347 my %done; 1626 my %done;
1348 while (%todo) { 1627 while (%todo) {
1349 my $progress; 1628 my $progress;
1350 1629
1630 ++$pass;
1631
1632 ext:
1351 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1352 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1353 goto skip 1635 next ext
1354 unless exists $done{$_}; 1636 unless exists $done{$_};
1355 } 1637 }
1356 1638
1357 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1358 1640
1359 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 $@) {
1360 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1361 : "$v->{base}: extension inactive.\n";
1362 1654
1363 if (exists $v->{meta}{mandatory}) {
1364 warn $msg;
1365 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1366 } 1656 if exists $v->{meta}{mandatory};
1367 1657
1368 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;
1369 } 1667 }
1370
1371 $done{$k} = delete $todo{$k};
1372 push @EXTS, $v->{pkg};
1373 $progress = 1;
1374 } 1668 }
1375 1669
1376 skip: 1670 unless ($progress) {
1377 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1378 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 }
1379 } 1680 }
1380 }; 1681 };
1381} 1682}
1382 1683
1383############################################################################# 1684#############################################################################
1384 1685
1385=back 1686=back
1386 1687
1387=head2 CORE EXTENSIONS 1688=head2 CORE EXTENSIONS
1388 1689
1389Functions and methods that extend core crossfire objects. 1690Functions and methods that extend core deliantra objects.
1390 1691
1391=cut 1692=cut
1392 1693
1393package cf::player; 1694package cf::player;
1394 1695
1437 1738
1438sub exists($) { 1739sub exists($) {
1439 my ($login) = @_; 1740 my ($login) = @_;
1440 1741
1441 $cf::PLAYER{$login} 1742 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1743 or !aio_stat path $login
1443} 1744}
1444 1745
1445sub find($) { 1746sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1747 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1748 my $login = $_[0];
1467 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1468 } 1769 }
1469 } 1770 }
1470} 1771}
1471 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
1472sub save($) { 1786sub save($) {
1473 my ($pl) = @_; 1787 my ($pl) = @_;
1474 1788
1475 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1476 1790
1481 1795
1482 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1483 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1484 1798
1485 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];
1486 1803
1487 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1488 cf::cede_to_tick; 1805 cf::cede_to_tick;
1489} 1806}
1490 1807
1522 my ($pl) = @_; 1839 my ($pl) = @_;
1523 1840
1524 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1525 1842
1526 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1845
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1530 $pl->deactivate; 1847 $pl->deactivate;
1848
1531 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;
1532 $pl->ob->check_score;
1533 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1534 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1535 1854
1536 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1537 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1538 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1592 \@logins 1911 \@logins
1593} 1912}
1594 1913
1595=item $player->maps 1914=item $player->maps
1596 1915
1916=item cf::player::maps $login
1917
1597Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1598player. May block. 1919player. May block.
1599 1920
1600=cut 1921=cut
1601 1922
1618 } 1939 }
1619 1940
1620 \@paths 1941 \@paths
1621} 1942}
1622 1943
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1945
1625Expand crossfire pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715
1716=item $player->ext_reply ($msgid, @msg)
1717
1718Sends an ext reply to the player.
1719
1720=cut
1721
1722sub ext_reply($$@) {
1723 my ($self, $id, @msg) = @_;
1724
1725 $self->ns->ext_reply ($id, @msg)
1726}
1727 1947
1728=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1729 1949
1730Sends an ext event to the client. 1950Sends an ext event to the client.
1731 1951
1751 1971
1752=cut 1972=cut
1753 1973
1754sub find_by_path($) { 1974sub find_by_path($) {
1755 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1756 1978
1757 my ($match, $specificity); 1979 my ($match, $specificity);
1758 1980
1759 for my $region (list) { 1981 for my $region (list) {
1760 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1789sub generate_random_map { 2011sub generate_random_map {
1790 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1791 2013
1792 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
1793 2015
1794 # mit "rum" bekleckern, nicht
1795 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 $rmp->{exit_on_final_map},
1800 $rmp->{xsize}, $rmp->{ysize},
1801 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1802 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1803 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1804 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1805 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1806 (cf::region::find $rmp->{region}), $rmp->{custom}
1807 )
1808} 2017}
1809 2018
1810=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1811 2020
1812Register 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
1817 2026
1818sub register { 2027sub register {
1819 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1820 my $pkg = caller; 2029 my $pkg = caller;
1821 2030
1822 no strict;
1823 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1824 2032
1825 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1826} 2034}
1827 2035
1828# also paths starting with '/' 2036# also paths starting with '/'
1829$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1830 2038
1831sub thawer_merge { 2039sub thawer_merge {
1832 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1833 2041
1834 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1839} 2047}
1840 2048
1841sub normalise { 2049sub normalise {
1842 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1843 2051
1844 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1845 2053
1846 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1847 2055
1848 # map plan: 2056 # map plan:
1849 # 2057 #
1864 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1865 $path = "$base/$path"; 2073 $path = "$base/$path";
1866 } 2074 }
1867 2075
1868 for ($path) { 2076 for ($path) {
1869 redo if s{//}{/};
1870 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1871 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1872 } 2079 }
1873 2080
1874 $path 2081 $path
1888 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1889 return $self; 2096 return $self;
1890 } 2097 }
1891 } 2098 }
1892 2099
1893 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1894 () 2101 ()
1895} 2102}
1896 2103
2104# may re-bless or do other evil things
1897sub init { 2105sub init {
1898 my ($self) = @_; 2106 my ($self) = @_;
1899 2107
1900 $self 2108 $self
1901} 2109}
1932 2140
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2141 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 2142 "$UNIQUEDIR/$path"
1935} 2143}
1936 2144
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 2145sub decay_objects {
1947 my ($self) = @_; 2146 my ($self) = @_;
1948 2147
1949 return if $self->{deny_reset}; 2148 return if $self->{deny_reset};
1950 2149
1975 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1976 2175
1977 1 2176 1
1978} 2177}
1979 2178
2179# used to laod the header of an original map
1980sub load_header_orig { 2180sub load_header_orig {
1981 my ($self) = @_; 2181 my ($self) = @_;
1982 2182
1983 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1984} 2184}
1985 2185
2186# used to laod the header of an instantiated map
1986sub load_header_temp { 2187sub load_header_temp {
1987 my ($self) = @_; 2188 my ($self) = @_;
1988 2189
1989 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1990} 2191}
1991 2192
2193# called after loading the header from an instantiated map
1992sub prepare_temp { 2194sub prepare_temp {
1993 my ($self) = @_; 2195 my ($self) = @_;
1994 2196
1995 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1996 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1997 # safety 2199 # safety
1998 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1999 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
2000} 2202}
2001 2203
2204# called after loading the header from an original map
2002sub prepare_orig { 2205sub prepare_orig {
2003 my ($self) = @_; 2206 my ($self) = @_;
2004 2207
2005 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
2006 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
2030 2233
2031sub find; 2234sub find;
2032sub find { 2235sub find {
2033 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2034 2237
2238 cf::cede_to_tick;
2239
2035 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
2036 2241
2037 cf::lock_wait "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
2039 2244
2040 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 2246 my $map = new_from_path cf::map $path
2045 or return; 2247 or return;
2046 2248
2047 $map->{last_save} = $cf::RUNTIME; 2249 $map->{last_save} = $cf::RUNTIME;
2048 2250
2060 2262
2061 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
2062 } 2264 }
2063} 2265}
2064 2266
2065sub pre_load { } 2267sub pre_load { }
2066sub post_load { } 2268#sub post_load { } # XS
2067 2269
2068sub load { 2270sub load {
2069 my ($self) = @_; 2271 my ($self) = @_;
2070 2272
2071 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
2074 2276
2075 { 2277 {
2076 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2077 2279
2078 return unless $self->valid; 2280 return unless $self->valid;
2079 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2080
2081 $self->in_memory (cf::MAP_LOADING);
2082 2282
2083 $self->alloc; 2283 $self->alloc;
2084 2284
2085 $self->pre_load; 2285 $self->pre_load;
2086 cf::cede_to_tick; 2286 cf::cede_to_tick;
2087 2287
2288 if (exists $self->{load_path}) {
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2290 $f->skip_block;
2090 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2091 or return; 2292 or return;
2092 2293
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2294 $self->post_load_original
2094 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2095 2296
2096 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2298 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2099 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2100 $self->clear_unique_items; 2301 $self->clear_unique_items;
2101 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2102 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2103 } 2305 }
2104 } 2306 }
2105 }
2106 2307
2107 $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);
2108 2315
2109 cf::cede_to_tick; 2316 cf::cede_to_tick;
2110 # now do the right thing for maps 2317 # now do the right thing for maps
2111 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2112 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2116 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2324 $self->decay_objects;
2118 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2119 $self->update_buttons; 2326 $self->update_buttons;
2120 cf::cede_to_tick; 2327 cf::cede_to_tick;
2121 $self->set_darkness_map; 2328 #$self->activate; # no longer activate maps automatically
2122 cf::cede_to_tick;
2123 $self->activate;
2124 } 2329 }
2125 2330
2126 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2128
2129 $self->in_memory (cf::MAP_ACTIVE);
2130 } 2333 }
2131 2334
2132 $self->post_load; 2335 $self->post_load;
2133}
2134 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
2135sub customise_for { 2343sub customise_for {
2136 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2137 2345
2138 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2139 if $self->per_player; 2347 if $self->per_player;
2142# if $self->per_party; 2350# if $self->per_party;
2143 2351
2144 $self 2352 $self
2145} 2353}
2146 2354
2147# find and load all maps in the 3x3 area around a map
2148sub load_neighbours {
2149 my ($map) = @_;
2150
2151 my @neigh; # diagonal neighbours
2152
2153 for (0 .. 3) {
2154 my $neigh = $map->tile_path ($_)
2155 or next;
2156 $neigh = find $neigh, $map
2157 or next;
2158 $neigh->load;
2159
2160 push @neigh,
2161 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2162 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2163 }
2164
2165 for (grep defined $_->[0], @neigh) {
2166 my ($path, $origin) = @$_;
2167 my $neigh = find $path, $origin
2168 or next;
2169 $neigh->load;
2170 }
2171}
2172
2173sub find_sync { 2355sub find_sync {
2174 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2175 2357
2176 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
2177} 2363}
2178 2364
2179sub do_load_sync { 2365sub do_load_sync {
2180 my ($map) = @_; 2366 my ($map) = @_;
2181 2367
2368 # it's a bug to call this from the main context
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2184 2371
2185 cf::sync_job { $map->load }; 2372 $map->load;
2186} 2373}
2187 2374
2188our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2189our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2190 2377
2191sub find_async { 2378sub find_async {
2192 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2193 2380
2194 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2195 2382
2196 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2198 } 2385 }
2199 2386
2200 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2201 2388
2202 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2216 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2217 2404
2218 () 2405 ()
2219} 2406}
2220 2407
2408# common code, used by both ->save and ->swapout
2221sub save { 2409sub _save {
2222 my ($self) = @_; 2410 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2411
2226 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2227 2413
2228 return unless $self->dirty; 2414 return unless $self->dirty;
2229 2415
2249 } else { 2435 } else {
2250 $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);
2251 } 2437 }
2252} 2438}
2253 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2254sub swap_out { 2448sub swap_out {
2255 my ($self) = @_; 2449 my ($self) = @_;
2256 2450
2257 # save first because save cedes
2258 $self->save;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2262 return if $self->players; 2455 return if $self->players;
2263 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
2264 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2265 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
2266 $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};
2267 2507
2268 $self->deactivate; 2508 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2270 $self->clear; 2510 $self->clear;
2271}
2272
2273sub reset_at {
2274 my ($self) = @_;
2275
2276 # TODO: safety, remove and allow resettable per-player maps
2277 return 1e99 if $self->{deny_reset};
2278
2279 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2280 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2281
2282 $time + $to
2283}
2284
2285sub should_reset {
2286 my ($self) = @_;
2287
2288 $self->reset_at <= $cf::RUNTIME
2289}
2290
2291sub reset {
2292 my ($self) = @_;
2293
2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295
2296 return if $self->players;
2297
2298 warn "resetting map ", $self->path;
2299
2300 $self->in_memory (cf::MAP_SWAPPED);
2301
2302 # need to save uniques path
2303 unless ($self->{deny_save}) {
2304 my $uniq = $self->uniq_path; utf8::encode $uniq;
2305
2306 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2307 if $uniq;
2308 }
2309
2310 delete $cf::MAP{$self->path};
2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
2314 $self->clear;
2315 2511
2316 $self->unlink_save; 2512 $self->unlink_save;
2317 $self->destroy; 2513 $self->destroy;
2318} 2514}
2319 2515
2327 2523
2328 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2329 2525
2330 $self->unlink_save; 2526 $self->unlink_save;
2331 2527
2332 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2333 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2334 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2335 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2337 2533
2394 : normalise $_ 2590 : normalise $_
2395 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2396 ] 2592 ]
2397} 2593}
2398 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
2399=back 2627=back
2400 2628
2401=head3 cf::object 2629=head3 cf::object
2402 2630
2403=cut 2631=cut
2468 2696
2469our $SAY_CHANNEL = { 2697our $SAY_CHANNEL = {
2470 id => "say", 2698 id => "say",
2471 title => "Map", 2699 title => "Map",
2472 reply => "say ", 2700 reply => "say ",
2473 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.",
2474}; 2702};
2475 2703
2476our $CHAT_CHANNEL = { 2704our $CHAT_CHANNEL = {
2477 id => "chat", 2705 id => "chat",
2478 title => "Chat", 2706 title => "Chat",
2533 2761
2534=item $player_object->enter_link 2762=item $player_object->enter_link
2535 2763
2536Freezes 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}>).
2537 2765
2538The 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.
2539I<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.
2540 2770
2541Will never block. 2771Will never block.
2542 2772
2543=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2544 2774
2564sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2565 my ($self) = @_; 2795 my ($self) = @_;
2566 2796
2567 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2568 2798
2799 ++$self->{_link_recursion};
2800
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2802
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2573 2805
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2807}
2576 2808
2577sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2579 2811
2596 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2597 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2598 2830
2599 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2602 2834
2603 $map->load; 2835 $map->load;
2604 $map->load_neighbours;
2605 2836
2606 return unless $self->contr->active; 2837 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2838
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2611} 2841 # entering was successful
2842 delete $self->{_link_recursion};
2843 # only activate afterwards, to support waiting in hooks
2844 $self->activate_recursive;
2845 }
2612 2846
2847}
2848
2613=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)]])
2614 2850
2615Moves 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
2616her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2617that 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
2618the 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
2619be called at the end of this process. 2855be called at the end of this process.
2620 2856
2857Note that $check will be called with a potentially non-loaded map, so if
2858it needs a loaded map it has to call C<< ->load >>.
2859
2621=cut 2860=cut
2622 2861
2623our $GOTOGEN; 2862our $GOTOGEN;
2624 2863
2625sub cf::object::player::goto { 2864sub cf::object::player::goto {
2626 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 }
2627 2872
2628 # 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
2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2630 2875
2631 $self->enter_link; 2876 $self->enter_link;
2651 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2652 } 2897 }
2653 } 2898 }
2654 2899
2655 my $map = eval { 2900 my $map = eval {
2656 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2657 2902
2658 if ($map) { 2903 if ($map) {
2659 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2660 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2661 } else { 2906 } else {
2662 $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);
2663 } 2908 }
2664 2909
2665 $map 2910 $map
2673 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2674 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2675 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2676 } 2921 }
2677 2922
2678 $done->() if $done; 2923 $done->($self) if $done;
2679 })->prio (1); 2924 })->prio (1);
2680} 2925}
2681 2926
2682=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2683 2928
2751 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2752 2997
2753 unless (eval { 2998 unless (eval {
2754 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2755 3000
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2765 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2766 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 }
2767 3027
2768 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2769 3029
2770 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 3032 if $exit->flag (cf::FLAG_DAMNED);
2773 3033
2774 1 3034 1
2775 }) { 3035 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "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. "
2778 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2780 3040
2781 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2782 $self->leave_link; 3042 $self->leave_link;
2783 } 3043 }
2784 })->prio (1); 3044 })->prio (1);
2785} 3045}
2786 3046
2798sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2800 3060
2801 utf8::encode $text; 3061 utf8::encode $text;
2802 $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);
2803} 3088}
2804 3089
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 3091
2807Send 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
2811 3096
2812=cut 3097=cut
2813 3098
2814# non-persistent channels (usually the info channel) 3099# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 3100our %CHANNEL = (
3101 "c/motd" => {
3102 id => "infobox",
3103 title => "MOTD",
3104 reply => undef,
3105 tooltip => "The message of the day",
3106 },
2816 "c/identify" => { 3107 "c/identify" => {
2817 id => "infobox", 3108 id => "infobox",
2818 title => "Identify", 3109 title => "Identify",
2819 reply => undef, 3110 reply => undef,
2820 tooltip => "Items recently identified", 3111 tooltip => "Items recently identified",
2822 "c/examine" => { 3113 "c/examine" => {
2823 id => "infobox", 3114 id => "infobox",
2824 title => "Examine", 3115 title => "Examine",
2825 reply => undef, 3116 reply => undef,
2826 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",
2827 }, 3124 },
2828 "c/book" => { 3125 "c/book" => {
2829 id => "infobox", 3126 id => "infobox",
2830 title => "Book", 3127 title => "Book",
2831 reply => undef, 3128 reply => undef,
2847 id => "infobox", 3144 id => "infobox",
2848 title => "Body Parts", 3145 title => "Body Parts",
2849 reply => undef, 3146 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 3147 tooltip => "Shows which body parts you posess and are available",
2851 }, 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 },
2852 "c/uptime" => { 3185 "c/uptime" => {
2853 id => "infobox", 3186 id => "infobox",
2854 title => "Uptime", 3187 title => "Uptime",
2855 reply => undef, 3188 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 3189 tooltip => "How long the server has been running since last restart",
2865 id => "party", 3198 id => "party",
2866 title => "Party", 3199 title => "Party",
2867 reply => "gsay ", 3200 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 3201 tooltip => "Messages and chat related to your party",
2869 }, 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,
2870); 3211);
2871 3212
2872sub cf::client::send_msg { 3213sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 3214 my ($self, $channel, $msg, $color, @extra) = @_;
2874 3215
2875 $msg = $self->pl->expand_cfpod ($msg); 3216 $msg = $self->pl->expand_cfpod ($msg)
3217 unless $color & cf::NDI_VERBATIM;
2876 3218
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 3219 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 3220
2879 # check predefined channels, for the benefit of C 3221 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 3222 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 3223 $channel = $CHANNEL{$channel};
2882 3224
2883 $self->ext_msg (channel_info => $channel) 3225 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 3226 $channel = $channel->{id};
2887 3227
2888 } elsif (ref $channel) { 3228 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 3229 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 3230 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 3231 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 3232 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 3233 }
2895 3234
2896 $channel = $channel->{id}; 3235 $channel = $channel->{id};
2897 } 3236 }
2898 3237
2899 return unless @extra || length $msg; 3238 return unless @extra || length $msg;
2900 3239
2901 if ($self->can_msg) {
2902 # default colour, mask it out 3240 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3241 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 3242 if $color & cf::NDI_DEF;
2905 3243
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3244 my $pkt = "msg "
3245 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 3247 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 3248
2920 $color &= cf::NDI_COLOR_MASK; 3249 $self->send_big_packet ($pkt);
2921
2922 utf8::encode $msg;
2923
2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 }
2933} 3250}
2934 3251
2935=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2936 3253
2937Sends an ext event to the client. 3254Sends an ext event to the client.
2939=cut 3256=cut
2940 3257
2941sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2943 3260
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950}
2951
2952=item $client->ext_reply ($msgid, @msg)
2953
2954Sends an ext reply to the client.
2955
2956=cut
2957
2958sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_;
2960
2961 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 }
2968} 3262}
2969 3263
2970=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2971 3265
2972Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
3027 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3028 3322
3029 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3030 3324
3031 if (ref $msg) { 3325 if (ref $msg) {
3032 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3033 "ARRAY" eq ref $msg
3034 ? @$msg
3035 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3036 3327
3037 my @reply;
3038
3039 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}) {
3040 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3041 } 3346 }
3042
3043 $ns->ext_reply ($reply, @reply)
3044 if $reply;
3045
3046 } else { 3347 } else {
3047 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";
3048 } 3349 }
3049 3350
3050 cf::override; 3351 cf::override;
3051 }, 3352 },
3052); 3353);
3072 3373
3073 $coro 3374 $coro
3074} 3375}
3075 3376
3076cf::client->attach ( 3377cf::client->attach (
3077 on_destroy => sub { 3378 on_client_destroy => sub {
3078 my ($ns) = @_; 3379 my ($ns) = @_;
3079 3380
3080 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3081 }, 3382 },
3082); 3383);
3098our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3099 3400
3100$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3101 3402
3102$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3104 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3105 sort time 3406 sort time
3106)); 3407));
3107 3408
3108# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3112The following functions and methods are available within a safe environment: 3413The following functions and methods are available within a safe environment:
3113 3414
3114 cf::object 3415 cf::object
3115 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
3116 insert remove name archname title slaying race decrease split 3417 insert remove name archname title slaying race decrease split
3418 value
3117 3419
3118 cf::object::player 3420 cf::object::player
3119 player 3421 player
3120 3422
3121 cf::player 3423 cf::player
3127=cut 3429=cut
3128 3430
3129for ( 3431for (
3130 ["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
3131 insert remove inv nrof name archname title slaying race 3433 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3436 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3136) { 3438) {
3137 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3140 for @funs; 3441 for @funs;
3141} 3442}
3142 3443
3157 3458
3158 my $qcode = $code; 3459 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3161 3462
3463 %vars = (_dummy => 0) unless %vars;
3464
3465 my @res;
3162 local $_; 3466 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars;
3164 3467
3165 my $eval = 3468 my $eval =
3166 "do {\n" 3469 "do {\n"
3167 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3168 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3169 . $code 3472 . $code
3170 . "\n}" 3473 . "\n}"
3171 ; 3474 ;
3172 3475
3476 if ($CFG{safe_eval}) {
3173 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3174 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3175 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 }
3176 3485
3177 if ($@) { 3486 if ($@) {
3178 warn "$@"; 3487 warn "$@",
3179 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3180 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3181 } 3490 }
3182 3491
3183 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3184} 3493}
3185 3494
3199=cut 3508=cut
3200 3509
3201sub register_script_function { 3510sub register_script_function {
3202 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3203 3512
3204 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3205 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3206} 3515}
3207 3516
3208=back 3517=back
3209 3518
3210=cut 3519=cut
3211 3520
3212############################################################################# 3521#############################################################################
3213# 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}
3214 3547
3215sub load_facedata($) { 3548sub load_facedata($) {
3216 my ($path) = @_; 3549 my ($path) = @_;
3217 3550
3218 # 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
3219 # for this (global event?) 3552 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = (); 3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3221 3554
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223 3556
3224 warn "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3225 3558
3226 my $facedata; 3559 my $facedata = decode_storable load_file $path;
3227 0 < aio_load $path, $facedata
3228 or die "$path: $!";
3229
3230 $facedata = Coro::Storable::thaw $facedata;
3231 3560
3232 $facedata->{version} == 2 3561 $facedata->{version} == 2
3233 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3234 3563
3235 # patch in the exptable
3236 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3239 };
3240 cf::cede_to_tick; 3564 cf::cede_to_tick;
3241 3565
3242 { 3566 {
3243 my $faces = $facedata->{faceinfo}; 3567 my $faces = delete $facedata->{faceinfo};
3244 3568
3245 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3246 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247 3572
3248 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3252 3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3579
3253 cf::cede_to_tick; 3580 cf::cede_to_tick;
3254 } 3581 }
3255 3582
3256 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3257 next unless $info->{smooth}; 3584 next unless $info->{smooth};
3261 3588
3262 if (my $smooth = cf::face::find $info->{smooth}) { 3589 if (my $smooth = cf::face::find $info->{smooth}) {
3263 cf::face::set_smooth $idx, $smooth; 3590 cf::face::set_smooth $idx, $smooth;
3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3265 } else { 3592 } else {
3266 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3593 error "smooth face '$info->{smooth}' not found for face '$face'";
3267 } 3594 }
3268 3595
3269 cf::cede_to_tick; 3596 cf::cede_to_tick;
3270 } 3597 }
3271 } 3598 }
3272 3599
3273 { 3600 {
3274 my $anims = $facedata->{animinfo}; 3601 my $anims = delete $facedata->{animinfo};
3275 3602
3276 while (my ($anim, $info) = each %$anims) { 3603 while (my ($anim, $info) = each %$anims) {
3277 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3604 cf::anim::set $anim, $info->{frames}, $info->{facings};
3278 cf::cede_to_tick; 3605 cf::cede_to_tick;
3279 } 3606 }
3280 3607
3281 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3282 } 3609 }
3283 3610
3284 { 3611 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource}; 3612 my $res = delete $facedata->{resource};
3288 3613
3289 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3290 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
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293 3618
3294 if ($info->{type} & 1) {
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 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#
3309 } else { 3623 } else {
3310 $RESOURCE{$name} = $info; 3624# $RESOURCE{$name} = $info; # unused
3311 } 3625 }
3312 3626
3313 cf::cede_to_tick; 3627 cf::cede_to_tick;
3314 } 3628 }
3315 } 3629 }
3316 3630
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318 3632
3319 1 3633 1
3320} 3634}
3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3341 3635
3342register_exticmd fx_want => sub { 3636register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_; 3637 my ($ns, $want) = @_;
3344 3638
3345 while (my ($k, $v) = each %$want) { 3639 while (my ($k, $v) = each %$want) {
3353 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3355 cf::arch::commit_load; 3649 cf::arch::commit_load;
3356 3650
3357 $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;
3358} 3665}
3359 3666
3360sub reload_regions { 3667sub reload_regions {
3361 # 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
3362 # for this (global event?) 3669 # for this (global event?)
3377} 3684}
3378 3685
3379sub reload_archetypes { 3686sub reload_archetypes {
3380 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3381 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 );
3382} 3698}
3383 3699
3384sub reload_treasures { 3700sub reload_treasures {
3385 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3386 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3387} 3703}
3388 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
3389sub reload_resources { 3725sub reload_resources {
3390 warn "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3391 3727
3728 reload_materials;
3392 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3731 reload_sound;
3393 reload_archetypes; 3732 reload_archetypes;
3394 reload_regions; 3733 reload_regions;
3395 reload_treasures; 3734 reload_treasures;
3396 3735
3397 warn "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3398}
3399
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404} 3737}
3405 3738
3406sub reload_config { 3739sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3740 trace "reloading config file...\n";
3408 or return;
3409 3741
3410 local $/; 3742 my $config = load_file "$CONFDIR/config";
3411 *CFG = YAML::Load <$fh>; 3743 utf8::decode $config;
3744 *CFG = decode_yaml $config;
3412 3745
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3747
3415 $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};
3416 $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};
3417 3750
3418 if (exists $CFG{mlockall}) { 3751 if (exists $CFG{mlockall}) {
3422 }; 3755 };
3423 warn $@ if $@; 3756 warn $@ if $@;
3424 } 3757 }
3425} 3758}
3426 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
3427sub 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
3428 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3430 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#
3431 (async { 3801 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
3435 }; 3805 };
3436 3806
3437 { 3807 evthread_start IO::AIO::poll_fileno;
3438 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;
3439 reload_config; 3821 reload_config;
3440 db_init; 3822
3823 cf::init_uuid;
3824 cf::init_signals;
3825 cf::init_skills;
3826
3827 cf::init_beforeplay;
3828
3829 atomic;
3830
3441 load_extensions; 3831 load_extensions;
3442 3832
3443 $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;
3444 } 3840 };
3445 3841
3446 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;
3447} 3850}
3448 3851
3449############################################################################# 3852#############################################################################
3450# initialisation and cleanup 3853# initialisation and cleanup
3451 3854
3452# install some emergency cleanup handlers 3855# install some emergency cleanup handlers
3453BEGIN { 3856BEGIN {
3454 our %SIGWATCHER = (); 3857 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3858 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3859 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3860 cf::cleanup "SIG$signal";
3458 }; 3861 };
3459 } 3862 }
3460} 3863}
3461 3864
3462sub write_runtime_sync { 3865sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3866 my $t0 = AE::time;
3464 3867
3465 # first touch the runtime file to show we are still running: 3868 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3869 # the fsync below can take a very very long time.
3467 3870
3468 IO::AIO::aio_utime $runtime, undef, undef; 3871 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3872
3470 my $guard = cf::lock_acquire "write_runtime"; 3873 my $guard = cf::lock_acquire "write_runtime";
3471 3874
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3875 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3876 or return;
3474 3877
3475 my $value = $cf::RUNTIME + 90 + 10; 3878 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3879 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3880 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3890 aio_utime $fh, undef, undef;
3488 3891
3489 close $fh 3892 close $fh
3490 or return; 3893 or return;
3491 3894
3492 aio_rename "$runtime~", $runtime 3895 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3896 and return;
3494 3897
3495 warn "runtime file written.\n"; 3898 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3899
3497 1 3900 1
3498} 3901}
3499 3902
3500our $uuid_lock; 3903our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3912 my $uuid = "$LOCALDIR/uuid";
3510 3913
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3914 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3915 or return;
3513 3916
3514 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;
3515 $uuid_skip = 0; 3925 $uuid_skip = 0;
3516 3926
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3927 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3928 and return;
3519 3929
3525 or return; 3935 or return;
3526 3936
3527 aio_rename "$uuid~", $uuid 3937 aio_rename "$uuid~", $uuid
3528 and return; 3938 and return;
3529 3939
3530 warn "uuid file written ($value).\n"; 3940 trace "uuid file written ($value).\n";
3531 3941
3532 1 3942 1
3533 3943
3534} 3944}
3535 3945
3541} 3951}
3542 3952
3543sub emergency_save() { 3953sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3954 my $freeze_guard = cf::freeze_mainloop;
3545 3955
3546 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;
3547 3962
3548 cf::sync_job { 3963 cf::sync_job {
3964 cf::write_runtime_sync; # external watchdog should not bark
3965
3549 # use a peculiar iteration method to avoid tripping on perl 3966 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3967 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3968 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3969 info "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3970 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3971 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3972 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3973 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3974 $pl->save;
3558 } 3975 }
3559 warn "end emergency player save\n"; 3976 info "emergency_perl_save: end player save\n";
3560 3977
3561 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";
3562 for my $path (keys %cf::MAP) { 3981 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3982 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3983 $map->valid or next;
3565 $map->save; 3984 $map->save;
3566 } 3985 }
3567 warn "end emergency map save\n"; 3986 info "emergency_perl_save: end map save\n";
3568 3987
3569 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";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3991 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3992 info "emergency_perl_save: end database checkpoint\n";
3572 3993
3573 warn "begin write uuid\n"; 3994 info "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3995 write_uuid_sync 1;
3575 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
3576 }; 4016 };
3577 4017
3578 warn "leave emergency perl save\n"; 4018 info "emergency_perl_save: leave\n";
3579} 4019}
3580 4020
3581sub post_cleanup { 4021sub post_cleanup {
3582 my ($make_core) = @_; 4022 my ($make_core) = @_;
3583 4023
4024 IO::AIO::flush;
4025
3584 warn Carp::longmess "post_cleanup backtrace" 4026 error Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 4027 if $make_core;
4028
4029 my $fh = pidfile;
4030 unlink $PIDFILE if <$fh> == $$;
4031}
4032
4033# a safer delete_package, copied from Symbol
4034sub clear_package($) {
4035 my $pkg = shift;
4036
4037 # expand to full symbol table name if needed
4038 unless ($pkg =~ /^main::.*::$/) {
4039 $pkg = "main$pkg" if $pkg =~ /^::/;
4040 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4041 $pkg .= '::' unless $pkg =~ /::$/;
4042 }
4043
4044 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4045 my $stem_symtab = *{$stem}{HASH};
4046
4047 defined $stem_symtab and exists $stem_symtab->{$leaf}
4048 or return;
4049
4050 # clear all symbols
4051 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4052 for my $name (keys %$leaf_symtab) {
4053 _gv_clear *{"$pkg$name"};
4054# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4055 }
3586} 4056}
3587 4057
3588sub do_reload_perl() { 4058sub do_reload_perl() {
3589 # can/must only be called in main 4059 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 4060 unless (in_main) {
3591 warn "can only reload from main coroutine"; 4061 error "can only reload from main coroutine";
3592 return; 4062 return;
3593 } 4063 }
3594 4064
3595 warn "reloading..."; 4065 return if $RELOAD++;
3596 4066
3597 warn "entering sync_job"; 4067 my $t1 = AE::time;
3598 4068
4069 while ($RELOAD) {
4070 cf::get_slot 0.1, -1, "reload_perl";
4071 info "perl_reload: reloading...";
4072
4073 trace "perl_reload: entering sync_job";
4074
3599 cf::sync_job { 4075 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 4076 #cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark
3603 4077
3604 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV;
3606
3607 # if anything goes wrong in here, we should simply crash as we already saved
3608
3609 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs;
3615 warn "iterate...";
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros"; 4078 trace "perl_reload: cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO; 4079 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = (); 4080 %EXT_CORO = ();
3623 4081
3624 warn "removing commands"; 4082 trace "perl_reload: removing commands";
3625 %COMMAND = (); 4083 %COMMAND = ();
3626 4084
3627 warn "removing ext/exti commands"; 4085 trace "perl_reload: removing ext/exti commands";
3628 %EXTCMD = (); 4086 %EXTCMD = ();
3629 %EXTICMD = (); 4087 %EXTICMD = ();
3630 4088
3631 warn "unloading/nuking all extensions"; 4089 trace "perl_reload: unloading/nuking all extensions";
3632 for my $pkg (@EXTS) { 4090 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg"; 4091 trace "... unloading $pkg";
3634 4092
3635 if (my $cb = $pkg->can ("unload")) { 4093 if (my $cb = $pkg->can ("unload")) {
3636 eval { 4094 eval {
3637 $cb->($pkg); 4095 $cb->($pkg);
3638 1 4096 1
3639 } or warn "$pkg unloaded, but with errors: $@"; 4097 } or error "$pkg unloaded, but with errors: $@";
4098 }
4099
4100 trace "... clearing $pkg";
4101 clear_package $pkg;
3640 } 4102 }
3641 4103
3642 warn "... nuking $pkg";
3643 Symbol::delete_package $pkg;
3644 }
3645
3646 warn "unloading all perl modules loaded from $LIBDIR"; 4104 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3647 while (my ($k, $v) = each %INC) { 4105 while (my ($k, $v) = each %INC) {
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4106 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 4107
3650 warn "... unloading $k"; 4108 trace "... unloading $k";
3651 delete $INC{$k}; 4109 delete $INC{$k};
3652 4110
3653 $k =~ s/\.pm$//; 4111 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g; 4112 $k =~ s/\//::/g;
3655 4113
3656 if (my $cb = $k->can ("unload_module")) { 4114 if (my $cb = $k->can ("unload_module")) {
3657 $cb->(); 4115 $cb->();
4116 }
4117
4118 clear_package $k;
3658 } 4119 }
3659 4120
3660 Symbol::delete_package $k;
3661 }
3662
3663 warn "getting rid of safe::, as good as possible"; 4121 trace "perl_reload: getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 4122 clear_package "safe::$_"
3665 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);
3666 4124
3667 warn "unloading cf.pm \"a bit\""; 4125 trace "perl_reload: unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 4126 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 4127 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 4128
3671 # don't, removes xs symbols, too, 4129 # don't, removes xs symbols, too,
3672 # and global variables created in xs 4130 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 4131 #clear_package __PACKAGE__;
3674 4132
3675 warn "unload completed, starting to reload now"; 4133 info "perl_reload: unload completed, starting to reload now";
3676 4134
3677 warn "reloading cf.pm"; 4135 trace "perl_reload: reloading cf.pm";
3678 require cf; 4136 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4137 cf::_connect_to_perl_1;
3680 4138
3681 warn "loading config and database again"; 4139 trace "perl_reload: loading config and database again";
3682 cf::reload_config; 4140 cf::reload_config;
3683 4141
3684 warn "loading extensions"; 4142 trace "perl_reload: loading extensions";
3685 cf::load_extensions; 4143 cf::load_extensions;
3686 4144
4145 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 4146 trace "perl_reload: reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 4147 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 4148 trace "perl_reload: reattaching attachments to maps";
3690 reattach $_ for values %MAP; 4149 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 4150 trace "perl_reload: reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 4151 reattach $_ for values %PLAYER;
4152 }
3693 4153
3694 warn "leaving sync_job"; 4154 cf::_post_init 1;
3695 4155
4156 trace "perl_reload: leaving sync_job";
4157
3696 1 4158 1
3697 } or do { 4159 } or do {
3698 warn $@; 4160 error $@;
3699 cf::cleanup "error while reloading, exiting."; 4161 cf::cleanup "perl_reload: error, exiting.";
4162 };
4163
4164 --$RELOAD;
3700 }; 4165 }
3701 4166
3702 warn "reloaded"; 4167 $t1 = AE::time - $t1;
4168 info "perl_reload: completed in ${t1}s\n";
3703}; 4169};
3704 4170
3705our $RELOAD_WATCHER; # used only during reload 4171our $RELOAD_WATCHER; # used only during reload
3706 4172
3707sub reload_perl() { 4173sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4174 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4175 # coro crashes during coro_state_free->destroy here.
3710 4176
4177 $RELOAD_WATCHER ||= cf::async {
4178 Coro::AIO::aio_wait cache_extensions;
4179
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4180 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4181 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4182 undef $RELOAD_WATCHER;
4183 };
3714 }; 4184 };
3715} 4185}
3716 4186
3717register_command "reload" => sub { 4187register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4188 my ($who, $arg) = @_;
3724 reload_perl; 4194 reload_perl;
3725 }; 4195 };
3726 } 4196 }
3727}; 4197};
3728 4198
3729unshift @INC, $LIBDIR; 4199#############################################################################
3730 4200
3731my $bug_warning = 0; 4201my $bug_warning = 0;
3732 4202
3733our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN;
3735
3736sub wait_for_tick { 4203sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4205
3739 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
3740 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait;
3742} 4207}
3743 4208
3744sub wait_for_tick_begin { 4209sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3746 4211
3747 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4214 $signal->wait;
3750} 4215}
3754 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"
3755 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
3756 return; 4221 return;
3757 } 4222 }
3758 4223
3759 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#
3760 4227
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $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.;
3763 Coro::async_pool { 4230 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4231 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4232 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4233 or error "ERROR: unable to write runtime file: $!";
3767 }; 4234 };
3768 } 4235 }
3769 4236
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4238 $sig->send;
3772 } 4239 }
3773 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
3774 $sig->send;
3775 }
3776 4241
3777 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3779 4244
3780 if (0) { 4245 if (0) {
3781 if ($NEXT_TICK) { 4246 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4247 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4248 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4249 debug "jitter $JITTER\n";#d#
3785 } 4250 }
3786 } 4251 }
3787} 4252}
3788 4253
3789{ 4254{
3790 # configure BDB 4255 # configure BDB
4256 info "initialising database";
3791 4257
3792 BDB::min_parallel 8; 4258 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
3795 4261
3796 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4266 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4267 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4268 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4269
3803 cf::sync_job { 4270 cf::sync_job {
3804 eval { 4271 eval {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 }; 4291 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 }; 4294 };
4295
4296 info "database initialised";
3828} 4297}
3829 4298
3830{ 4299{
3831 # configure IO::AIO 4300 # configure IO::AIO
3832 4301
4302 info "initialising aio";
3833 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
3836} 4307}
3837 4308
3838my $_log_backtrace; 4309our $_log_backtrace;
4310our $_log_backtrace_last;
3839 4311
3840sub _log_backtrace { 4312sub _log_backtrace {
3841 my ($msg, @addr) = @_; 4313 my ($msg, @addr) = @_;
3842 4314
3843 $msg =~ s/\n//; 4315 $msg =~ s/\n$//;
3844 4316
4317 if ($_log_backtrace_last eq $msg) {
4318 LOG llevInfo, "[ABT] $msg\n";
4319 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3845 # limit the # of concurrent backtraces 4320 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4321 } elsif ($_log_backtrace < 2) {
4322 $_log_backtrace_last = $msg;
3847 ++$_log_backtrace; 4323 ++$_log_backtrace;
4324 my $perl_bt = Carp::longmess $msg;
3848 async { 4325 async {
3849 $Coro::current->{desc} = "abt $msg"; 4326 $Coro::current->{desc} = "abt $msg";
3850 4327
3851 my @bt = fork_call { 4328 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4329 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4340 }
3864 4341
3865 @funcs 4342 @funcs
3866 }; 4343 };
3867 4344
3868 LOG llevInfo, "[ABT] $msg\n"; 4345 LOG llevInfo, "[ABT] $perl_bt\n";
4346 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4347 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4348 --$_log_backtrace;
3871 }; 4349 };
3872 } else { 4350 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4351 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4352 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3875 } 4353 }
3876} 4354}
3877 4355
3878# load additional modules 4356# load additional modules
3879use cf::pod; 4357require "cf/$_.pm" for @EXTRA_MODULES;
4358cf::_connect_to_perl_2;
3880 4359
3881END { cf::emergency_save } 4360END { cf::emergency_save }
3882 4361
3883evthread_start IO::AIO::poll_fileno;
3884
38851 43621
3886 4363

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines