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.433 by root, Sat May 10 22:38:52 2008 UTC vs.
Revision 1.594 by root, Fri Nov 9 02:50:50 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;
39use Coro::EV; 44use Coro::EV;
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
61 68
62# configure various modules to our taste 69# configure various modules to our taste
63# 70#
64$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 79
68$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" };
69 82
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
71 86
72our %COMMAND = (); 87our %COMMAND = ();
73our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
74 89
75our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
77our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
80 97
81our $RELOAD; # number of reloads so far 98our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
83 102
84our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
85our $DATADIR = datadir; 105our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
89our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
95our %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;
96 126
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 129our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
101 131
102our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 135our $DB_ENV;
106 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
107our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
108 141
109our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
111our $NOW; 145our $NOW;
112 146
113our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
114our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
115our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 155our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 156our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 157our $TICK_START; # for load detecting purposes
124 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
125binmode STDOUT; 167binmode STDOUT;
126binmode STDERR; 168binmode STDERR;
127 169
128# read virtual server time, if available 170# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 171unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 172 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
133} 175}
176
177eval "sub TICK() { $TICK } 1" or die;
134 178
135mkdir $_ 179mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 181
138our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
139 183
140sub cf::map::normalise; 184sub cf::map::normalise;
141 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
142############################################################################# 190#############################################################################
143 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
144=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
145 204
146=over 4 205=over 4
147 206
148=item $cf::UPTIME 207=item $cf::UPTIME
149 208
150The 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.
151 225
152=item $cf::RUNTIME 226=item $cf::RUNTIME
153 227
154The 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
155every server tick. 229every server tick.
156 230
157=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
158$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
159$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
160 234
161Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
162directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
163unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
164database environment. 238database environment.
165 239
166=item $cf::NOW
167
168The time of the last (current) server tick.
169
170=item $cf::TICK
171
172The interval between server ticks, in seconds.
173
174=item $cf::LOADAVG 240=item $cf::LOADAVG
175 241
176The 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
177(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
178objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
187from wherever your confdir points to. 253from wherever your confdir points to.
188 254
189=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
190 256
191These 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
192returns 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
193per 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.
194 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
195=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
196 279
197This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
198C<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
199that call. 282that call.
200 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
201=back 290=back
202 291
203=cut 292=cut
204 293
205BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
206 *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 {
207 my $msg = join "", @_; 301 my $msg = join "", @_;
208 302
209 $msg .= "\n" 303 $msg .= "\n"
210 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
211 305
212 $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;
213 307
214 LOG llevError, $msg; 308 LOG llevWarn, $msg;
215 }; 309};
216}
217 310
218$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
220 313
221 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 318 return;#d#
224 }#d# 319 }#d#
225 320
226 # kill coroutine otherwise 321 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 322 Coro::terminate
229}; 323};
230
231$SIG{__DIE__} = sub { }; #d#?
232 324
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 335for my $pkg (qw(
244 cf::global cf::attachable 336 cf::global cf::attachable
245 cf::object cf::object::player 337 cf::object cf::object::player
246 cf::client cf::player 338 cf::client cf::player
247 cf::arch cf::living 339 cf::arch cf::living
340 cf::map cf::mapspace
248 cf::map cf::party cf::region 341 cf::party cf::region
249)) { 342)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 344}
253 345
254$EV::DIED = sub { 346$EV::DIED = sub {
255 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
256}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
257 354
258############################################################################# 355#############################################################################
259 356
260=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
261 358
282 $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;
283 $d 380 $d
284 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
285} 382}
286 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
287=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
288 437
289Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
290 439
291=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
297our $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
298 447
299sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 513=item cf::lock_wait $string
303 514
304Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
305 516
306=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
307 518
308Wait 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
309a 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,
310for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
311returned. 522returned.
312 523
313Locks 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
314deadlocked coro. 525deadlocked coro.
320 531
321Return 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.
322 533
323=cut 534=cut
324 535
325our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 537
328sub lock_wait($) { 538sub lock_wait($) {
329 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 540}
342 541
343sub lock_acquire($) { 542sub lock_acquire($) {
344 my ($key) = @_; 543 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 544}
358 545
359sub lock_active($) { 546sub lock_active($) {
360 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 548}
364 549
365sub freeze_mainloop { 550sub freeze_mainloop {
366 tick_inhibit_inc; 551 tick_inhibit_inc;
367 552
368 Coro::guard \&tick_inhibit_dec; 553 &Guard::guard (\&tick_inhibit_dec);
369} 554}
370 555
371=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
372 557
373Like 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
374get spread over timer. 559get spread over time.
375 560
376=cut 561=cut
377 562
378sub periodic($$) { 563sub periodic($$) {
379 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
383 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
384} 569}
385 570
386=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
387 572
388Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
389This 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
390of 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.
391 580
392The 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
393used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
394 583
395Useful for short background jobs. 584Useful for short background jobs.
396 585
397=cut 586=cut
398 587
399our @SLOT_QUEUE; 588our @SLOT_QUEUE;
400our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
401 591
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
405 595
406 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
407 598
408 while () { 599 while () {
409 next_job: 600 next_job:
601
410 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 603
412 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 608 $job->[2]->send;
416 Coro::cede; 609 Coro::cede;
417 goto next_job; 610 goto next_job;
418 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 613 }
420 } 614 }
421 615
422 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
423 # 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
424 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
425 $signal->wait;
426 } else { 619 } else {
620 $busy = 0;
427 Coro::schedule; 621 Coro::schedule;
428 } 622 }
429 } 623 }
430}; 624};
431 625
432sub get_slot($;$$) { 626sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
434 628
435 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
436 630
437 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
438 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
439 634
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
468=cut 663=cut
469 664
470sub sync_job(&) { 665sub sync_job(&) {
471 my ($job) = @_; 666 my ($job) = @_;
472 667
473 if ($Coro::current == $Coro::main) { 668 if (in_main) {
474 my $time = EV::time; 669 my $time = AE::time;
475 670
476 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
478 673
479 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
480 675
481 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
482 677
483 my $busy = 1; 678 my $busy = 1;
484 my @res; 679 my @res;
485 680
486 (async { 681 (async {
487 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 683 @res = eval { $job->() };
489 warn $@ if $@; 684 error $@ if $@;
490 undef $busy; 685 undef $busy;
491 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
492 687
493 while ($busy) { 688 while ($busy) {
494 if (Coro::nready) { 689 if (Coro::nready) {
496 } else { 691 } else {
497 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
498 } 693 }
499 } 694 }
500 695
501 my $time = EV::time - $time; 696 my $time = AE::time - $time;
502 697
503 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
504 699
505 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
506 } else { 701 } else {
528 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
529 724
530 $coro 725 $coro
531} 726}
532 727
533=item fork_call { }, $args 728=item fork_call { }, @args
534 729
535Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
536process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
537Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
538never block itself or use any form of event handling. 733never block itself or use any form of event handling.
539 734
540=cut 735=cut
541 736
737sub post_fork {
738 reset_signals;
739}
740
542sub fork_call(&@) { 741sub fork_call(&@) {
543 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
544 743
545 # 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,
546 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
547 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
548 747
549 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
550 reset_signals; 749 cf::post_fork;
551 &$cb 750 &$cb
552 }, @args; 751 } @args;
553 752
554 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 )
555} 765}
556 766
557=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
558 768
559=cut 769=cut
596within each server. 806within each server.
597 807
598=cut 808=cut
599 809
600sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
601 my ($name) = @_; 814 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
603 816
604 eval { 817 eval {
605 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
615} 828}
616 829
617our $DB; 830our $DB;
618 831
619sub db_init { 832sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
622 };
623} 834}
624 835
625sub db_get($$) { 836sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
627 838
628 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
629 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
630 843
631 $! ? () 844 $! ? ()
632 : $data 845 : $data
633 }
634} 846}
635 847
636sub db_put($$$) { 848sub db_put($$$) {
637 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
666 878
667 my @data; 879 my @data;
668 my $md5; 880 my $md5;
669 881
670 for (0 .. $#$src) { 882 for (0 .. $#$src) {
671 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
672 or Carp::croak "$src->[$_]: $!";
673 } 884 }
674 885
675 # if processing is expensive, check 886 # if processing is expensive, check
676 # checksum first 887 # checksum first
677 if (1) { 888 if (1) {
694 905
695 my $t1 = Time::HiRes::time; 906 my $t1 = Time::HiRes::time;
696 my $data = $process->(\@data); 907 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 908 my $t2 = Time::HiRes::time;
698 909
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 911
701 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
704 915
714 925
715=cut 926=cut
716 927
717sub datalog($@) { 928sub datalog($@) {
718 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 931}
721 932
722=back 933=back
723 934
724=cut 935=cut
725 936
726############################################################################# 937#############################################################################
727 938
728=head2 ATTACHABLE OBJECTS 939=head2 ATTACHABLE OBJECTS
729 940
730Many 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
731attach callbacks/event handlers (a collection of which is called an "attachment") 942attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 943to it. All such attachable objects support the following methods.
733 944
734In 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>
735C<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
785=item cf::CLASS::attachment $name, ... 996=item cf::CLASS::attachment $name, ...
786 997
787Register an attachment by C<$name> through which attachable objects of the 998Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 999given CLASS can refer to this attachment.
789 1000
790Some classes such as crossfire maps and objects can specify attachments 1001Some classes such as deliantra maps and objects can specify attachments
791that 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.
792 1003
793These calls expect any number of the following handler/hook descriptions: 1004These calls expect any number of the following handler/hook descriptions:
794 1005
795=over 4 1006=over 4
919 1130
920 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 1133
923 } elsif (ref $type) { 1134 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
925 1136
926 } else { 1137 } else {
927 shift @arg; 1138 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
929 } 1140 }
930 } 1141 }
931} 1142}
932 1143
933sub _object_attach { 1144sub _object_attach {
943 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
944 } 1155 }
945 1156
946 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
947 } else { 1158 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1160 }
950 1161
951 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
952} 1163}
953 1164
1012 1223
1013 for (@$callbacks) { 1224 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1015 1226
1016 if ($@) { 1227 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1229 override;
1020 } 1230 }
1021 1231
1022 return 1 if $override; 1232 return 1 if $override;
1023 } 1233 }
1086 1296
1087sub reattach { 1297sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1298 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1299 my ($obj) = @_;
1090 1300
1301 # no longer needed after getting rid of delete_package?
1091 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
1092 1303
1093 my $registry = $obj->registry; 1304 my $registry = $obj->registry;
1094 1305
1095 @$registry = (); 1306 @$registry = ();
1096 1307
1101 for (@$attach) { 1312 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1104 } 1315 }
1105 } else { 1316 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1318 }
1108 } 1319 }
1109} 1320}
1110 1321
1111cf::attachable->attach ( 1322cf::attachable->attach (
1138 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1139 1350
1140 sync_job { 1351 sync_job {
1141 if (length $$rdata) { 1352 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1145 1357
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 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 }
1150 aio_close $fh; 1365 aio_close $fh;
1151 1366
1152 if (@$objs) { 1367 if (@$objs) {
1153 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) {
1154 aio_chmod $fh, SAVE_MODE; 1369 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1370 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1371 aio_write $fh, 0, (length $data), $data, 0;
1157 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 }
1158 aio_close $fh; 1376 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1377 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1378 }
1161 } else { 1379 } else {
1162 aio_unlink "$filename.pst"; 1380 aio_unlink "$filename.pst";
1163 } 1381 }
1164 1382
1165 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1384
1385 $filename =~ s%/[^/]+$%%;
1386 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1387 } else {
1167 warn "FATAL: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1168 } 1389 }
1169 } else { 1390 } else {
1170 aio_unlink $filename; 1391 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1172 } 1393 }
1196 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1418 $av = $st->{objs};
1198 } 1419 }
1199 1420
1200 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1203 1425
1204 ($data, $av) 1426 ($data, $av)
1205} 1427}
1206 1428
1207=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1211=cut 1433=cut
1212 1434
1213############################################################################# 1435#############################################################################
1214# command handling &c 1436# command handling &c
1215 1437
1216=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1217 1439
1218Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1219$name. 1441$name.
1220 1442
1221=cut 1443=cut
1227 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1228 1450
1229 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1230} 1452}
1231 1453
1232=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1233 1455
1234Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1235extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1236received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1237the 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
1238has logged in successfully. 1460has logged in successfully.
1239 1461
1240If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1241called.
1242 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
1243=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1244 1470
1245Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1246exticmd 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
1247are 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
1248is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1249log-in. 1475log-in.
1250 1476
1251If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1252called.
1253 1478
1254=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1255 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
1256sub register_extcmd { 1486sub register_extcmd($$) {
1257 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1258 1488
1259 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1260} 1490}
1261 1491
1262sub register_exticmd { 1492sub register_async_extcmd($$) {
1263 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1264 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1265 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1266} 1502}
1267 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1510use File::Glob ();
1511
1268cf::player->attach ( 1512cf::player->attach (
1269 on_command => sub { 1513 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1271 1515
1272 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1273 or return; 1517 or return;
1274 1518
1282 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1283 1527
1284 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1285 1529
1286 if (ref $msg) { 1530 if (ref $msg) {
1287 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1288 "ARRAY" eq ref $msg
1289 ? @$msg
1290 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1291 1532
1292 my @reply;
1293
1294 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}) {
1295 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1296 } 1551 }
1297 1552
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1301 } else { 1553 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1555 }
1304 1556
1305 cf::override; 1557 cf::override;
1306 }, 1558 },
1307); 1559);
1308 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
1309sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1310 cf::sync_job { 1590 cf::sync_job {
1311 my %todo; 1591 my %todo;
1312 1592
1313 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1594 next unless -r $path;
1332 1612
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1615
1336 $ext{source} = 1616 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1339 . $source 1619 . $source
1340 . "\n};\n1"; 1620 . "\n};\n1";
1341 1621
1342 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1343 } 1623 }
1344 1624
1625 my $pass = 0;
1345 my %done; 1626 my %done;
1346 while (%todo) { 1627 while (%todo) {
1347 my $progress; 1628 my $progress;
1348 1629
1630 ++$pass;
1631
1632 ext:
1349 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1635 next ext
1352 unless exists $done{$_}; 1636 unless exists $done{$_};
1353 } 1637 }
1354 1638
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1640
1357 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 $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1654
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1656 if exists $v->{meta}{mandatory};
1365 1657
1366 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;
1367 } 1667 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1668 }
1373 1669
1374 skip: 1670 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 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 }
1377 } 1680 }
1378 }; 1681 };
1379} 1682}
1380 1683
1381############################################################################# 1684#############################################################################
1382 1685
1383=back 1686=back
1384 1687
1385=head2 CORE EXTENSIONS 1688=head2 CORE EXTENSIONS
1386 1689
1387Functions and methods that extend core crossfire objects. 1690Functions and methods that extend core deliantra objects.
1388 1691
1389=cut 1692=cut
1390 1693
1391package cf::player; 1694package cf::player;
1392 1695
1435 1738
1436sub exists($) { 1739sub exists($) {
1437 my ($login) = @_; 1740 my ($login) = @_;
1438 1741
1439 $cf::PLAYER{$login} 1742 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1743 or !aio_stat path $login
1441} 1744}
1442 1745
1443sub find($) { 1746sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1747 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1748 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1466 } 1769 }
1467 } 1770 }
1468} 1771}
1469 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
1470sub save($) { 1786sub save($) {
1471 my ($pl) = @_; 1787 my ($pl) = @_;
1472 1788
1473 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1474 1790
1479 1795
1480 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1482 1798
1483 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];
1484 1803
1485 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1805 cf::cede_to_tick;
1487} 1806}
1488 1807
1520 my ($pl) = @_; 1839 my ($pl) = @_;
1521 1840
1522 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1523 1842
1524 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1525 $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
1526 1845
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1528 $pl->deactivate; 1847 $pl->deactivate;
1848
1529 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;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1532 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1533 1854
1534 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1536 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1590 \@logins 1911 \@logins
1591} 1912}
1592 1913
1593=item $player->maps 1914=item $player->maps
1594 1915
1916=item cf::player::maps $login
1917
1595Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1596player. May block. 1919player. May block.
1597 1920
1598=cut 1921=cut
1599 1922
1616 } 1939 }
1617 1940
1618 \@paths 1941 \@paths
1619} 1942}
1620 1943
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1945
1623Expand crossfire pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713
1714=item $player->ext_reply ($msgid, @msg)
1715
1716Sends an ext reply to the player.
1717
1718=cut
1719
1720sub ext_reply($$@) {
1721 my ($self, $id, @msg) = @_;
1722
1723 $self->ns->ext_reply ($id, @msg)
1724}
1725 1947
1726=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1727 1949
1728Sends an ext event to the client. 1950Sends an ext event to the client.
1729 1951
1749 1971
1750=cut 1972=cut
1751 1973
1752sub find_by_path($) { 1974sub find_by_path($) {
1753 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1754 1978
1755 my ($match, $specificity); 1979 my ($match, $specificity);
1756 1980
1757 for my $region (list) { 1981 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1787sub generate_random_map { 2011sub generate_random_map {
1788 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1789 2013
1790 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
1791 2015
1792 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1801 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1802 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1803 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1804 (cf::region::find $rmp->{region}), $rmp->{custom}
1805 )
1806} 2017}
1807 2018
1808=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1809 2020
1810Register 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
1815 2026
1816sub register { 2027sub register {
1817 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 2029 my $pkg = caller;
1819 2030
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 2032
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 2034}
1825 2035
1826# also paths starting with '/' 2036# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 2038
1829sub thawer_merge { 2039sub thawer_merge {
1830 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1831 2041
1832 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1837} 2047}
1838 2048
1839sub normalise { 2049sub normalise {
1840 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1841 2051
1842 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1843 2053
1844 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1845 2055
1846 # map plan: 2056 # map plan:
1847 # 2057 #
1862 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1863 $path = "$base/$path"; 2073 $path = "$base/$path";
1864 } 2074 }
1865 2075
1866 for ($path) { 2076 for ($path) {
1867 redo if s{//}{/};
1868 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1869 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1870 } 2079 }
1871 2080
1872 $path 2081 $path
1886 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1887 return $self; 2096 return $self;
1888 } 2097 }
1889 } 2098 }
1890 2099
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 2101 ()
1893} 2102}
1894 2103
2104# may re-bless or do other evil things
1895sub init { 2105sub init {
1896 my ($self) = @_; 2106 my ($self) = @_;
1897 2107
1898 $self 2108 $self
1899} 2109}
1930 2140
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2141 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 2142 "$UNIQUEDIR/$path"
1933} 2143}
1934 2144
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 2145sub decay_objects {
1945 my ($self) = @_; 2146 my ($self) = @_;
1946 2147
1947 return if $self->{deny_reset}; 2148 return if $self->{deny_reset};
1948 2149
1973 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1974 2175
1975 1 2176 1
1976} 2177}
1977 2178
2179# used to laod the header of an original map
1978sub load_header_orig { 2180sub load_header_orig {
1979 my ($self) = @_; 2181 my ($self) = @_;
1980 2182
1981 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1982} 2184}
1983 2185
2186# used to laod the header of an instantiated map
1984sub load_header_temp { 2187sub load_header_temp {
1985 my ($self) = @_; 2188 my ($self) = @_;
1986 2189
1987 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1988} 2191}
1989 2192
2193# called after loading the header from an instantiated map
1990sub prepare_temp { 2194sub prepare_temp {
1991 my ($self) = @_; 2195 my ($self) = @_;
1992 2196
1993 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1995 # safety 2199 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2202}
1999 2203
2204# called after loading the header from an original map
2000sub prepare_orig { 2205sub prepare_orig {
2001 my ($self) = @_; 2206 my ($self) = @_;
2002 2207
2003 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
2028 2233
2029sub find; 2234sub find;
2030sub find { 2235sub find {
2031 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2032 2237
2238 cf::cede_to_tick;
2239
2033 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
2034 2241
2035 cf::lock_wait "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2244
2038 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2246 my $map = new_from_path cf::map $path
2043 or return; 2247 or return;
2044 2248
2045 $map->{last_save} = $cf::RUNTIME; 2249 $map->{last_save} = $cf::RUNTIME;
2046 2250
2058 2262
2059 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
2060 } 2264 }
2061} 2265}
2062 2266
2063sub pre_load { } 2267sub pre_load { }
2064sub post_load { } 2268#sub post_load { } # XS
2065 2269
2066sub load { 2270sub load {
2067 my ($self) = @_; 2271 my ($self) = @_;
2068 2272
2069 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
2072 2276
2073 { 2277 {
2074 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2075 2279
2076 return unless $self->valid; 2280 return unless $self->valid;
2077 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2078
2079 $self->in_memory (cf::MAP_LOADING);
2080 2282
2081 $self->alloc; 2283 $self->alloc;
2082 2284
2083 $self->pre_load; 2285 $self->pre_load;
2084 cf::cede_to_tick; 2286 cf::cede_to_tick;
2085 2287
2288 if (exists $self->{load_path}) {
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2290 $f->skip_block;
2088 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2089 or return; 2292 or return;
2090 2293
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2294 $self->post_load_original
2092 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2093 2296
2094 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2298 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2098 $self->clear_unique_items; 2301 $self->clear_unique_items;
2099 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2101 } 2305 }
2102 } 2306 }
2103 }
2104 2307
2105 $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);
2106 2315
2107 cf::cede_to_tick; 2316 cf::cede_to_tick;
2108 # now do the right thing for maps 2317 # now do the right thing for maps
2109 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2110 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2114 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2324 $self->decay_objects;
2116 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2117 $self->update_buttons; 2326 $self->update_buttons;
2118 cf::cede_to_tick; 2327 cf::cede_to_tick;
2119 $self->set_darkness_map; 2328 #$self->activate; # no longer activate maps automatically
2120 cf::cede_to_tick;
2121 $self->activate;
2122 } 2329 }
2123 2330
2124 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2126
2127 $self->in_memory (cf::MAP_ACTIVE);
2128 } 2333 }
2129 2334
2130 $self->post_load; 2335 $self->post_load;
2131}
2132 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
2133sub customise_for { 2343sub customise_for {
2134 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2135 2345
2136 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2347 if $self->per_player;
2140# if $self->per_party; 2350# if $self->per_party;
2141 2351
2142 $self 2352 $self
2143} 2353}
2144 2354
2145# find and load all maps in the 3x3 area around a map
2146sub load_neighbours {
2147 my ($map) = @_;
2148
2149 my @neigh; # diagonal neighbours
2150
2151 for (0 .. 3) {
2152 my $neigh = $map->tile_path ($_)
2153 or next;
2154 $neigh = find $neigh, $map
2155 or next;
2156 $neigh->load;
2157
2158 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 }
2162
2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
2165 my $neigh = find $path, $origin
2166 or next;
2167 $neigh->load;
2168 }
2169}
2170
2171sub find_sync { 2355sub find_sync {
2172 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2173 2357
2174 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
2175} 2363}
2176 2364
2177sub do_load_sync { 2365sub do_load_sync {
2178 my ($map) = @_; 2366 my ($map) = @_;
2179 2367
2368 # it's a bug to call this from the main context
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2182 2371
2183 cf::sync_job { $map->load }; 2372 $map->load;
2184} 2373}
2185 2374
2186our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2188 2377
2189sub find_async { 2378sub find_async {
2190 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2191 2380
2192 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2193 2382
2194 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2196 } 2385 }
2197 2386
2198 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2199 2388
2200 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2214 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2215 2404
2216 () 2405 ()
2217} 2406}
2218 2407
2408# common code, used by both ->save and ->swapout
2219sub save { 2409sub _save {
2220 my ($self) = @_; 2410 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2411
2224 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2225 2413
2226 return unless $self->dirty; 2414 return unless $self->dirty;
2227 2415
2247 } else { 2435 } else {
2248 $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);
2249 } 2437 }
2250} 2438}
2251 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2252sub swap_out { 2448sub swap_out {
2253 my ($self) = @_; 2449 my ($self) = @_;
2254 2450
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2260 return if $self->players; 2455 return if $self->players;
2261 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
2262 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2263 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
2264 $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};
2265 2507
2266 $self->deactivate; 2508 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2510 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2511
2314 $self->unlink_save; 2512 $self->unlink_save;
2315 $self->destroy; 2513 $self->destroy;
2316} 2514}
2317 2515
2325 2523
2326 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2327 2525
2328 $self->unlink_save; 2526 $self->unlink_save;
2329 2527
2330 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2533
2392 : normalise $_ 2590 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2592 ]
2395} 2593}
2396 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
2397=back 2627=back
2398 2628
2399=head3 cf::object 2629=head3 cf::object
2400 2630
2401=cut 2631=cut
2466 2696
2467our $SAY_CHANNEL = { 2697our $SAY_CHANNEL = {
2468 id => "say", 2698 id => "say",
2469 title => "Map", 2699 title => "Map",
2470 reply => "say ", 2700 reply => "say ",
2471 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.",
2472}; 2702};
2473 2703
2474our $CHAT_CHANNEL = { 2704our $CHAT_CHANNEL = {
2475 id => "chat", 2705 id => "chat",
2476 title => "Chat", 2706 title => "Chat",
2531 2761
2532=item $player_object->enter_link 2762=item $player_object->enter_link
2533 2763
2534Freezes 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}>).
2535 2765
2536The 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.
2537I<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.
2538 2770
2539Will never block. 2771Will never block.
2540 2772
2541=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2542 2774
2562sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2563 my ($self) = @_; 2795 my ($self) = @_;
2564 2796
2565 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2566 2798
2799 ++$self->{_link_recursion};
2800
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2802
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2571 2805
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2807}
2574 2808
2575sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2577 2811
2594 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2596 2830
2597 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2600 2834
2601 $map->load; 2835 $map->load;
2602 $map->load_neighbours;
2603 2836
2604 return unless $self->contr->active; 2837 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2838
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2609} 2841 # entering was successful
2842 delete $self->{_link_recursion};
2843 # only activate afterwards, to support waiting in hooks
2844 $self->activate_recursive;
2845 }
2610 2846
2847}
2848
2611=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)]])
2612 2850
2613Moves 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
2614her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2615that 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
2616the 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
2617be called at the end of this process. 2855be called at the end of this process.
2618 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
2619=cut 2860=cut
2620 2861
2621our $GOTOGEN; 2862our $GOTOGEN;
2622 2863
2623sub cf::object::player::goto { 2864sub cf::object::player::goto {
2624 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 }
2625 2872
2626 # 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
2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2628 2875
2629 $self->enter_link; 2876 $self->enter_link;
2649 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2650 } 2897 }
2651 } 2898 }
2652 2899
2653 my $map = eval { 2900 my $map = eval {
2654 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2655 2902
2656 if ($map) { 2903 if ($map) {
2657 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2658 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2659 } else { 2906 } else {
2660 $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);
2661 } 2908 }
2662 2909
2663 $map 2910 $map
2671 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2672 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2673 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2674 } 2921 }
2675 2922
2676 $done->() if $done; 2923 $done->($self) if $done;
2677 })->prio (1); 2924 })->prio (1);
2678} 2925}
2679 2926
2680=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2681 2928
2749 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2750 2997
2751 unless (eval { 2998 unless (eval {
2752 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2753 3000
2754 # random map handling
2755 {
2756 my $guard = cf::lock_acquire "exit_prepare:$exit";
2757
2758 prepare_random_map $exit
2759 if $exit->slaying eq "/!";
2760 }
2761
2762 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2763 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2764 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 }
2765 3027
2766 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2767 3029
2768 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2769 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 3032 if $exit->flag (cf::FLAG_DAMNED);
2771 3033
2772 1 3034 1
2773 }) { 3035 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "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. "
2776 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2778 3040
2779 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2780 $self->leave_link; 3042 $self->leave_link;
2781 } 3043 }
2782 })->prio (1); 3044 })->prio (1);
2783} 3045}
2784 3046
2796sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2798 3060
2799 utf8::encode $text; 3061 utf8::encode $text;
2800 $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);
2801} 3088}
2802 3089
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 3091
2805Send 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
2809 3096
2810=cut 3097=cut
2811 3098
2812# non-persistent channels (usually the info channel) 3099# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 3100our %CHANNEL = (
3101 "c/motd" => {
3102 id => "infobox",
3103 title => "MOTD",
3104 reply => undef,
3105 tooltip => "The message of the day",
3106 },
2814 "c/identify" => { 3107 "c/identify" => {
2815 id => "infobox", 3108 id => "infobox",
2816 title => "Identify", 3109 title => "Identify",
2817 reply => undef, 3110 reply => undef,
2818 tooltip => "Items recently identified", 3111 tooltip => "Items recently identified",
2820 "c/examine" => { 3113 "c/examine" => {
2821 id => "infobox", 3114 id => "infobox",
2822 title => "Examine", 3115 title => "Examine",
2823 reply => undef, 3116 reply => undef,
2824 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",
2825 }, 3124 },
2826 "c/book" => { 3125 "c/book" => {
2827 id => "infobox", 3126 id => "infobox",
2828 title => "Book", 3127 title => "Book",
2829 reply => undef, 3128 reply => undef,
2845 id => "infobox", 3144 id => "infobox",
2846 title => "Body Parts", 3145 title => "Body Parts",
2847 reply => undef, 3146 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 3147 tooltip => "Shows which body parts you posess and are available",
2849 }, 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 },
2850 "c/uptime" => { 3185 "c/uptime" => {
2851 id => "infobox", 3186 id => "infobox",
2852 title => "Uptime", 3187 title => "Uptime",
2853 reply => undef, 3188 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 3189 tooltip => "How long the server has been running since last restart",
2863 id => "party", 3198 id => "party",
2864 title => "Party", 3199 title => "Party",
2865 reply => "gsay ", 3200 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 3201 tooltip => "Messages and chat related to your party",
2867 }, 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,
2868); 3211);
2869 3212
2870sub cf::client::send_msg { 3213sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 3214 my ($self, $channel, $msg, $color, @extra) = @_;
2872 3215
2873 $msg = $self->pl->expand_cfpod ($msg); 3216 $msg = $self->pl->expand_cfpod ($msg)
3217 unless $color & cf::NDI_VERBATIM;
2874 3218
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 3219 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 3220
2877 # check predefined channels, for the benefit of C 3221 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 3222 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 3223 $channel = $CHANNEL{$channel};
2880 3224
2881 $self->ext_msg (channel_info => $channel) 3225 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 3226 $channel = $channel->{id};
2885 3227
2886 } elsif (ref $channel) { 3228 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 3229 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 3230 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 3231 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 3232 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 3233 }
2893 3234
2894 $channel = $channel->{id}; 3235 $channel = $channel->{id};
2895 } 3236 }
2896 3237
2897 return unless @extra || length $msg; 3238 return unless @extra || length $msg;
2898 3239
2899 if ($self->can_msg) {
2900 # default colour, mask it out 3240 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3241 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 3242 if $color & cf::NDI_DEF;
2903 3243
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3244 my $pkt = "msg "
3245 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 3247 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 3248
2918 $color &= cf::NDI_COLOR_MASK; 3249 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 3250}
2932 3251
2933=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2934 3253
2935Sends an ext event to the client. 3254Sends an ext event to the client.
2937=cut 3256=cut
2938 3257
2939sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2941 3260
2942 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 }
2948}
2949
2950=item $client->ext_reply ($msgid, @msg)
2951
2952Sends an ext reply to the client.
2953
2954=cut
2955
2956sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_;
2958
2959 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 }
2966} 3262}
2967 3263
2968=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2969 3265
2970Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
3025 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
3026 3322
3027 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3028 3324
3029 if (ref $msg) { 3325 if (ref $msg) {
3030 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3031 "ARRAY" eq ref $msg
3032 ? @$msg
3033 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3034 3327
3035 my @reply;
3036
3037 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}) {
3038 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
3039 } 3346 }
3040
3041 $ns->ext_reply ($reply, @reply)
3042 if $reply;
3043
3044 } else { 3347 } else {
3045 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";
3046 } 3349 }
3047 3350
3048 cf::override; 3351 cf::override;
3049 }, 3352 },
3050); 3353);
3070 3373
3071 $coro 3374 $coro
3072} 3375}
3073 3376
3074cf::client->attach ( 3377cf::client->attach (
3075 on_destroy => sub { 3378 on_client_destroy => sub {
3076 my ($ns) = @_; 3379 my ($ns) = @_;
3077 3380
3078 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3079 }, 3382 },
3080); 3383);
3096our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3097 3400
3098$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3099 3402
3100$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3101 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3102 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3103 sort time 3406 sort time
3104)); 3407));
3105 3408
3106# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3110The following functions and methods are available within a safe environment: 3413The following functions and methods are available within a safe environment:
3111 3414
3112 cf::object 3415 cf::object
3113 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
3114 insert remove name archname title slaying race decrease split 3417 insert remove name archname title slaying race decrease split
3418 value
3115 3419
3116 cf::object::player 3420 cf::object::player
3117 player 3421 player
3118 3422
3119 cf::player 3423 cf::player
3125=cut 3429=cut
3126 3430
3127for ( 3431for (
3128 ["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
3129 insert remove inv nrof name archname title slaying race 3433 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3436 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3134) { 3438) {
3135 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3138 for @funs; 3441 for @funs;
3139} 3442}
3140 3443
3155 3458
3156 my $qcode = $code; 3459 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3159 3462
3463 %vars = (_dummy => 0) unless %vars;
3464
3465 my @res;
3160 local $_; 3466 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars;
3162 3467
3163 my $eval = 3468 my $eval =
3164 "do {\n" 3469 "do {\n"
3165 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3166 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3167 . $code 3472 . $code
3168 . "\n}" 3473 . "\n}"
3169 ; 3474 ;
3170 3475
3476 if ($CFG{safe_eval}) {
3171 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3172 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3173 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 }
3174 3485
3175 if ($@) { 3486 if ($@) {
3176 warn "$@"; 3487 warn "$@",
3177 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3178 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3179 } 3490 }
3180 3491
3181 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3182} 3493}
3183 3494
3197=cut 3508=cut
3198 3509
3199sub register_script_function { 3510sub register_script_function {
3200 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3201 3512
3202 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3203 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3204} 3515}
3205 3516
3206=back 3517=back
3207 3518
3208=cut 3519=cut
3209 3520
3210############################################################################# 3521#############################################################################
3211# 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 add_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}
3212 3547
3213sub load_facedata($) { 3548sub load_facedata($) {
3214 my ($path) = @_; 3549 my ($path) = @_;
3215 3550
3216 # 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
3217 # for this (global event?) 3552 # for this (global event?)
3218 %ext::player_env::MUSIC_FACE_CACHE = (); 3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3219 3554
3220 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3221 3556
3222 warn "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3223 3558
3224 my $facedata; 3559 my $facedata = decode_storable load_file $path;
3225 0 < aio_load $path, $facedata
3226 or die "$path: $!";
3227
3228 $facedata = Coro::Storable::thaw $facedata;
3229 3560
3230 $facedata->{version} == 2 3561 $facedata->{version} == 2
3231 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3232 3563
3233 # patch in the exptable
3234 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3237 };
3238 cf::cede_to_tick; 3564 cf::cede_to_tick;
3239 3565
3240 { 3566 {
3241 my $faces = $facedata->{faceinfo}; 3567 my $faces = $facedata->{faceinfo};
3242 3568
3243 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3572
3246 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3250 3579
3251 cf::cede_to_tick; 3580 cf::cede_to_tick;
3252 } 3581 }
3253 3582
3254 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3259 3588
3260 if (my $smooth = cf::face::find $info->{smooth}) { 3589 if (my $smooth = cf::face::find $info->{smooth}) {
3261 cf::face::set_smooth $idx, $smooth; 3590 cf::face::set_smooth $idx, $smooth;
3262 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3263 } else { 3592 } else {
3264 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3593 error "smooth face '$info->{smooth}' not found for face '$face'";
3265 } 3594 }
3266 3595
3267 cf::cede_to_tick; 3596 cf::cede_to_tick;
3268 } 3597 }
3269 } 3598 }
3278 3607
3279 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3280 } 3609 }
3281 3610
3282 { 3611 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3612 my $res = $facedata->{resource};
3286 3613
3287 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3288 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
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3618
3292 if ($info->{type} & 1) {
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 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#
3307 } else { 3623 } else {
3308 $RESOURCE{$name} = $info; 3624# $RESOURCE{$name} = $info; # unused
3309 } 3625 }
3310 3626
3311 cf::cede_to_tick; 3627 cf::cede_to_tick;
3312 } 3628 }
3313 } 3629 }
3314 3630
3315 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3316 3632
3317 1 3633 1
3318} 3634}
3319
3320cf::global->attach (on_resource_update => sub {
3321 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3322 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3323
3324 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3325 my $sound = $soundconf->{compat}[$_]
3326 or next;
3327
3328 my $face = cf::face::find "sound/$sound->[1]";
3329 cf::sound::set $sound->[0] => $face;
3330 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3331 }
3332
3333 while (my ($k, $v) = each %{$soundconf->{event}}) {
3334 my $face = cf::face::find "sound/$v";
3335 cf::sound::set $k => $face;
3336 }
3337 }
3338});
3339 3635
3340register_exticmd fx_want => sub { 3636register_exticmd fx_want => sub {
3341 my ($ns, $want) = @_; 3637 my ($ns, $want) = @_;
3342 3638
3343 while (my ($k, $v) = each %$want) { 3639 while (my ($k, $v) = each %$want) {
3351 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3352 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3353 cf::arch::commit_load; 3649 cf::arch::commit_load;
3354 3650
3355 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 add_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;
3356} 3665}
3357 3666
3358sub reload_regions { 3667sub reload_regions {
3359 # 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
3360 # for this (global event?) 3669 # for this (global event?)
3375} 3684}
3376 3685
3377sub reload_archetypes { 3686sub reload_archetypes {
3378 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3379 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 add_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 add_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3380} 3698}
3381 3699
3382sub reload_treasures { 3700sub reload_treasures {
3383 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3384 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3385} 3703}
3386 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
3725#d# move docstuff to help or so
3726our %DOCSTRING;
3727
3728sub reload_pod {
3729 trace "loading pods $PODDIR\n";
3730
3731 %DOCSTRING = ();
3732 my @command_list;
3733
3734 for (
3735 [0, "command_help"],
3736 [1, "emote_help"],
3737 [2, "dmcommand_help"],
3738 ) {
3739 my ($type, $path) = @$_;
3740
3741 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3742 or die "unable to load $path";
3743
3744 my $level = 1e9;
3745 my $rpar;
3746
3747 for my $par (@$paragraphs) {
3748 if ($par->{type} eq "head2") {
3749 # this code taken almost verbatim from DC/Protocol.pm
3750
3751 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3752 my $cmd = $1;
3753 my @args = split /\|/, $2;
3754 @args = (".*") unless @args;
3755
3756 $_ = $_ eq ".*" ? "" : " $_"
3757 for @args;
3758
3759 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3760
3761 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3762
3763 push @command_list, [$type, \@variants];
3764 $level = $par->{level};
3765 } else {
3766 error "$par->{markup}: unparsable command heading";
3767 }
3768 } elsif ($par->{level} > $level) {
3769 $$rpar .= &cf::pod::as_cfpod ([$par]);
3770 }
3771
3772 cf::cede_to_tick;
3773 }
3774 }
3775
3776 @command_list = sort {
3777 $a->[0] <=> $b->[0]
3778 or $a->[1] cmp $b->[1]
3779 } @command_list;
3780
3781 cf::cede_to_tick;
3782
3783 add_face "res/command_list" => FT_RSRC,
3784 JSON::XS->new->utf8->encode (\@command_list);
3785}
3786
3387sub reload_resources { 3787sub reload_resources {
3388 warn "reloading resource files...\n"; 3788 trace "reloading resource files...\n";
3389 3789
3790 reload_materials;
3390 reload_facedata; 3791 reload_facedata;
3792 reload_exp_table;
3793 reload_sound;
3391 reload_archetypes; 3794 reload_archetypes;
3392 reload_regions; 3795 reload_regions;
3393 reload_treasures; 3796 reload_treasures;
3797 reload_pod;
3394 3798
3395 warn "finished reloading resource files\n"; 3799 trace "finished reloading resource files\n";
3396}
3397
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 reload_resources;
3402} 3800}
3403 3801
3404sub reload_config { 3802sub reload_config {
3405 open my $fh, "<:utf8", "$CONFDIR/config" 3803 trace "reloading config file...\n";
3406 or return;
3407 3804
3408 local $/; 3805 my $config = load_file "$CONFDIR/config";
3409 *CFG = YAML::Load <$fh>; 3806 utf8::decode $config;
3807 *CFG = decode_yaml $config;
3410 3808
3411 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3809 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3412 3810
3413 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3811 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3414 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3812 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3415 3813
3416 if (exists $CFG{mlockall}) { 3814 if (exists $CFG{mlockall}) {
3420 }; 3818 };
3421 warn $@ if $@; 3819 warn $@ if $@;
3422 } 3820 }
3423} 3821}
3424 3822
3823sub pidfile() {
3824 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3825 or die "$PIDFILE: $!";
3826 flock $fh, &Fcntl::LOCK_EX
3827 or die "$PIDFILE: flock: $!";
3828 $fh
3829}
3830
3831# make sure only one server instance is running at any one time
3832sub atomic {
3833 my $fh = pidfile;
3834
3835 my $pid = <$fh>;
3836 kill 9, $pid if $pid > 0;
3837
3838 seek $fh, 0, 0;
3839 print $fh $$;
3840}
3841
3842sub main_loop {
3843 trace "EV::loop starting\n";
3844 if (1) {
3845 EV::loop;
3846 }
3847 trace "EV::loop returned\n";
3848 goto &main_loop unless $REALLY_UNLOOP;
3849}
3850
3425sub main { 3851sub main {
3852 cf::init_globals; # initialise logging
3853
3854 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3855 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3856 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3857 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3858
3859 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3860
3426 # we must not ever block the main coroutine 3861 # we must not ever block the main coroutine
3427 local $Coro::idle = sub { 3862 $Coro::idle = sub {
3428 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3863 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3429 (async { 3864 (async {
3430 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3865 $Coro::current->{desc} = "IDLE BUG HANDLER";
3431 EV::loop EV::LOOP_ONESHOT; 3866 EV::loop EV::LOOP_ONESHOT;
3432 })->prio (Coro::PRIO_MAX); 3867 })->prio (Coro::PRIO_MAX);
3433 }; 3868 };
3434 3869
3435 { 3870 evthread_start IO::AIO::poll_fileno;
3436 my $guard = freeze_mainloop; 3871
3872 cf::sync_job {
3873 cf::incloader::init ();
3874
3875 db_init;
3876
3877 cf::init_anim;
3878 cf::init_attackmess;
3879 cf::init_dynamic;
3880
3881 cf::load_settings;
3882
3883 reload_resources;
3437 reload_config; 3884 reload_config;
3438 db_init; 3885
3886 cf::init_uuid;
3887 cf::init_signals;
3888 cf::init_skills;
3889
3890 cf::init_beforeplay;
3891
3892 atomic;
3893
3439 load_extensions; 3894 load_extensions;
3440 3895
3441 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3896 utime time, time, $RUNTIMEFILE;
3442 evthread_start IO::AIO::poll_fileno; 3897
3898 # no (long-running) fork's whatsoever before this point(!)
3899 use POSIX ();
3900 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3901
3902 cf::_post_init 0;
3443 } 3903 };
3444 3904
3445 EV::loop; 3905 cf::object::thawer::errors_are_fatal 0;
3906 info "parse errors in files are no longer fatal from this point on.\n";
3907
3908 AE::postpone {
3909 undef &main; # free gobs of memory :)
3910 };
3911
3912 goto &main_loop;
3446} 3913}
3447 3914
3448############################################################################# 3915#############################################################################
3449# initialisation and cleanup 3916# initialisation and cleanup
3450 3917
3451# install some emergency cleanup handlers 3918# install some emergency cleanup handlers
3452BEGIN { 3919BEGIN {
3453 our %SIGWATCHER = (); 3920 our %SIGWATCHER = ();
3454 for my $signal (qw(INT HUP TERM)) { 3921 for my $signal (qw(INT HUP TERM)) {
3455 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3922 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3456 cf::cleanup "SIG$signal"; 3923 cf::cleanup "SIG$signal";
3457 }; 3924 };
3458 } 3925 }
3459} 3926}
3460 3927
3461sub write_runtime_sync { 3928sub write_runtime_sync {
3462 my $runtime = "$LOCALDIR/runtime"; 3929 my $t0 = AE::time;
3463 3930
3464 # first touch the runtime file to show we are still running: 3931 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3932 # the fsync below can take a very very long time.
3466 3933
3467 IO::AIO::aio_utime $runtime, undef, undef; 3934 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3935
3469 my $guard = cf::lock_acquire "write_runtime"; 3936 my $guard = cf::lock_acquire "write_runtime";
3470 3937
3471 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3938 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3939 or return;
3473 3940
3474 my $value = $cf::RUNTIME + 90 + 10; 3941 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3942 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3943 # 60 allows for the watchdog to kill the server.
3486 aio_utime $fh, undef, undef; 3953 aio_utime $fh, undef, undef;
3487 3954
3488 close $fh 3955 close $fh
3489 or return; 3956 or return;
3490 3957
3491 aio_rename "$runtime~", $runtime 3958 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3959 and return;
3493 3960
3494 warn "runtime file written.\n"; 3961 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3962
3496 1 3963 1
3497} 3964}
3498 3965
3499our $uuid_lock; 3966our $uuid_lock;
3508 my $uuid = "$LOCALDIR/uuid"; 3975 my $uuid = "$LOCALDIR/uuid";
3509 3976
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3977 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return; 3978 or return;
3512 3979
3513 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3980 my $value = uuid_seq uuid_cur;
3981
3982 unless ($value) {
3983 info "cowardly refusing to write zero uuid value!\n";
3984 return;
3985 }
3986
3987 my $value = uuid_str $value + $uuid_skip;
3514 $uuid_skip = 0; 3988 $uuid_skip = 0;
3515 3989
3516 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3990 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3517 and return; 3991 and return;
3518 3992
3524 or return; 3998 or return;
3525 3999
3526 aio_rename "$uuid~", $uuid 4000 aio_rename "$uuid~", $uuid
3527 and return; 4001 and return;
3528 4002
3529 warn "uuid file written ($value).\n"; 4003 trace "uuid file written ($value).\n";
3530 4004
3531 1 4005 1
3532 4006
3533} 4007}
3534 4008
3540} 4014}
3541 4015
3542sub emergency_save() { 4016sub emergency_save() {
3543 my $freeze_guard = cf::freeze_mainloop; 4017 my $freeze_guard = cf::freeze_mainloop;
3544 4018
3545 warn "enter emergency perl save\n"; 4019 info "emergency_perl_save: enter\n";
4020
4021 # this is a trade-off: we want to be very quick here, so
4022 # save all maps without fsync, and later call a global sync
4023 # (which in turn might be very very slow)
4024 local $USE_FSYNC = 0;
3546 4025
3547 cf::sync_job { 4026 cf::sync_job {
4027 cf::write_runtime_sync; # external watchdog should not bark
4028
3548 # use a peculiar iteration method to avoid tripping on perl 4029 # use a peculiar iteration method to avoid tripping on perl
3549 # refcount bugs in for. also avoids problems with players 4030 # refcount bugs in for. also avoids problems with players
3550 # and maps saved/destroyed asynchronously. 4031 # and maps saved/destroyed asynchronously.
3551 warn "begin emergency player save\n"; 4032 info "emergency_perl_save: begin player save\n";
3552 for my $login (keys %cf::PLAYER) { 4033 for my $login (keys %cf::PLAYER) {
3553 my $pl = $cf::PLAYER{$login} or next; 4034 my $pl = $cf::PLAYER{$login} or next;
3554 $pl->valid or next; 4035 $pl->valid or next;
3555 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4036 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3556 $pl->save; 4037 $pl->save;
3557 } 4038 }
3558 warn "end emergency player save\n"; 4039 info "emergency_perl_save: end player save\n";
3559 4040
3560 warn "begin emergency map save\n"; 4041 cf::write_runtime_sync; # external watchdog should not bark
4042
4043 info "emergency_perl_save: begin map save\n";
3561 for my $path (keys %cf::MAP) { 4044 for my $path (keys %cf::MAP) {
3562 my $map = $cf::MAP{$path} or next; 4045 my $map = $cf::MAP{$path} or next;
3563 $map->valid or next; 4046 $map->valid or next;
3564 $map->save; 4047 $map->save;
3565 } 4048 }
3566 warn "end emergency map save\n"; 4049 info "emergency_perl_save: end map save\n";
3567 4050
3568 warn "begin emergency database checkpoint\n"; 4051 cf::write_runtime_sync; # external watchdog should not bark
4052
4053 info "emergency_perl_save: begin database checkpoint\n";
3569 BDB::db_env_txn_checkpoint $DB_ENV; 4054 BDB::db_env_txn_checkpoint $DB_ENV;
3570 warn "end emergency database checkpoint\n"; 4055 info "emergency_perl_save: end database checkpoint\n";
3571 4056
3572 warn "begin write uuid\n"; 4057 info "emergency_perl_save: begin write uuid\n";
3573 write_uuid_sync 1; 4058 write_uuid_sync 1;
3574 warn "end write uuid\n"; 4059 info "emergency_perl_save: end write uuid\n";
4060
4061 cf::write_runtime_sync; # external watchdog should not bark
4062
4063 trace "emergency_perl_save: syncing database to disk";
4064 BDB::db_env_txn_checkpoint $DB_ENV;
4065
4066 info "emergency_perl_save: starting sync\n";
4067 IO::AIO::aio_sync sub {
4068 info "emergency_perl_save: finished sync\n";
4069 };
4070
4071 cf::write_runtime_sync; # external watchdog should not bark
4072
4073 trace "emergency_perl_save: flushing outstanding aio requests";
4074 while (IO::AIO::nreqs || BDB::nreqs) {
4075 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4076 }
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
3575 }; 4079 };
3576 4080
3577 warn "leave emergency perl save\n"; 4081 info "emergency_perl_save: leave\n";
3578} 4082}
3579 4083
3580sub post_cleanup { 4084sub post_cleanup {
3581 my ($make_core) = @_; 4085 my ($make_core) = @_;
3582 4086
4087 IO::AIO::flush;
4088
3583 warn Carp::longmess "post_cleanup backtrace" 4089 error Carp::longmess "post_cleanup backtrace"
3584 if $make_core; 4090 if $make_core;
4091
4092 my $fh = pidfile;
4093 unlink $PIDFILE if <$fh> == $$;
4094}
4095
4096# a safer delete_package, copied from Symbol
4097sub clear_package($) {
4098 my $pkg = shift;
4099
4100 # expand to full symbol table name if needed
4101 unless ($pkg =~ /^main::.*::$/) {
4102 $pkg = "main$pkg" if $pkg =~ /^::/;
4103 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4104 $pkg .= '::' unless $pkg =~ /::$/;
4105 }
4106
4107 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4108 my $stem_symtab = *{$stem}{HASH};
4109
4110 defined $stem_symtab and exists $stem_symtab->{$leaf}
4111 or return;
4112
4113 # clear all symbols
4114 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4115 for my $name (keys %$leaf_symtab) {
4116 _gv_clear *{"$pkg$name"};
4117# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4118 }
3585} 4119}
3586 4120
3587sub do_reload_perl() { 4121sub do_reload_perl() {
3588 # can/must only be called in main 4122 # can/must only be called in main
3589 if ($Coro::current != $Coro::main) { 4123 unless (in_main) {
3590 warn "can only reload from main coroutine"; 4124 error "can only reload from main coroutine";
3591 return; 4125 return;
3592 } 4126 }
3593 4127
3594 warn "reloading..."; 4128 return if $RELOAD++;
3595 4129
3596 warn "entering sync_job"; 4130 my $t1 = AE::time;
3597 4131
4132 while ($RELOAD) {
4133 cf::get_slot 0.1, -1, "reload_perl";
4134 info "perl_reload: reloading...";
4135
4136 trace "perl_reload: entering sync_job";
4137
3598 cf::sync_job { 4138 cf::sync_job {
3599 cf::write_runtime_sync; # external watchdog should not bark
3600 cf::emergency_save; 4139 #cf::emergency_save;
3601 cf::write_runtime_sync; # external watchdog should not bark
3602 4140
3603 warn "syncing database to disk";
3604 BDB::db_env_txn_checkpoint $DB_ENV;
3605
3606 # if anything goes wrong in here, we should simply crash as we already saved
3607
3608 warn "flushing outstanding aio requests";
3609 for (;;) {
3610 BDB::flush;
3611 IO::AIO::flush;
3612 Coro::cede_notself;
3613 last unless IO::AIO::nreqs || BDB::nreqs;
3614 warn "iterate...";
3615 }
3616
3617 ++$RELOAD;
3618
3619 warn "cancelling all extension coros"; 4141 trace "perl_reload: cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO; 4142 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = (); 4143 %EXT_CORO = ();
3622 4144
3623 warn "removing commands"; 4145 trace "perl_reload: removing commands";
3624 %COMMAND = (); 4146 %COMMAND = ();
3625 4147
3626 warn "removing ext/exti commands"; 4148 trace "perl_reload: removing ext/exti commands";
3627 %EXTCMD = (); 4149 %EXTCMD = ();
3628 %EXTICMD = (); 4150 %EXTICMD = ();
3629 4151
3630 warn "unloading/nuking all extensions"; 4152 trace "perl_reload: unloading/nuking all extensions";
3631 for my $pkg (@EXTS) { 4153 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg"; 4154 trace "... unloading $pkg";
3633 4155
3634 if (my $cb = $pkg->can ("unload")) { 4156 if (my $cb = $pkg->can ("unload")) {
3635 eval { 4157 eval {
3636 $cb->($pkg); 4158 $cb->($pkg);
3637 1 4159 1
3638 } or warn "$pkg unloaded, but with errors: $@"; 4160 } or error "$pkg unloaded, but with errors: $@";
4161 }
4162
4163 trace "... clearing $pkg";
4164 clear_package $pkg;
3639 } 4165 }
3640 4166
3641 warn "... nuking $pkg";
3642 Symbol::delete_package $pkg;
3643 }
3644
3645 warn "unloading all perl modules loaded from $LIBDIR"; 4167 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) { 4168 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4169 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 4170
3649 warn "... unloading $k"; 4171 trace "... unloading $k";
3650 delete $INC{$k}; 4172 delete $INC{$k};
3651 4173
3652 $k =~ s/\.pm$//; 4174 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g; 4175 $k =~ s/\//::/g;
3654 4176
3655 if (my $cb = $k->can ("unload_module")) { 4177 if (my $cb = $k->can ("unload_module")) {
3656 $cb->(); 4178 $cb->();
4179 }
4180
4181 clear_package $k;
3657 } 4182 }
3658 4183
3659 Symbol::delete_package $k;
3660 }
3661
3662 warn "getting rid of safe::, as good as possible"; 4184 trace "perl_reload: getting rid of safe::, as good as possible";
3663 Symbol::delete_package "safe::$_" 4185 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4186 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 4187
3666 warn "unloading cf.pm \"a bit\""; 4188 trace "perl_reload: unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 4189 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 4190 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 4191
3670 # don't, removes xs symbols, too, 4192 # don't, removes xs symbols, too,
3671 # and global variables created in xs 4193 # and global variables created in xs
3672 #Symbol::delete_package __PACKAGE__; 4194 #clear_package __PACKAGE__;
3673 4195
3674 warn "unload completed, starting to reload now"; 4196 info "perl_reload: unload completed, starting to reload now";
3675 4197
3676 warn "reloading cf.pm"; 4198 trace "perl_reload: reloading cf.pm";
3677 require cf; 4199 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4200 cf::_connect_to_perl_1;
3679 4201
3680 warn "loading config and database again"; 4202 trace "perl_reload: loading config and database again";
3681 cf::reload_config; 4203 cf::reload_config;
3682 4204
3683 warn "loading extensions"; 4205 trace "perl_reload: loading extensions";
3684 cf::load_extensions; 4206 cf::load_extensions;
3685 4207
4208 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 4209 trace "perl_reload: reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 4210 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 4211 trace "perl_reload: reattaching attachments to maps";
3689 reattach $_ for values %MAP; 4212 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 4213 trace "perl_reload: reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 4214 reattach $_ for values %PLAYER;
4215 }
3692 4216
3693 warn "leaving sync_job"; 4217 cf::_post_init 1;
3694 4218
4219 trace "perl_reload: leaving sync_job";
4220
3695 1 4221 1
3696 } or do { 4222 } or do {
3697 warn $@; 4223 error $@;
3698 cf::cleanup "error while reloading, exiting."; 4224 cf::cleanup "perl_reload: error, exiting.";
4225 };
4226
4227 --$RELOAD;
3699 }; 4228 }
3700 4229
3701 warn "reloaded"; 4230 $t1 = AE::time - $t1;
4231 info "perl_reload: completed in ${t1}s\n";
3702}; 4232};
3703 4233
3704our $RELOAD_WATCHER; # used only during reload 4234our $RELOAD_WATCHER; # used only during reload
3705 4235
3706sub reload_perl() { 4236sub reload_perl() {
3707 # doing reload synchronously and two reloads happen back-to-back, 4237 # doing reload synchronously and two reloads happen back-to-back,
3708 # coro crashes during coro_state_free->destroy here. 4238 # coro crashes during coro_state_free->destroy here.
3709 4239
4240 $RELOAD_WATCHER ||= cf::async {
4241 Coro::AIO::aio_wait cache_extensions;
4242
3710 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4243 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3711 do_reload_perl; 4244 do_reload_perl;
3712 undef $RELOAD_WATCHER; 4245 undef $RELOAD_WATCHER;
4246 };
3713 }; 4247 };
3714} 4248}
3715 4249
3716register_command "reload" => sub { 4250register_command "reload" => sub {
3717 my ($who, $arg) = @_; 4251 my ($who, $arg) = @_;
3723 reload_perl; 4257 reload_perl;
3724 }; 4258 };
3725 } 4259 }
3726}; 4260};
3727 4261
3728unshift @INC, $LIBDIR; 4262#############################################################################
3729 4263
3730my $bug_warning = 0; 4264my $bug_warning = 0;
3731 4265
3732our @WAIT_FOR_TICK;
3733our @WAIT_FOR_TICK_BEGIN;
3734
3735sub wait_for_tick { 4266sub wait_for_tick() {
3736 return if tick_inhibit || $Coro::current == $Coro::main; 4267 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3737 4268
3738 my $signal = new Coro::Signal; 4269 $WAIT_FOR_TICK->wait;
3739 push @WAIT_FOR_TICK, $signal;
3740 $signal->wait;
3741} 4270}
3742 4271
3743sub wait_for_tick_begin { 4272sub wait_for_tick_begin() {
3744 return if tick_inhibit || $Coro::current == $Coro::main; 4273 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3745 4274
3746 my $signal = new Coro::Signal; 4275 my $signal = new Coro::Signal;
3747 push @WAIT_FOR_TICK_BEGIN, $signal; 4276 push @WAIT_FOR_TICK_BEGIN, $signal;
3748 $signal->wait; 4277 $signal->wait;
3749} 4278}
3753 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4282 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3754 unless ++$bug_warning > 10; 4283 unless ++$bug_warning > 10;
3755 return; 4284 return;
3756 } 4285 }
3757 4286
3758 cf::server_tick; # one server iteration 4287 cf::one_tick; # one server iteration
4288
4289 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3759 4290
3760 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4291 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3761 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4292 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3762 Coro::async_pool { 4293 Coro::async_pool {
3763 $Coro::current->{desc} = "runtime saver"; 4294 $Coro::current->{desc} = "runtime saver";
3764 write_runtime_sync 4295 write_runtime_sync
3765 or warn "ERROR: unable to write runtime file: $!"; 4296 or error "ERROR: unable to write runtime file: $!";
3766 }; 4297 };
3767 } 4298 }
3768 4299
3769 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4300 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3770 $sig->send; 4301 $sig->send;
3771 } 4302 }
3772 while (my $sig = shift @WAIT_FOR_TICK) { 4303 $WAIT_FOR_TICK->broadcast;
3773 $sig->send;
3774 }
3775 4304
3776 $LOAD = ($NOW - $TICK_START) / $TICK; 4305 $LOAD = ($NOW - $TICK_START) / $TICK;
3777 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4306 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3778 4307
3779 if (0) { 4308 if (0) {
3780 if ($NEXT_TICK) { 4309 if ($NEXT_TICK) {
3781 my $jitter = $TICK_START - $NEXT_TICK; 4310 my $jitter = $TICK_START - $NEXT_TICK;
3782 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4311 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3783 warn "jitter $JITTER\n";#d# 4312 debug "jitter $JITTER\n";#d#
3784 } 4313 }
3785 } 4314 }
3786} 4315}
3787 4316
3788{ 4317{
3789 # configure BDB 4318 # configure BDB
4319 info "initialising database";
3790 4320
3791 BDB::min_parallel 8; 4321 BDB::min_parallel 16;
3792 BDB::max_poll_reqs $TICK * 0.1; 4322 BDB::max_poll_reqs $TICK * 0.1;
3793 $AnyEvent::BDB::WATCHER->priority (1); 4323 #$AnyEvent::BDB::WATCHER->priority (1);
3794 4324
3795 unless ($DB_ENV) { 4325 unless ($DB_ENV) {
3796 $DB_ENV = BDB::db_env_create; 4326 $DB_ENV = BDB::db_env_create;
3797 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4327 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3798 | BDB::LOG_AUTOREMOVE, 1); 4328 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4329 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3799 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4330 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3800 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4331 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3801 4332
3802 cf::sync_job { 4333 cf::sync_job {
3803 eval { 4334 eval {
3822 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4353 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3823 }; 4354 };
3824 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4355 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3825 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4356 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3826 }; 4357 };
4358
4359 info "database initialised";
3827} 4360}
3828 4361
3829{ 4362{
3830 # configure IO::AIO 4363 # configure IO::AIO
3831 4364
4365 info "initialising aio";
3832 IO::AIO::min_parallel 8; 4366 IO::AIO::min_parallel 8;
3833 IO::AIO::max_poll_time $TICK * 0.1; 4367 IO::AIO::max_poll_time $TICK * 0.1;
3834 $AnyEvent::AIO::WATCHER->priority (1); 4368 undef $AnyEvent::AIO::WATCHER;
4369 info "aio initialised";
3835} 4370}
3836 4371
3837my $_log_backtrace; 4372our $_log_backtrace;
4373our $_log_backtrace_last;
3838 4374
3839sub _log_backtrace { 4375sub _log_backtrace {
3840 my ($msg, @addr) = @_; 4376 my ($msg, @addr) = @_;
3841 4377
3842 $msg =~ s/\n//; 4378 $msg =~ s/\n$//;
3843 4379
4380 if ($_log_backtrace_last eq $msg) {
4381 LOG llevInfo, "[ABT] $msg\n";
4382 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3844 # limit the # of concurrent backtraces 4383 # limit the # of concurrent backtraces
3845 if ($_log_backtrace < 2) { 4384 } elsif ($_log_backtrace < 2) {
4385 $_log_backtrace_last = $msg;
3846 ++$_log_backtrace; 4386 ++$_log_backtrace;
4387 my $perl_bt = Carp::longmess $msg;
3847 async { 4388 async {
3848 $Coro::current->{desc} = "abt $msg"; 4389 $Coro::current->{desc} = "abt $msg";
3849 4390
3850 my @bt = fork_call { 4391 my @bt = fork_call {
3851 @addr = map { sprintf "%x", $_ } @addr; 4392 @addr = map { sprintf "%x", $_ } @addr;
3862 } 4403 }
3863 4404
3864 @funcs 4405 @funcs
3865 }; 4406 };
3866 4407
3867 LOG llevInfo, "[ABT] $msg\n"; 4408 LOG llevInfo, "[ABT] $perl_bt\n";
4409 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3868 LOG llevInfo, "[ABT] $_\n" for @bt; 4410 LOG llevInfo, "[ABT] $_\n" for @bt;
3869 --$_log_backtrace; 4411 --$_log_backtrace;
3870 }; 4412 };
3871 } else { 4413 } else {
3872 LOG llevInfo, "[ABT] $msg\n"; 4414 LOG llevInfo, "[ABT] $msg\n";
3873 LOG llevInfo, "[ABT] [suppressed]\n"; 4415 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3874 } 4416 }
3875} 4417}
3876 4418
3877# load additional modules 4419# load additional modules
3878use cf::pod; 4420require "cf/$_.pm" for @EXTRA_MODULES;
4421cf::_connect_to_perl_2;
3879 4422
3880END { cf::emergency_save } 4423END { cf::emergency_save }
3881 4424
38821 44251
3883 4426

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines