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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 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 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
36use Coro 4.50 (); 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;
50use Coro::AnyEvent;
43use Coro::AIO; 51use Coro::AIO;
44use Coro::BDB; 52use Coro::BDB 1.6;
45use Coro::Storable; 53use Coro::Storable;
46use Coro::Util (); 54use Coro::Util ();
47 55
56use Guard ();
48use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
49use BDB (); 58use BDB ();
50use Data::Dumper; 59use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 60use Fcntl;
53use YAML (); 61use YAML::XS ();
62use CBOR::XS ();
54use IO::AIO 2.51 (); 63use IO::AIO ();
55use Time::HiRes;
56use Compress::LZF; 64use Compress::LZF;
57use Digest::MD5 (); 65use Digest::MD5 ();
66
67AnyEvent::detect;
58 68
59# configure various modules to our taste 69# configure various modules to our taste
60# 70#
61$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 79
65$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" };
66 82
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
68 86
69our %COMMAND = (); 87our %COMMAND = ();
70our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
71 89
72our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
74our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
77 97
78our $RELOAD; # number of reloads so far 98our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
80 102
81our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
82our $DATADIR = datadir; 105our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
86our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
92our %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;
93 126
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 129our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
99 131
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 135our $DB_ENV;
105 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
106our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
107 141
108our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
110our $NOW; 145our $NOW;
111 146
112our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 155our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 156our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 157our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 167binmode STDOUT;
125binmode STDERR; 168binmode STDERR;
126 169
127# read virtual server time, if available 170# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 171unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 172 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
132} 175}
176
177eval "sub TICK() { $TICK } 1" or die;
133 178
134mkdir $_ 179mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 181
137our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
138 183
139sub cf::map::normalise; 184sub cf::map::normalise;
140 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
141############################################################################# 190#############################################################################
142 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
143=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
144 204
145=over 4 205=over 4
146 206
147=item $cf::UPTIME 207=item $cf::UPTIME
148 208
149The 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.
150 225
151=item $cf::RUNTIME 226=item $cf::RUNTIME
152 227
153The 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
154every server tick. 229every server tick.
155 230
156=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
157$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
158$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
159 234
160Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
163database environment. 238database environment.
164 239
165=item $cf::NOW
166
167The time of the last (current) server tick.
168
169=item $cf::TICK
170
171The interval between server ticks, in seconds.
172
173=item $cf::LOADAVG 240=item $cf::LOADAVG
174 241
175The 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
176(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
177objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
185Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
186from wherever your confdir points to. 253from wherever your confdir points to.
187 254
188=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
189 256
190These 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.
191returns directly I<after> the tick processing (and consequently, can only wake one process 258cf::wait_for_tick_begin only returns directly I<after> the tick
259processing (and consequently, can only wake one thread per tick), while
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 260cf::wait_for_tick wakes up all waiters after tick processing.
261
262Note that cf::wait_for_tick will immediately return when the server is not
263ticking, making it suitable for small pauses in threads that need to run
264when the server is paused. If that is not applicable (i.e. you I<really>
265want to wait, use C<$cf::WAIT_FOR_TICK>).
266
267=item $cf::WAIT_FOR_TICK
268
269Note that C<cf::wait_for_tick> is probably the correct thing to use. This
270variable contains a L<Coro::Signal> that is broadcats after every server
271tick. Calling C<< ->wait >> on it will suspend the caller until after the
272next server tick.
273
274=cut
275
276sub wait_for_tick();
277sub wait_for_tick_begin();
193 278
194=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
195 280
196This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 282C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 283that call.
199 284
285=item %cf::REFLECT
286
287Contains, for each (C++) class name, a hash reference with information
288about object members (methods, scalars, arrays and flags) and other
289metadata, which is useful for introspection.
290
200=back 291=back
201 292
202=cut 293=cut
203 294
204BEGIN { 295sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 296sub warn (@) { LOG llevWarn , join "", @_ }
297sub info (@) { LOG llevInfo , join "", @_ }
298sub debug(@) { LOG llevDebug, join "", @_ }
299sub trace(@) { LOG llevTrace, join "", @_ }
300
301$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 302 my $msg = join "", @_;
207 303
208 $msg .= "\n" 304 $msg .= "\n"
209 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
210 306
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 307 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 308
213 LOG llevError, $msg; 309 LOG llevWarn, $msg;
214 }; 310};
215}
216 311
217$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
219 314
220 if ($Coro::current == $Coro::main) {#d# 315 error Carp::longmess $_[0];
316
317 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 319 return;#d#
223 }#d# 320 }#d#
224 321
225 # kill coroutine otherwise 322 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 323 Coro::terminate
228}; 324};
229
230$SIG{__DIE__} = sub { }; #d#?
231 325
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 326@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 327@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 328@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 329@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 336for my $pkg (qw(
243 cf::global cf::attachable 337 cf::global cf::attachable
244 cf::object cf::object::player 338 cf::object cf::object::player
245 cf::client cf::player 339 cf::client cf::player
246 cf::arch cf::living 340 cf::arch cf::living
341 cf::map cf::mapspace
247 cf::map cf::party cf::region 342 cf::party cf::region
248)) { 343)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 345}
252 346
253$EV::DIED = sub { 347$EV::DIED = sub {
254 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
255}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
256 355
257############################################################################# 356#############################################################################
258 357
259=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
260 359
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 380 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 381 $d
283 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
284} 383}
285 384
385=item $scalar = cf::load_file $path
386
387Loads the given file from path and returns its contents. Croaks on error
388and can block.
389
390=cut
391
392sub load_file($) {
393 0 <= aio_load $_[0], my $data
394 or Carp::croak "$_[0]: $!";
395
396 $data
397}
398
399=item $success = cf::replace_file $path, $data, $sync
400
401Atomically replaces the file at the given $path with new $data, and
402optionally $sync the data to disk before replacing the file.
403
404=cut
405
406sub replace_file($$;$) {
407 my ($path, $data, $sync) = @_;
408
409 my $lock = cf::lock_acquire ("replace_file:$path");
410
411 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
412 or return;
413
414 $data = $data->() if ref $data;
415
416 length $data == aio_write $fh, 0, (length $data), $data, 0
417 or return;
418
419 !$sync
420 or !aio_fsync $fh
421 or return;
422
423 aio_close $fh
424 and return;
425
426 aio_rename "$path~", $path
427 and return;
428
429 if ($sync) {
430 $path =~ s%/[^/]*$%%;
431 aio_pathsync $path;
432 }
433
434 1
435}
436
286=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
287 438
288Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
289 440
290=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 447our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 448
298sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
300 451
452=item $ref = cf::decode_storable $scalar
453
454Same as Coro::Storable::thaw, so blocks.
455
456=cut
457
458BEGIN { *decode_storable = \&Coro::Storable::thaw }
459
460=item $ref = cf::decode_yaml $scalar
461
462Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
463
464=cut
465
466sub decode_yaml($) {
467 fork_call { YAML::XS::Load $_[0] } @_
468}
469
470=item $scalar = cf::decode_cbor $scalar
471
472Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
473blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
474alternative.
475
476=cut
477
478sub decode_cbor($) {
479 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
480 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
481 CBOR::XS::decode_cbor $_[0]
482}
483
484=item $scalar = cf::unlzf $scalar
485
486Same as Compress::LZF::compress, but takes server ticks into account, so
487blocks.
488
489=cut
490
491sub unlzf($) {
492 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
493 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
494 Compress::LZF::decompress $_[0]
495}
496
497=item cf::post_init { BLOCK }
498
499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
500but I<before> the server starts ticking again.
501
502The codeblock will have a single boolean argument to indicate whether this
503is a reload or not.
504
505=cut
506
507sub post_init(&) {
508 push @POST_INIT, shift;
509}
510
511sub _post_init {
512 trace "running post_init jobs";
513
514 # run them in parallel...
515
516 my @join;
517
518 while () {
519 push @join, map &Coro::async ($_, 0), @POST_INIT;
520 @POST_INIT = ();
521
522 @join or last;
523
524 (pop @join)->join;
525 }
526}
527
301=item cf::lock_wait $string 528=item cf::lock_wait $string
302 529
303Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
304 531
305=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
306 533
307Wait until the given lock is available and then acquires it and returns 534Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 535a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 536for example when the coroutine gets canceled), the lock is automatically
310returned. 537returned.
311 538
312Locks are *not* recursive, locking from the same coro twice results in a 539Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 540deadlocked coro.
319 546
320Return true if the lock is currently active, i.e. somebody has locked it. 547Return true if the lock is currently active, i.e. somebody has locked it.
321 548
322=cut 549=cut
323 550
324our %LOCK; 551our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 552
327sub lock_wait($) { 553sub lock_wait($) {
328 my ($key) = @_; 554 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 555}
341 556
342sub lock_acquire($) { 557sub lock_acquire($) {
343 my ($key) = @_; 558 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 559}
357 560
358sub lock_active($) { 561sub lock_active($) {
359 my ($key) = @_; 562 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 563}
363 564
364sub freeze_mainloop { 565sub freeze_mainloop {
365 tick_inhibit_inc; 566 tick_inhibit_inc;
366 567
367 Coro::guard \&tick_inhibit_dec; 568 &Guard::guard (\&tick_inhibit_dec);
368} 569}
369 570
370=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
371 572
372Like EV::periodic, but randomly selects a starting point so that the actions 573Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 574get spread over time.
374 575
375=cut 576=cut
376 577
377sub periodic($$) { 578sub periodic($$) {
378 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
383} 584}
384 585
385=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
386 587
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 589(default: 0): This call blocks and returns only when you have at least
389of cpu time till the next tick. The slot is only valid till the next cede. 590C<$time> seconds of cpu time till the next tick. The slot is only valid
591till the next cede.
592
593Background jobs should use a priority less than zero, interactive jobs
594should use 100 or more.
390 595
391The optional C<$name> can be used to identify the job to run. It might be 596The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
393 598
394Useful for short background jobs. 599Useful for short background jobs.
395 600
396=cut 601=cut
397 602
398our @SLOT_QUEUE; 603our @SLOT_QUEUE;
399our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
400 606
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
404 610
405 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
406 613
407 while () { 614 while () {
408 next_job: 615 next_job:
616
617 Coro::cede;
618
409 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 620
411 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 625 $job->[2]->send;
415 Coro::cede;
416 goto next_job; 626 goto next_job;
417 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 629 }
419 } 630 }
420 631
421 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else { 634 } else {
635 $busy = 0;
426 Coro::schedule; 636 Coro::schedule;
427 } 637 }
428 } 638 }
429}; 639};
430 640
431sub get_slot($;$$) { 641sub get_slot($;$$) {
642 return if tick_inhibit || $Coro::current == $Coro::main;
643
432 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
433 645
434 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
435 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
436 649
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
451BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
452 665
453=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
454 667
455The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
456is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 670partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
458acceptable. 671acceptable.
459 672
460If it must be done, put the blocking parts into C<sync_job>. This will run 673If it must be done, put the blocking parts into C<sync_job>. This will run
461the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
465=cut 678=cut
466 679
467sub sync_job(&) { 680sub sync_job(&) {
468 my ($job) = @_; 681 my ($job) = @_;
469 682
470 if ($Coro::current == $Coro::main) { 683 if (in_main) {
471 my $time = EV::time; 684 my $time = AE::time;
472 685
473 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
475 688
476 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
477 690
478 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
479 692
480 my $busy = 1; 693 my $busy = 1;
481 my @res; 694 my @res;
482 695
483 (async { 696 (async {
484 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 698 @res = eval { $job->() };
486 warn $@ if $@; 699 error $@ if $@;
487 undef $busy; 700 undef $busy;
488 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
489 702
490 while ($busy) { 703 while ($busy) {
491 if (Coro::nready) { 704 if (Coro::nready) {
492 Coro::cede_notself; 705 Coro::cede_notself;
493 } else { 706 } else {
494 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
495 } 708 }
496 } 709 }
497 710
498 my $time = EV::time - $time; 711 my $time = AE::time - $time;
499 712
500 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
501 714
502 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
503 } else { 716 } else {
525 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
526 739
527 $coro 740 $coro
528} 741}
529 742
530=item fork_call { }, $args 743=item fork_call { }, @args
531 744
532Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 748never block itself or use any form of event handling.
536 749
537=cut 750=cut
538 751
752sub post_fork {
753 reset_signals;
754}
755
539sub fork_call(&@) { 756sub fork_call(&@) {
540 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
541 758
542 # we seemingly have to make a local copy of the whole thing,
543 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious)
545
546 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
547 reset_signals; 760 cf::post_fork;
548 &$cb 761 &$cb
549 }, @args; 762 } @args;
550 763
551 wantarray ? @res : $res[-1] 764 wantarray ? @res : $res[-1]
765}
766
767sub objinfo {
768 (
769 "counter value" => cf::object::object_count,
770 "objects created" => cf::object::create_count,
771 "objects destroyed" => cf::object::destroy_count,
772 "freelist size" => cf::object::free_count,
773 "allocated objects" => cf::object::objects_size,
774 "active objects" => cf::object::actives_size,
775 )
776}
777
778=item $coin = coin_from_name $name
779
780=cut
781
782our %coin_alias = (
783 "silver" => "silvercoin",
784 "silvercoin" => "silvercoin",
785 "silvercoins" => "silvercoin",
786 "gold" => "goldcoin",
787 "goldcoin" => "goldcoin",
788 "goldcoins" => "goldcoin",
789 "platinum" => "platinacoin",
790 "platinumcoin" => "platinacoin",
791 "platinumcoins" => "platinacoin",
792 "platina" => "platinacoin",
793 "platinacoin" => "platinacoin",
794 "platinacoins" => "platinacoin",
795 "royalty" => "royalty",
796 "royalties" => "royalty",
797);
798
799sub coin_from_name($) {
800 $coin_alias{$_[0]}
801 ? cf::arch::find $coin_alias{$_[0]}
802 : undef
552} 803}
553 804
554=item $value = cf::db_get $family => $key 805=item $value = cf::db_get $family => $key
555 806
556Returns a single value from the environment database. 807Returns a single value from the environment database.
566within each server. 817within each server.
567 818
568=cut 819=cut
569 820
570sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
571 my ($name) = @_; 825 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
573 827
574 eval { 828 eval {
575 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
585} 839}
586 840
587our $DB; 841our $DB;
588 842
589sub db_init { 843sub db_init {
590 cf::sync_job {
591 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
592 };
593} 845}
594 846
595sub db_get($$) { 847sub db_get($$) {
596 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
597 849
598 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
599 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
600 854
601 $! ? () 855 $! ? ()
602 : $data 856 : $data
603 }
604} 857}
605 858
606sub db_put($$$) { 859sub db_put($$$) {
607 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
608 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
636 889
637 my @data; 890 my @data;
638 my $md5; 891 my $md5;
639 892
640 for (0 .. $#$src) { 893 for (0 .. $#$src) {
641 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
642 or Carp::croak "$src->[$_]: $!";
643 } 895 }
644 896
645 # if processing is expensive, check 897 # if processing is expensive, check
646 # checksum first 898 # checksum first
647 if (1) { 899 if (1) {
660 912
661 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
662 } 914 }
663 } 915 }
664 916
665 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
666 my $data = $process->(\@data); 918 my $data = $process->(\@data);
667 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
668 920
669 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
670 922
671 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
672 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
673 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
674 926
684 936
685=cut 937=cut
686 938
687sub datalog($@) { 939sub datalog($@) {
688 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
689 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
690} 942}
691 943
692=back 944=back
693 945
694=cut 946=cut
695 947
696############################################################################# 948#############################################################################
697 949
698=head2 ATTACHABLE OBJECTS 950=head2 ATTACHABLE OBJECTS
699 951
700Many objects in crossfire are so-called attachable objects. That means you can 952Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 953attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 954to it. All such attachable objects support the following methods.
703 955
704In the following description, CLASS can be any of C<global>, C<object> 956In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 957C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 1007=item cf::CLASS::attachment $name, ...
756 1008
757Register an attachment by C<$name> through which attachable objects of the 1009Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 1010given CLASS can refer to this attachment.
759 1011
760Some classes such as crossfire maps and objects can specify attachments 1012Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 1013that are attached at load/instantiate time, thus the need for a name.
762 1014
763These calls expect any number of the following handler/hook descriptions: 1015These calls expect any number of the following handler/hook descriptions:
764 1016
765=over 4 1017=over 4
889 1141
890 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
891 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
892 1144
893 } elsif (ref $type) { 1145 } elsif (ref $type) {
894 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
895 1147
896 } else { 1148 } else {
897 shift @arg; 1149 shift @arg;
898 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
899 } 1151 }
900 } 1152 }
901} 1153}
902 1154
903sub _object_attach { 1155sub _object_attach {
913 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
914 } 1166 }
915 1167
916 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
917 } else { 1169 } else {
918 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
919 } 1171 }
920 1172
921 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
922} 1174}
923 1175
982 1234
983 for (@$callbacks) { 1235 for (@$callbacks) {
984 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
985 1237
986 if ($@) { 1238 if ($@) {
987 warn "$@";
988 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
989 override; 1240 override;
990 } 1241 }
991 1242
992 return 1 if $override; 1243 return 1 if $override;
993 } 1244 }
1056 1307
1057sub reattach { 1308sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1309 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1310 my ($obj) = @_;
1060 1311
1312 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1313 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1314
1063 my $registry = $obj->registry; 1315 my $registry = $obj->registry;
1064 1316
1065 @$registry = (); 1317 @$registry = ();
1066 1318
1071 for (@$attach) { 1323 for (@$attach) {
1072 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1073 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1074 } 1326 }
1075 } else { 1327 } else {
1076 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1077 } 1329 }
1078 } 1330 }
1079} 1331}
1080 1332
1081cf::attachable->attach ( 1333cf::attachable->attach (
1108 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1109 1361
1110 sync_job { 1362 sync_job {
1111 if (length $$rdata) { 1363 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1115 1368
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1370 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1376 aio_close $fh;
1121 1377
1122 if (@$objs) { 1378 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1379 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1380 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1383 if ($cf::USE_FSYNC) {
1384 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;
1385 aio_fsync $fh;
1386 }
1128 close $fh; 1387 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1389 }
1131 } else { 1390 } else {
1132 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1133 } 1392 }
1134 1393
1135 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1395
1396 $filename =~ s%/[^/]+$%%;
1397 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1398 } else {
1137 warn "FATAL: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1138 } 1400 }
1139 } else { 1401 } else {
1140 aio_unlink $filename; 1402 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1142 } 1404 }
1166 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs}; 1429 $av = $st->{objs};
1168 } 1430 }
1169 1431
1170 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1173 1436
1174 ($data, $av) 1437 ($data, $av)
1175} 1438}
1176 1439
1177=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1181=cut 1444=cut
1182 1445
1183############################################################################# 1446#############################################################################
1184# command handling &c 1447# command handling &c
1185 1448
1186=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1187 1450
1188Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1189$name. 1452$name.
1190 1453
1191=cut 1454=cut
1197 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1198 1461
1199 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1200} 1463}
1201 1464
1202=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1203 1466
1204Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1205extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1206received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1207the logged-in player. Ext commands can only be processed after a player 1470the logged-in player. Ext commands can only be processed after a player
1208has logged in successfully. 1471has logged in successfully.
1209 1472
1210If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1211called.
1212 1474
1475=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1213=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1214 1481
1215Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1216exticmd packet. Exti commands are processed by the server as soon as they 1483exticmd packet. Exti commands are processed by the server as soon as they
1217are received, i.e. out of order w.r.t. other commands. The first argument 1484are received, i.e. out of order w.r.t. other commands. The first argument
1218is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1219log-in. 1486log-in.
1220 1487
1221If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1222called.
1223 1489
1224=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1225 1491
1492Same as C<cf::register_extcmd>, but instead of returning values, the
1493callback needs to clal the C<$reply> function.
1494
1495=cut
1496
1226sub register_extcmd { 1497sub register_extcmd($$) {
1227 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1228 1499
1229 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1230} 1501}
1231 1502
1232sub register_exticmd { 1503sub register_async_extcmd($$) {
1233 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1234 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1235 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1236} 1513}
1237 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1521use File::Glob ();
1522
1238cf::player->attach ( 1523cf::player->attach (
1239 on_command => sub { 1524 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1241 1526
1242 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1243 or return; 1528 or return;
1244 1529
1252 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1253 1538
1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1255 1540
1256 if (ref $msg) { 1541 if (ref $msg) {
1257 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261 1543
1262 my @reply;
1263
1264 if (my $cb = $EXTCMD{$type}) { 1544 if (my $cb = $EXTACMD{$type}) {
1545 $cb->(
1546 $pl,
1547 sub {
1548 $pl->ext_msg ("reply-$reply", @_)
1549 if $reply;
1550 },
1551 @payload
1552 );
1553 } else {
1554 my @reply;
1555
1556 if (my $cb = $EXTCMD{$type}) {
1265 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1266 } 1562 }
1267 1563
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1271 } else { 1564 } else {
1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1273 } 1566 }
1274 1567
1275 cf::override; 1568 cf::override;
1276 }, 1569 },
1277); 1570);
1278 1571
1572# "readahead" all extensions
1573sub cache_extensions {
1574 my $grp = IO::AIO::aio_group;
1575
1576 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1577 for (grep /\.ext$/, @{$_[0]}) {
1578 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1579 }
1580 };
1581
1582 $grp
1583}
1584
1585sub _ext_cfg_reg($$$$) {
1586 my ($rvar, $varname, $cfgname, $default) = @_;
1587
1588 $cfgname = lc $varname
1589 unless length $cfgname;
1590
1591 $EXT_CFG{$cfgname} = [$rvar, $default];
1592
1593 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1594}
1595
1279sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1280 cf::sync_job { 1601 cf::sync_job {
1281 my %todo; 1602 my %todo;
1282 1603
1283 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1284 next unless -r $path; 1605 next unless -r $path;
1302 1623
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1626
1306 $ext{source} = 1627 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1308 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1309 . $source 1630 . $source
1310 . "\n};\n1"; 1631 . "\n};\n1";
1311 1632
1312 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1313 } 1634 }
1314 1635
1636 my $pass = 0;
1315 my %done; 1637 my %done;
1316 while (%todo) { 1638 while (%todo) {
1317 my $progress; 1639 my $progress;
1318 1640
1641 ++$pass;
1642
1643 ext:
1319 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1646 next ext
1322 unless exists $done{$_}; 1647 unless exists $done{$_};
1323 } 1648 }
1324 1649
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1651
1327 unless (eval $v->{source}) { 1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1661 my $active = eval $source;
1662
1663 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1665
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1667 if exists $v->{meta}{mandatory};
1335 1668
1336 warn $msg; 1669 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1670 delete $todo{$k};
1671 } else {
1672 $done{$k} = delete $todo{$k};
1673 push @EXTS, $v->{pkg};
1674 $progress = 1;
1675
1676 info "$v->{base}: extension inactive.\n"
1677 unless $active;
1337 } 1678 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1679 }
1343 1680
1344 skip: 1681 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1683
1684 while (my ($k, $v) = each %todo) {
1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1686 if exists $v->{meta}{mandatory};
1687 }
1688
1689 last;
1690 }
1347 } 1691 }
1348 }; 1692 };
1349} 1693}
1350 1694
1351############################################################################# 1695#############################################################################
1352 1696
1353=back 1697=back
1354 1698
1355=head2 CORE EXTENSIONS 1699=head2 CORE EXTENSIONS
1356 1700
1357Functions and methods that extend core crossfire objects. 1701Functions and methods that extend core deliantra objects.
1358 1702
1359=cut 1703=cut
1360 1704
1361package cf::player; 1705package cf::player;
1362 1706
1405 1749
1406sub exists($) { 1750sub exists($) {
1407 my ($login) = @_; 1751 my ($login) = @_;
1408 1752
1409 $cf::PLAYER{$login} 1753 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1754 or !aio_stat path $login
1411} 1755}
1412 1756
1413sub find($) { 1757sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1758 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1759 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1771 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1772 or return;
1429 1773
1430 my $pl = cf::player::load_pl $f 1774 my $pl = cf::player::load_pl $f
1431 or return; 1775 or return;
1776
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1777 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1778 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1435 } 1780 }
1436 } 1781 }
1437} 1782}
1438 1783
1784cf::player->attach (
1785 on_load => sub {
1786 my ($pl, $path) = @_;
1787
1788 # restore slots saved in save, below
1789 my $slots = delete $pl->{_slots};
1790
1791 $pl->ob->current_weapon ($slots->[0]);
1792 $pl->combat_ob ($slots->[1]);
1793 $pl->ranged_ob ($slots->[2]);
1794 },
1795);
1796
1439sub save($) { 1797sub save($) {
1440 my ($pl) = @_; 1798 my ($pl) = @_;
1441 1799
1442 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1443 1801
1446 1804
1447 return if $pl->{deny_save}; 1805 return if $pl->{deny_save};
1448 1806
1449 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1809
1810 cf::get_slot 0.01;
1811
1812 # save slots, to be restored later
1813 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1451 1814
1452 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1816 cf::cede_to_tick;
1454} 1817}
1455 1818
1487 my ($pl) = @_; 1850 my ($pl) = @_;
1488 1851
1489 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1490 1853
1491 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1855 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1856
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1495 $pl->deactivate; 1858 $pl->deactivate;
1859
1860 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1497 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1498 1865
1499 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1539 1906
1540 for my $login (@$dirs) { 1907 for my $login (@$dirs) {
1541 my $path = path $login; 1908 my $path = path $login;
1542 1909
1543 # a .pst is a dead give-away for a valid player 1910 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1911 # if no pst file found, open and chekc for blocked users
1912 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1913 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1914 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1915 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1916 }
1549 1917
1553 1921
1554 \@logins 1922 \@logins
1555} 1923}
1556 1924
1557=item $player->maps 1925=item $player->maps
1926
1927=item cf::player::maps $login
1558 1928
1559Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1560player. May block. 1930player. May block.
1561 1931
1562=cut 1932=cut
1580 } 1950 }
1581 1951
1582 \@paths 1952 \@paths
1583} 1953}
1584 1954
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1956
1587Expand crossfire pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677
1678=item $player->ext_reply ($msgid, @msg)
1679
1680Sends an ext reply to the player.
1681
1682=cut
1683
1684sub ext_reply($$@) {
1685 my ($self, $id, @msg) = @_;
1686
1687 $self->ns->ext_reply ($id, @msg)
1688}
1689 1958
1690=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1691 1960
1692Sends an ext event to the client. 1961Sends an ext event to the client.
1693 1962
1713 1982
1714=cut 1983=cut
1715 1984
1716sub find_by_path($) { 1985sub find_by_path($) {
1717 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1718 1989
1719 my ($match, $specificity); 1990 my ($match, $specificity);
1720 1991
1721 for my $region (list) { 1992 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 2019our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 2020our $DEFAULT_RESET = 3000;
1750 2021
1751sub generate_random_map { 2022sub generate_random_map {
1752 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1753 # mit "rum" bekleckern, nicht 2024
2025 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2026
1754 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1762 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1763 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1764 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1765 (cf::region::find $rmp->{region}), $rmp->{custom}
1766 )
1767} 2028}
1768 2029
1769=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1770 2031
1771Register a handler for the map path matching the given regex at the 2032Register a handler for the map path matching the given regex at the
1776 2037
1777sub register { 2038sub register {
1778 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1779 my $pkg = caller; 2040 my $pkg = caller;
1780 2041
1781 no strict;
1782 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1783 2043
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 2045}
1786 2046
1787# also paths starting with '/' 2047# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 2049
1790sub thawer_merge { 2050sub thawer_merge {
1791 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1792 2052
1793 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1798} 2058}
1799 2059
1800sub normalise { 2060sub normalise {
1801 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1802 2062
1803 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1804 2064
1805 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1806 2066
1807 # map plan: 2067 # map plan:
1808 # 2068 #
1823 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1824 $path = "$base/$path"; 2084 $path = "$base/$path";
1825 } 2085 }
1826 2086
1827 for ($path) { 2087 for ($path) {
1828 redo if s{//}{/};
1829 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1830 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1831 } 2090 }
1832 2091
1833 $path 2092 $path
1847 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1848 return $self; 2107 return $self;
1849 } 2108 }
1850 } 2109 }
1851 2110
1852 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1853 () 2112 ()
1854} 2113}
1855 2114
2115# may re-bless or do other evil things
1856sub init { 2116sub init {
1857 my ($self) = @_; 2117 my ($self) = @_;
1858 2118
1859 $self 2119 $self
1860} 2120}
1879 2139
1880# the temporary/swap location 2140# the temporary/swap location
1881sub save_path { 2141sub save_path {
1882 my ($self) = @_; 2142 my ($self) = @_;
1883 2143
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2144 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 2145 "$TMPDIR/$path.map"
1886} 2146}
1887 2147
1888# the unique path, undef == no special unique path 2148# the unique path, undef == no special unique path
1889sub uniq_path { 2149sub uniq_path {
1890 my ($self) = @_; 2150 my ($self) = @_;
1891 2151
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2152 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 2153 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 2154}
1904 2155
1905sub decay_objects { 2156sub decay_objects {
1906 my ($self) = @_; 2157 my ($self) = @_;
1907 2158
1934 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1935 2186
1936 1 2187 1
1937} 2188}
1938 2189
2190# used to laod the header of an original map
1939sub load_header_orig { 2191sub load_header_orig {
1940 my ($self) = @_; 2192 my ($self) = @_;
1941 2193
1942 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1943} 2195}
1944 2196
2197# used to laod the header of an instantiated map
1945sub load_header_temp { 2198sub load_header_temp {
1946 my ($self) = @_; 2199 my ($self) = @_;
1947 2200
1948 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1949} 2202}
1950 2203
2204# called after loading the header from an instantiated map
1951sub prepare_temp { 2205sub prepare_temp {
1952 my ($self) = @_; 2206 my ($self) = @_;
1953 2207
1954 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1956 # safety 2210 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2213}
1960 2214
2215# called after loading the header from an original map
1961sub prepare_orig { 2216sub prepare_orig {
1962 my ($self) = @_; 2217 my ($self) = @_;
1963 2218
1964 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
1989 2244
1990sub find; 2245sub find;
1991sub find { 2246sub find {
1992 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
1993 2248
2249 cf::cede_to_tick;
2250
1994 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
1995 2252
1996 cf::lock_wait "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2255
1999 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2257 my $map = new_from_path cf::map $path
2004 or return; 2258 or return;
2005 2259
2006 $map->{last_save} = $cf::RUNTIME; 2260 $map->{last_save} = $cf::RUNTIME;
2007 2261
2009 or return; 2263 or return;
2010 2264
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2265 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2266 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2267 #$cf::WAIT_FOR_TICK->wait;
2268 undef $guard2;
2014 undef $guard1; 2269 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2270 $map->reset;
2017 return find $path; 2271 return find $path;
2018 } 2272 }
2019 2273
2020 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
2021 } 2275 }
2022} 2276}
2023 2277
2024sub pre_load { } 2278sub pre_load { }
2025sub post_load { } 2279#sub post_load { } # XS
2026 2280
2027sub load { 2281sub load {
2028 my ($self) = @_; 2282 my ($self) = @_;
2029 2283
2030 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
2033 2287
2034 { 2288 {
2035 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2036 2290
2037 return unless $self->valid; 2291 return unless $self->valid;
2038 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2039
2040 $self->in_memory (cf::MAP_LOADING);
2041 2293
2042 $self->alloc; 2294 $self->alloc;
2043 2295
2044 $self->pre_load; 2296 $self->pre_load;
2045 cf::cede_to_tick; 2297 cf::cede_to_tick;
2046 2298
2299 if (exists $self->{load_path}) {
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2301 $f->skip_block;
2049 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2050 or return; 2303 or return;
2051 2304
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2305 $self->post_load_original
2053 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2054 2307
2055 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2309 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2059 $self->clear_unique_items; 2312 $self->clear_unique_items;
2060 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2062 } 2316 }
2063 } 2317 }
2064 }
2065 2318
2066 $f->resolve_delayed_derefs; 2319 $f->resolve_delayed_derefs;
2320 } else {
2321 $self->post_load_original
2322 if delete $self->{load_original};
2323 }
2324
2325 $self->state (cf::MAP_INACTIVE);
2067 2326
2068 cf::cede_to_tick; 2327 cf::cede_to_tick;
2069 # now do the right thing for maps 2328 # now do the right thing for maps
2070 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2071 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2075 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2335 $self->decay_objects;
2077 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2078 $self->update_buttons; 2337 $self->update_buttons;
2079 cf::cede_to_tick; 2338 cf::cede_to_tick;
2080 $self->set_darkness_map; 2339 #$self->activate; # no longer activate maps automatically
2081 cf::cede_to_tick;
2082 $self->activate;
2083 } 2340 }
2084 2341
2085 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2087
2088 $self->in_memory (cf::MAP_IN_MEMORY);
2089 } 2344 }
2090 2345
2091 $self->post_load; 2346 $self->post_load;
2092}
2093 2347
2348 1
2349}
2350
2351# customize the map for a given player, i.e.
2352# return the _real_ map. used by e.g. per-player
2353# maps to change the path to ~playername/mappath
2094sub customise_for { 2354sub customise_for {
2095 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2096 2356
2097 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2358 if $self->per_player;
2101# if $self->per_party; 2361# if $self->per_party;
2102 2362
2103 $self 2363 $self
2104} 2364}
2105 2365
2106# find and load all maps in the 3x3 area around a map
2107sub load_neighbours {
2108 my ($map) = @_;
2109
2110 my @neigh; # diagonal neighbours
2111
2112 for (0 .. 3) {
2113 my $neigh = $map->tile_path ($_)
2114 or next;
2115 $neigh = find $neigh, $map
2116 or next;
2117 $neigh->load;
2118
2119 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 }
2123
2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
2126 my $neigh = find $path, $origin
2127 or next;
2128 $neigh->load;
2129 }
2130}
2131
2132sub find_sync { 2366sub find_sync {
2133 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2134 2368
2135 cf::sync_job { find $path, $origin } 2369 # it's a bug to call this from the main context
2370 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2371 if $Coro::current == $Coro::main;
2372
2373 find $path, $origin
2136} 2374}
2137 2375
2138sub do_load_sync { 2376sub do_load_sync {
2139 my ($map) = @_; 2377 my ($map) = @_;
2140 2378
2379 # it's a bug to call this from the main context
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2143 2382
2144 cf::sync_job { $map->load }; 2383 $map->load;
2145} 2384}
2146 2385
2147our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2148our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2149 2388
2150sub find_async { 2389sub find_async {
2151 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2152 2391
2153 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2154 2393
2155 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2395 return $map if !$load || $map->linkable;
2157 } 2396 }
2158 2397
2159 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2160 2399
2161 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2163 2402
2164 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2165 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2166 if (my $map = find $k) { 2405 if (my $map = find $k) {
2167 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2168 } 2407 }
2169 2408
2170 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2171 } 2410 }
2172 } 2411 }
2175 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2176 2415
2177 () 2416 ()
2178} 2417}
2179 2418
2419# common code, used by both ->save and ->swapout
2180sub save { 2420sub _save {
2181 my ($self) = @_; 2421 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2422
2185 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2186 2424
2187 return unless $self->dirty; 2425 return unless $self->dirty;
2188 2426
2197 2435
2198 cf::async { 2436 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2437 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2438 $_->contr->save for $self->players;
2201 }; 2439 };
2440
2441 cf::get_slot 0.02;
2202 2442
2203 if ($uniq) { 2443 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2444 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2445 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2446 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2447 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2448 }
2209} 2449}
2210 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2211sub swap_out { 2459sub swap_out {
2212 my ($self) = @_; 2460 my ($self) = @_;
2213 2461
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2219 return if $self->players; 2466 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2467
2468 # first deactivate the map and "unlink" it from the core
2469 $self->deactivate;
2470 $_->clear_links_to ($self) for values %cf::MAP;
2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # then atomically save
2474 $self->_save;
2475
2476 # then free the map
2477 $self->clear;
2478}
2479
2480sub reset_at {
2481 my ($self) = @_;
2482
2483 # TODO: safety, remove and allow resettable per-player maps
2221 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2222 2485
2486 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2487 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2488
2489 $time + $to
2490}
2491
2492sub should_reset {
2493 my ($self) = @_;
2494
2495 $self->reset_at <= $cf::RUNTIME
2496}
2497
2498sub reset {
2499 my ($self) = @_;
2500
2501 my $lock = cf::lock_acquire "map_data:$self->{path}";
2502
2503 return if $self->players;
2504
2505 cf::trace "resetting map ", $self->path, "\n";
2506
2223 $self->in_memory (cf::MAP_SWAPPED); 2507 $self->state (cf::MAP_SWAPPED);
2508
2509 # need to save uniques path
2510 unless ($self->{deny_save}) {
2511 my $uniq = $self->uniq_path; utf8::encode $uniq;
2512
2513 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2514 if $uniq;
2515 }
2516
2517 delete $cf::MAP{$self->path};
2224 2518
2225 $self->deactivate; 2519 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2521 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2522
2273 $self->unlink_save; 2523 $self->unlink_save;
2274 $self->destroy; 2524 $self->destroy;
2275} 2525}
2276 2526
2284 2534
2285 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2286 2536
2287 $self->unlink_save; 2537 $self->unlink_save;
2288 2538
2289 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2544
2343 2593
2344sub unique_maps() { 2594sub unique_maps() {
2345 [ 2595 [
2346 map { 2596 map {
2347 utf8::decode $_; 2597 utf8::decode $_;
2348 /\.map$/ 2598 s/\.map$//; # TODO future compatibility hack
2599 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2600 ? ()
2349 ? normalise $_ 2601 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2603 ]
2353} 2604}
2354 2605
2355package cf; 2606=item cf::map::static_maps
2607
2608Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2609file in the shared directory excluding F</styles> and F</editor>). May
2610block.
2611
2612=cut
2613
2614sub static_maps() {
2615 my @dirs = "";
2616 my @maps;
2617
2618 while (@dirs) {
2619 my $dir = shift @dirs;
2620
2621 next if $dir eq "/styles" || $dir eq "/editor";
2622
2623 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2624 or return;
2625
2626 for (@$files) {
2627 s/\.map$// or next;
2628 utf8::decode $_;
2629 push @maps, "$dir/$_";
2630 }
2631
2632 push @dirs, map "$dir/$_", @$dirs;
2633 }
2634
2635 \@maps
2636}
2356 2637
2357=back 2638=back
2358 2639
2359=head3 cf::object 2640=head3 cf::object
2360 2641
2364 2645
2365=over 4 2646=over 4
2366 2647
2367=item $ob->inv_recursive 2648=item $ob->inv_recursive
2368 2649
2369Returns the inventory of the object _and_ their inventories, recursively. 2650Returns the inventory of the object I<and> their inventories, recursively,
2651but I<not> the object itself.
2370 2652
2371=cut 2653=cut
2372 2654
2373sub inv_recursive_; 2655sub inv_recursive_;
2374sub inv_recursive_ { 2656sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2661 inv_recursive_ inv $_[0]
2380} 2662}
2381 2663
2382=item $ref = $ob->ref 2664=item $ref = $ob->ref
2383 2665
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2666Creates and returns a persistent reference to an object that can be stored as a string.
2385 2667
2386=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2387 2669
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2670returns the objetc referenced by refstring. may return undef when it cannot find the object,
2389even if the object actually exists. May block. 2671even if the object actually exists. May block.
2390 2672
2391=cut 2673=cut
2392 2674
2393sub deref { 2675sub deref {
2421can be C<undef>. Does the right thing when the player is currently in a 2703can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2704dialogue with the given NPC character.
2423 2705
2424=cut 2706=cut
2425 2707
2708our $SAY_CHANNEL = {
2709 id => "say",
2710 title => "Map",
2711 reply => "say ",
2712 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2713};
2714
2715our $CHAT_CHANNEL = {
2716 id => "chat",
2717 title => "Chat",
2718 reply => "chat ",
2719 tooltip => "Player chat and shouts, global to the server.",
2720};
2721
2426# rough implementation of a future "reply" method that works 2722# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2723# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2724#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2725sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2726 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2737 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2738 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2739
2444 } else { 2740 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2741 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2742 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2743 }
2448 } 2744 }
2449} 2745}
2450 2746
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2747=item $object->send_msg ($channel, $msg, $color, [extra...])
2461=item $player_object->may ("access") 2757=item $player_object->may ("access")
2462 2758
2463Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2464(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2465 2761
2762This is implemented by checking a config setting of C<may_access> where
2763C<access> is replaced by the access string. The following alternatives are
2764possible (and are tested in order):
2765
2766=over 4
2767
2768=item * Player is DM
2769
2770The request will succeed.
2771
2772=item * may_access is an array reference
2773
2774If either the player nickname or UUID is in the array, the request will
2775succeed, otherwise it will fail.
2776
2777=item * may_access is a true value
2778
2779The request will succeed.
2780
2781=item * may_access is missing or false
2782
2783The request will fail.
2784
2785=back
2786
2466=cut 2787=cut
2467 2788
2468sub cf::object::player::may { 2789sub cf::object::player::may {
2469 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2470 2791
2471 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2472 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2473 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2474 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2475} 2796}
2476 2797
2477=item $player_object->enter_link 2798=item $player_object->enter_link
2478 2799
2479Freezes the player and moves him/her to a special map (C<{link}>). 2800Freezes the player and moves him/her to a special map (C<{link}>).
2480 2801
2481The player should be reasonably safe there for short amounts of time. You 2802The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2803for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2804though, as the player cannot control the character while it is on the link
2805map.
2483 2806
2484Will never block. 2807This method will never block, which is the whole reaosn for it's
2808existance: you can I<always> put a player onto the link map, which is the
2809only place to put objects that is guaranteed to exist.
2810
2811A typical usage pattern is to call C<enter_link> synchronously from the
2812server, then start a new thread, do your blocking stuff there and then
2813call C<leave_link> from that thread.
2485 2814
2486=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2487 2816
2488Moves the player out of the special C<{link}> map onto the specified 2817Moves the player out of the special C<{link}> map onto the specified
2489map. If the map is not valid (or omitted), the player will be moved back 2818map. If the map is not valid (or omitted), the player will be moved back
2507sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2508 my ($self) = @_; 2837 my ($self) = @_;
2509 2838
2510 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2511 2840
2841 ++$self->{_link_recursion};
2842
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2844
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2516 2847
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2849}
2519 2850
2520sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2522 2853
2539 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2541 2872
2542 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2545 2876
2546 $map->load; 2877 $map->load;
2547 $map->load_neighbours;
2548 2878
2549 return unless $self->contr->active; 2879 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2880
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2554} 2883 # entering was successful
2884 delete $self->{_link_recursion};
2885 # only activate afterwards, to support waiting in hooks
2886 $self->activate_recursive;
2887 }
2555 2888
2889}
2890
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2891=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2557 2892
2558Moves the player to the given map-path and coordinates by first freezing 2893Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2895that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2896the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2897be called at the end of this process.
2563 2898
2899Note that $check will be called with a potentially non-loaded map, so if
2900it needs a loaded map it has to call C<< ->load >>.
2901
2564=cut 2902=cut
2565 2903
2566our $GOTOGEN; 2904our $GOTOGEN;
2567 2905
2568sub cf::object::player::goto { 2906sub cf::object::player::goto {
2569 my ($self, $path, $x, $y, $check, $done) = @_; 2907 my ($self, $path, $x, $y, $check, $done) = @_;
2908
2909 if ($self->{_link_recursion} >= $MAX_LINKS) {
2910 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2911 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2912 ($path, $x, $y) = @$EMERGENCY_POSITION;
2913 }
2570 2914
2571 # do generation counting so two concurrent goto's will be executed in-order 2915 # do generation counting so two concurrent goto's will be executed in-order
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2917
2574 $self->enter_link; 2918 $self->enter_link;
2594 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2595 } 2939 }
2596 } 2940 }
2597 2941
2598 my $map = eval { 2942 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2600 2944
2601 if ($map) { 2945 if ($map) {
2602 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2948 } else {
2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2949 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2606 } 2950 }
2607 2951
2608 $map 2952 $map
2616 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2619 } 2963 }
2620 2964
2621 $done->() if $done; 2965 $done->($self) if $done;
2622 })->prio (1); 2966 })->prio (1);
2623} 2967}
2624 2968
2625=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2626 2970
2646} 2990}
2647 2991
2648sub prepare_random_map { 2992sub prepare_random_map {
2649 my ($exit) = @_; 2993 my ($exit) = @_;
2650 2994
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2995 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2996 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2997 # that depends on the exit object
2656 2998
2657 my $rmp = parse_random_map_params $exit->msg; 2999 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 3001 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 3002 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 3003 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 3004 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 3005 $rmp->{origin_y} = $exit->y;
3006
3007 $exit->map->touch;
2664 } 3008 }
2665 3009
2666 $rmp->{random_seed} ||= $exit->random_seed; 3010 $rmp->{random_seed} ||= $exit->random_seed;
2667 3011
2668 my $data = cf::encode_json $rmp; 3012 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 3013 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 3014 my $meta = "$RANDOMDIR/$md5.meta";
2671 3015
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3016 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 3017 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 3018 undef $fh;
2675 aio_rename "$meta~", $meta; 3019 aio_rename "$meta~", $meta;
2676 3020
3021 my $slaying = "?random/$md5";
3022
3023 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 3024 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 3025 $exit->msg (undef);
3026 }
2679 } 3027 }
2680} 3028}
2681 3029
2682sub cf::object::player::enter_exit { 3030sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 3031 my ($self, $exit) = @_;
2684 3032
2685 return unless $self->type == cf::PLAYER; 3033 return unless $self->type == cf::PLAYER;
2686 3034
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 3035 $self->enter_link;
2699 3036
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 3037 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3038 $Coro::current->{desc} = "enter_exit";
2706 3039
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 3040 unless (eval {
3041 $self->deactivate_recursive; # just to be sure
3042
3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
3044 my $x = $exit->stats->hp;
3045 my $y = $exit->stats->sp;
3046
3047 # special map handling
3048 my $slaying = $exit->slaying;
3049
3050 # special map handling
3051 if ($slaying eq "/!") {
3052 my $guard = cf::lock_acquire "exit_prepare:$exit";
3053
3054 prepare_random_map $exit
3055 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3056
3057 $map = $exit->slaying;
3058
3059 } elsif ($slaying eq '!up') {
3060 $map = $exit->map->tile_path (cf::TILE_UP);
3061 $x = $exit->x;
3062 $y = $exit->y;
3063
3064 } elsif ($slaying eq '!down') {
3065 $map = $exit->map->tile_path (cf::TILE_DOWN);
3066 $x = $exit->x;
3067 $y = $exit->y;
3068 }
3069
2709 $self->goto ($slaying, $hp, $sp); 3070 $self->goto ($map, $x, $y);
2710 3071
3072 # if exit is damned, update players death & WoR home-position
3073 $self->contr->savebed ($map, $x, $y)
3074 if $exit->flag (cf::FLAG_DAMNED);
3075
2711 1; 3076 1
2712 }) { 3077 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 3079 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2717 3082
2718 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 3084 $self->leave_link;
2720 } 3085 }
2721 })->prio (1); 3086 })->prio (1);
2722} 3087}
2723 3088
2724=head3 cf::client 3089=head3 cf::client
2725 3090
2726=over 4 3091=over 4
2727 3092
2728=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2729 3094
2730Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2731should not be used under normal circumstances. 3096them as required.
2732 3097
2733=cut 3098=cut
2734 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2735sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2736 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2737 3104
2738 utf8::encode $text; 3105 # try lzf for large packets
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3106 $pkt = "lzf " . Compress::LZF::compress $pkt
3107 if 1024 <= length $pkt and $self->{can_lzf};
3108
3109 # split very large packets
3110 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3111 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3112 $pkt = "frag";
3113 }
3114
3115 $self->send_packet ($pkt);
2740} 3116}
2741 3117
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3119
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3120Send a msg packet to the client, formatting the msg for the client if
2745client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2746the message, with C<log> being the default. If C<$color> is negative, suppress 3122message, with C<log> being the default. If C<$color> is negative, suppress
2747the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2748 3124
2749=cut 3125=cut
2750 3126
2751# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2753 "c/identify" => { 3135 "c/identify" => {
2754 id => "infobox", 3136 id => "infobox",
2755 title => "Identify", 3137 title => "Identify",
2756 reply => undef, 3138 reply => undef,
2757 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2759 "c/examine" => { 3141 "c/examine" => {
2760 id => "infobox", 3142 id => "infobox",
2761 title => "Examine", 3143 title => "Examine",
2762 reply => undef, 3144 reply => undef,
2763 tooltip => "Signs and other items you examined", 3145 tooltip => "Signs and other items you examined",
3146 },
3147 "c/shopinfo" => {
3148 id => "infobox",
3149 title => "Shop Info",
3150 reply => undef,
3151 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3152 },
2765 "c/book" => { 3153 "c/book" => {
2766 id => "infobox", 3154 id => "infobox",
2767 title => "Book", 3155 title => "Book",
2768 reply => undef, 3156 reply => undef,
2784 id => "infobox", 3172 id => "infobox",
2785 title => "Body Parts", 3173 title => "Body Parts",
2786 reply => undef, 3174 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you posess and are available",
2788 }, 3176 },
3177 "c/statistics" => {
3178 id => "infobox",
3179 title => "Statistics",
3180 reply => undef,
3181 tooltip => "Shows your primary statistics",
3182 },
3183 "c/skills" => {
3184 id => "infobox",
3185 title => "Skills",
3186 reply => undef,
3187 tooltip => "Shows your experience per skill and item power",
3188 },
3189 "c/shopitems" => {
3190 id => "infobox",
3191 title => "Shop Items",
3192 reply => undef,
3193 tooltip => "Shows the items currently for sale in this shop",
3194 },
3195 "c/resistances" => {
3196 id => "infobox",
3197 title => "Resistances",
3198 reply => undef,
3199 tooltip => "Shows your resistances",
3200 },
3201 "c/pets" => {
3202 id => "infobox",
3203 title => "Pets",
3204 reply => undef,
3205 tooltip => "Shows information abotu your pets/a specific pet",
3206 },
3207 "c/perceiveself" => {
3208 id => "infobox",
3209 title => "Perceive Self",
3210 reply => undef,
3211 tooltip => "You gained detailed knowledge about yourself",
3212 },
2789 "c/uptime" => { 3213 "c/uptime" => {
2790 id => "infobox", 3214 id => "infobox",
2791 title => "Uptime", 3215 title => "Uptime",
2792 reply => undef, 3216 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3217 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 3220 id => "infobox",
2797 title => "Map Info", 3221 title => "Map Info",
2798 reply => undef, 3222 reply => undef,
2799 tooltip => "Information related to the maps", 3223 tooltip => "Information related to the maps",
2800 }, 3224 },
3225 "c/party" => {
3226 id => "party",
3227 title => "Party",
3228 reply => "gsay ",
3229 tooltip => "Messages and chat related to your party",
3230 },
3231 "c/death" => {
3232 id => "death",
3233 title => "Death",
3234 reply => undef,
3235 tooltip => "Reason for and more info about your most recent death",
3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
3243 "c/say" => $SAY_CHANNEL,
3244 "c/chat" => $CHAT_CHANNEL,
2801); 3245);
2802 3246
2803sub cf::client::send_msg { 3247sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3248 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3249
2806 $msg = $self->pl->expand_cfpod ($msg); 3250 $msg = $self->pl->expand_cfpod ($msg)
3251 unless $color & cf::NDI_VERBATIM;
2807 3252
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3253 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3254
2810 # check predefined channels, for the benefit of C 3255 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3256 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3257 $channel = $CHANNEL{$channel};
2813 3258
2814 $self->ext_msg (channel_info => $channel) 3259 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3260 $channel = $channel->{id};
2818 3261
2819 } elsif (ref $channel) { 3262 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3263 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3264 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3265 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3266 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3267 }
2826 3268
2827 $channel = $channel->{id}; 3269 $channel = $channel->{id};
2828 } 3270 }
2829 3271
2830 return unless @extra || length $msg; 3272 return unless @extra || length $msg;
2831 3273
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3274 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3275 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3276 if $color & cf::NDI_DEF;
2836 3277
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3278 my $pkt = "msg "
3279 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3281 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3282
2851 $color &= cf::NDI_COLOR_MASK; 3283 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3284}
2865 3285
2866=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2867 3287
2868Sends an ext event to the client. 3288Sends an ext event to the client.
2870=cut 3290=cut
2871 3291
2872sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2874 3294
2875 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2899} 3296}
2900 3297
2901=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2902 3299
2903Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2923 3320
2924 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2925 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2926 3323
2927 1 3324 1
3325}
3326
3327=item $client->update_command_faces
3328
3329=cut
3330
3331our %COMMAND_FACE;
3332
3333sub cf::client::update_command_faces {
3334 my ($self) = @_;
3335
3336 my @faces = grep $_,
3337 $COMMAND_FACE{preferred},
3338 $COMMAND_FACE{standard},
3339 $COMMAND_FACE{skill},
3340 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3341 $COMMAND_FACE{emote},
3342 ;
3343
3344 $self->send_face ($_)
3345 for @faces;
3346 $self->flush_fx;
3347
3348 $self->ext_msg (command_list => @faces);
3349}
3350
3351=item cf::client::set_command_face $type, $commands
3352
3353=cut
3354
3355sub cf::client::set_command_face {
3356 my ($type, $list) = @_;
3357
3358 my $idx = &cf::face::set ( #d# ugly forward reference
3359 "command_list/$type" => cf::FT_RSRC,
3360 JSON::XS->new->utf8->encode ([ sort @$list ])
3361 );
3362
3363 $COMMAND_FACE{$type} = $idx;
2928} 3364}
2929 3365
2930cf::client->attach ( 3366cf::client->attach (
2931 on_connect => sub { 3367 on_connect => sub {
2932 my ($ns) = @_; 3368 my ($ns) = @_;
2958 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
2959 3395
2960 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2961 3397
2962 if (ref $msg) { 3398 if (ref $msg) {
2963 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967 3400
2968 my @reply;
2969
2970 if (my $cb = $EXTICMD{$type}) { 3401 if (my $cb = $EXTIACMD{$type}) {
3402 $cb->(
3403 $ns,
3404 sub {
3405 $ns->ext_msg ("reply-$reply", @_)
3406 if $reply;
3407 },
3408 @payload
3409 );
3410 } else {
3411 my @reply;
3412
3413 if (my $cb = $EXTICMD{$type}) {
2971 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
2972 } 3419 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2977 } else { 3420 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3421 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 } 3422 }
2980 3423
2981 cf::override; 3424 cf::override;
2982 }, 3425 },
2983); 3426);
3003 3446
3004 $coro 3447 $coro
3005} 3448}
3006 3449
3007cf::client->attach ( 3450cf::client->attach (
3008 on_destroy => sub { 3451 on_client_destroy => sub {
3009 my ($ns) = @_; 3452 my ($ns) = @_;
3010 3453
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3455 },
3013); 3456);
3029our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3030 3473
3031$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3032 3475
3033$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3036 sort time 3479 sort time
3037)); 3480));
3038 3481
3039# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3042 3485
3043The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
3044 3487
3045 cf::object 3488 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3489 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3490 insert remove name archname title slaying race decrease split
3491 value
3048 3492
3049 cf::object::player 3493 cf::object::player
3050 player 3494 player
3051 3495
3052 cf::player 3496 cf::player
3057 3501
3058=cut 3502=cut
3059 3503
3060for ( 3504for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3505 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3067) { 3511) {
3068 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3071 for @funs; 3514 for @funs;
3072} 3515}
3073 3516
3088 3531
3089 my $qcode = $code; 3532 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3092 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
3093 local $_; 3539 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3540
3096 my $eval = 3541 my $eval =
3097 "do {\n" 3542 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3545 . $code
3101 . "\n}" 3546 . "\n}"
3102 ; 3547 ;
3103 3548
3549 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3553 sub_generation_inc;
3554 } else {
3555 local @cf::_safe_eval_args = values %vars;
3556 @res = wantarray ? eval eval : scalar eval $eval;
3557 }
3107 3558
3108 if ($@) { 3559 if ($@) {
3109 warn "$@"; 3560 warn "$@",
3110 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3112 } 3563 }
3113 3564
3114 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3115} 3566}
3116 3567
3130=cut 3581=cut
3131 3582
3132sub register_script_function { 3583sub register_script_function {
3133 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3134 3585
3135 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3137} 3588}
3138 3589
3139=back 3590=back
3140 3591
3141=cut 3592=cut
3142 3593
3143############################################################################# 3594#############################################################################
3144# the server's init and main functions 3595# the server's init and main functions
3145 3596
3597{
3598 package cf::face;
3599
3600 our %HASH; # hash => idx
3601 our @DATA; # dynamically-created facedata, only faceste 0 used
3602 our @FOFS; # file offset, if > 0
3603 our @SIZE; # size of face, in octets
3604 our @META; # meta hash of face, if any
3605 our $DATAFH; # facedata filehandle
3606
3607 # internal api, not finalised
3608 sub set {
3609 my ($name, $type, $data) = @_;
3610
3611 my $idx = cf::face::find $name;
3612
3613 if ($idx) {
3614 delete $HASH{cf::face::get_csum $idx};
3615 } else {
3616 $idx = cf::face::alloc $name;
3617 }
3618
3619 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3620
3621 cf::face::set_type $idx, $type;
3622 cf::face::set_csum $idx, 0, $hash;
3623
3624 # we need to destroy the SV itself, not just modify it, as a running ix
3625 # might hold a reference to it: "delete" achieves that.
3626 delete $FOFS[0][$idx];
3627 delete $DATA[0][$idx];
3628 $DATA[0][$idx] = $data;
3629 $SIZE[0][$idx] = length $data;
3630 delete $META[$idx];
3631 $HASH{$hash} = $idx;#d#
3632
3633 $idx
3634 }
3635
3636 sub _get_data($$$) {
3637 my ($idx, $set, $cb) = @_;
3638
3639 if (defined $DATA[$set][$idx]) {
3640 $cb->($DATA[$set][$idx]);
3641 } elsif (my $fofs = $FOFS[$set][$idx]) {
3642 my $size = $SIZE[$set][$idx];
3643 my $buf;
3644 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3645 if ($_[0] == $size) {
3646 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3647 $cb->($buf);
3648 } else {
3649 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3650 }
3651 };
3652 } else {
3653 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3654 }
3655 }
3656
3657 # rather ineffient
3658 sub cf::face::get_data($;$) {
3659 my ($idx, $set) = @_;
3660
3661 _get_data $idx, $set, Coro::rouse_cb;
3662 Coro::rouse_wait
3663 }
3664
3665 sub cf::face::ix {
3666 my ($ns, $set, $idx, $pri) = @_;
3667
3668 _get_data $idx, $set, sub {
3669 $ns->ix_send ($idx, $pri, $_[0]);
3670 };
3671 }
3672}
3673
3146sub load_facedata($) { 3674sub load_facedata($) {
3147 my ($path) = @_; 3675 my ($path) = @_;
3148 3676
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154 3678
3155 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3156 3680
3157 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3158 0 < aio_load $path, $facedata
3159 or die "$path: $!";
3160
3161 $facedata = Coro::Storable::thaw $facedata;
3162 3682
3163 $facedata->{version} == 2 3683 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3165 3685
3166 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3167 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3168 type => FT_RSRC, 3688
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3170 }; 3690
3171 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3172 3694
3173 { 3695 {
3174 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3175 3697
3176 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3701
3179 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3183 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3184 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3185 } 3709 }
3186 3710
3187 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3188 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3189 3713
3192 3716
3193 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3196 } else { 3720 } else {
3197 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3198 } 3722 }
3199
3200 cf::cede_to_tick;
3201 } 3723 }
3202 } 3724 }
3203 3725
3204 { 3726 {
3205 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3206 3728
3207 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3208 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3209 cf::cede_to_tick;
3210 } 3731 }
3211 3732
3212 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3213 } 3734 }
3214 3735
3215 { 3736 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3219 3738
3220 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3740 if (defined (my $type = $info->{type})) {
3741 # TODO: different hash - must free and use new index, or cache ixface data queue
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3743
3225 if ($info->{type} & 1) {
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3744 cf::face::set_type $idx, $type;
3745 cf::face::set_csum $idx, 0, $info->{hash};
3746 $cf::face::SIZE[0][$idx] = $info->{size};
3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3749 $cf::face::HASH{$info->{hash}} = $idx;
3240 } else { 3750 } else {
3241 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3242 } 3752 }
3243
3244 cf::cede_to_tick;
3245 } 3753 }
3246 } 3754 }
3755
3756 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3757
3758 # HACK to clear player env face cache, we need some signal framework
3759 # for this (global event?)
3760 %ext::player_env::MUSIC_FACE_CACHE = ();
3761
3762 # END ATOMIC
3763
3764 cf::debug "facedata atomic update time ", EV::time - $t1;
3247 3765
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3250 1 3770 1
3251} 3771}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3772
3273register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3275 3775
3276 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3777 $ns->fx_want ($k, $v);
3278 } 3778 }
3279}; 3779};
3780
3781sub load_resource_file($) {
3782 my $guard = lock_acquire "load_resource_file";
3783
3784 my $status = load_resource_file_ $_[0];
3785 get_slot 0.1, 100;
3786 cf::arch::commit_load;
3787
3788 $status
3789}
3790
3791sub reload_exp_table {
3792 _reload_exp_table;
3793
3794 cf::face::set
3795 "res/exp_table" => FT_RSRC,
3796 JSON::XS->new->utf8->canonical->encode (
3797 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3798 );
3799}
3800
3801sub reload_materials {
3802 _reload_materials;
3803}
3280 3804
3281sub reload_regions { 3805sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3806 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3807 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3808 %ext::player_env::MUSIC_FACE_CACHE = ();
3291 if exists $_->{match}; 3815 if exists $_->{match};
3292 } 3816 }
3293} 3817}
3294 3818
3295sub reload_facedata { 3819sub reload_facedata {
3296 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3297 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3298} 3822}
3299 3823
3300sub reload_archetypes { 3824sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references 3827
3304 # this really needs to be done in an extra post-pass 3828 cf::face::set
3305 # (which needs to be synchronous, so solve it differently) 3829 "res/skill_info" => FT_RSRC,
3306 load_resource_file "$DATADIR/archetypes" 3830 JSON::XS->new->utf8->canonical->encode (
3307 or die "unable to load archetypes\n"; 3831 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3832 );
3833
3834 cf::face::set
3835 "res/spell_paths" => FT_RSRC,
3836 JSON::XS->new->utf8->canonical->encode (
3837 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3838 );
3839
3840 # command completion
3841 my @commands;
3842
3843 for (0..cf::arch::skillvec_size - 1) {
3844 my $skill = cf::arch::skillvec $_;
3845 my $name = $skill->name;
3846 my $flags = cf::skill_flags $skill->subtype;
3847
3848 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3849 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3850 }
3851
3852 cf::client::set_command_face skill => \@commands;
3308} 3853}
3309 3854
3310sub reload_treasures { 3855sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3313} 3858}
3314 3859
3860sub reload_sound {
3861 trace "loading sound config from $DATADIR/sound\n";
3862
3863 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3864
3865 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3866 my $sound = $soundconf->{compat}[$_]
3867 or next;
3868
3869 my $face = cf::face::find "sound/$sound->[1]";
3870 cf::sound::set $sound->[0] => $face;
3871 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3872 }
3873
3874 while (my ($k, $v) = each %{$soundconf->{event}}) {
3875 my $face = cf::face::find "sound/$v";
3876 cf::sound::set $k => $face;
3877 }
3878}
3879
3315sub reload_resources { 3880sub reload_resources {
3316 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3317 3882
3883 reload_materials;
3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3887 reload_archetypes;
3318 reload_regions; 3888 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3889 reload_treasures;
3323 3890
3324 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3892}
3330 3893
3331sub reload_config { 3894sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3333 or return;
3334 3896
3335 local $/; 3897 my $config = load_file "$CONFDIR/config";
3336 *CFG = YAML::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3337 3900
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3902
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3903 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3904 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3342 3905
3343 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3347 }; 3910 };
3348 warn $@ if $@; 3911 warn $@ if $@;
3349 } 3912 }
3350} 3913}
3351 3914
3915sub pidfile() {
3916 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3917 or die "$PIDFILE: $!";
3918 flock $fh, &Fcntl::LOCK_EX
3919 or die "$PIDFILE: flock: $!";
3920 $fh
3921}
3922
3923# make sure only one server instance is running at any one time
3924sub atomic {
3925 my $fh = pidfile;
3926
3927 my $pid = <$fh>;
3928 kill 9, $pid if $pid > 0;
3929
3930 seek $fh, 0, 0;
3931 print $fh $$;
3932}
3933
3934sub main_loop {
3935 trace "EV::run starting\n";
3936 if (1) {
3937 EV::run;
3938 }
3939 trace "EV::run returned\n";
3940 goto &main_loop unless $REALLY_UNLOOP;
3941}
3942
3352sub main { 3943sub main {
3944 cf::init_globals; # initialise logging
3945
3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3950
3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3952
3353 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3955 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3956 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3359 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3360 }; 3960 };
3361 3961
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3963
3964 cf::sync_job {
3965 cf::incloader::init ();
3966
3967 db_init;
3968
3969 cf::init_anim;
3970 cf::init_attackmess;
3971 cf::init_dynamic;
3972
3973 cf::load_settings;
3974
3975 reload_resources;
3976 reload_config;
3977
3978 cf::init_uuid;
3979 cf::init_signals;
3980 cf::init_skills;
3981
3982 cf::init_beforeplay;
3983
3984 atomic;
3985
3986 load_extensions;
3987
3988 utime time, time, $RUNTIMEFILE;
3989
3990 # no (long-running) fork's whatsoever before this point(!)
3991 use POSIX ();
3992 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3993
3994 cf::_post_init 0;
3995 };
3996
3997 cf::object::thawer::errors_are_fatal 0;
3998 info "parse errors in files are no longer fatal from this point on.\n";
3999
4000 AE::postpone {
4001 undef &main; # free gobs of memory :)
4002 };
4003
4004 goto &main_loop;
3369} 4005}
3370 4006
3371############################################################################# 4007#############################################################################
3372# initialisation and cleanup 4008# initialisation and cleanup
3373 4009
3374# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3375BEGIN { 4011BEGIN {
3376 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3380 }; 4016 };
3381 } 4017 }
3382} 4018}
3383 4019
3384sub write_runtime { 4020sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 4021 my $t0 = AE::time;
3386 4022
3387 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3389 4025
3390 IO::AIO::aio_utime $runtime, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 4027
3392 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3393 4029
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 4031 or return;
3396 4032
3397 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 4045 aio_utime $fh, undef, undef;
3410 4046
3411 close $fh 4047 close $fh
3412 or return; 4048 or return;
3413 4049
3414 aio_rename "$runtime~", $runtime 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 4051 and return;
3416 4052
3417 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 4054
3419 1 4055 1
4056}
4057
4058our $uuid_lock;
4059our $uuid_skip;
4060
4061sub write_uuid_sync($) {
4062 $uuid_skip ||= $_[0];
4063
4064 return if $uuid_lock;
4065 local $uuid_lock = 1;
4066
4067 my $uuid = "$LOCALDIR/uuid";
4068
4069 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
4070 or return;
4071
4072 my $value = uuid_seq uuid_cur;
4073
4074 unless ($value) {
4075 info "cowardly refusing to write zero uuid value!\n";
4076 return;
4077 }
4078
4079 my $value = uuid_str $value + $uuid_skip;
4080 $uuid_skip = 0;
4081
4082 (aio_write $fh, 0, (length $value), $value, 0) <= 0
4083 and return;
4084
4085 # always fsync - this file is important
4086 aio_fsync $fh
4087 and return;
4088
4089 close $fh
4090 or return;
4091
4092 aio_rename "$uuid~", $uuid
4093 and return;
4094
4095 trace "uuid file written ($value).\n";
4096
4097 1
4098
4099}
4100
4101sub write_uuid($$) {
4102 my ($skip, $sync) = @_;
4103
4104 $sync ? write_uuid_sync $skip
4105 : async { write_uuid_sync $skip };
3420} 4106}
3421 4107
3422sub emergency_save() { 4108sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3424 4110
3425 warn "enter emergency perl save\n"; 4111 info "emergency_perl_save: enter\n";
4112
4113 # this is a trade-off: we want to be very quick here, so
4114 # save all maps without fsync, and later call a global sync
4115 # (which in turn might be very very slow)
4116 local $USE_FSYNC = 0;
3426 4117
3427 cf::sync_job { 4118 cf::sync_job {
4119 cf::write_runtime_sync; # external watchdog should not bark
4120
3428 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 4127 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 4129 $pl->save;
3437 } 4130 }
3438 warn "end emergency player save\n"; 4131 info "emergency_perl_save: end player save\n";
3439 4132
3440 warn "begin emergency map save\n"; 4133 cf::write_runtime_sync; # external watchdog should not bark
4134
4135 info "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 4138 $map->valid or next;
3444 $map->save; 4139 $map->save;
3445 } 4140 }
3446 warn "end emergency map save\n"; 4141 info "emergency_perl_save: end map save\n";
3447 4142
3448 warn "begin emergency database checkpoint\n"; 4143 cf::write_runtime_sync; # external watchdog should not bark
4144
4145 info "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
4148
4149 info "emergency_perl_save: begin write uuid\n";
4150 write_uuid_sync 1;
4151 info "emergency_perl_save: end write uuid\n";
4152
4153 cf::write_runtime_sync; # external watchdog should not bark
4154
4155 trace "emergency_perl_save: syncing database to disk";
4156 BDB::db_env_txn_checkpoint $DB_ENV;
4157
4158 info "emergency_perl_save: starting sync\n";
4159 IO::AIO::aio_sync sub {
4160 info "emergency_perl_save: finished sync\n";
4161 };
4162
4163 cf::write_runtime_sync; # external watchdog should not bark
4164
4165 trace "emergency_perl_save: flushing outstanding aio requests";
4166 while (IO::AIO::nreqs || BDB::nreqs) {
4167 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4168 }
4169
4170 cf::write_runtime_sync; # external watchdog should not bark
3451 }; 4171 };
3452 4172
3453 warn "leave emergency perl save\n"; 4173 info "emergency_perl_save: leave\n";
3454} 4174}
3455 4175
3456sub post_cleanup { 4176sub post_cleanup {
3457 my ($make_core) = @_; 4177 my ($make_core) = @_;
3458 4178
4179 IO::AIO::flush;
4180
3459 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 4182 if $make_core;
4183
4184 my $fh = pidfile;
4185 unlink $PIDFILE if <$fh> == $$;
4186}
4187
4188# a safer delete_package, copied from Symbol
4189sub clear_package($) {
4190 my $pkg = shift;
4191
4192 # expand to full symbol table name if needed
4193 unless ($pkg =~ /^main::.*::$/) {
4194 $pkg = "main$pkg" if $pkg =~ /^::/;
4195 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4196 $pkg .= '::' unless $pkg =~ /::$/;
4197 }
4198
4199 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4200 my $stem_symtab = *{$stem}{HASH};
4201
4202 defined $stem_symtab and exists $stem_symtab->{$leaf}
4203 or return;
4204
4205 # clear all symbols
4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4207 for my $name (keys %$leaf_symtab) {
4208 _gv_clear *{"$pkg$name"};
4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4210 }
3461} 4211}
3462 4212
3463sub do_reload_perl() { 4213sub do_reload_perl() {
3464 # can/must only be called in main 4214 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3466 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3467 return; 4217 return;
3468 } 4218 }
3469 4219
3470 warn "reloading..."; 4220 return if $RELOAD++;
3471 4221
3472 warn "entering sync_job"; 4222 my $t1 = AE::time;
3473 4223
4224 while ($RELOAD) {
4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
4227
4228 trace "perl_reload: entering sync_job";
4229
3474 cf::sync_job { 4230 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark
3476 cf::emergency_save; 4231 #cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark
3478 4232
3479 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV;
3481
3482 # if anything goes wrong in here, we should simply crash as we already saved
3483
3484 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs;
3490 warn "iterate...";
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = (); 4235 %EXT_CORO = ();
3498 4236
3499 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3500 %COMMAND = (); 4238 %COMMAND = ();
3501 4239
3502 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3503 %EXTCMD = (); 4241 %EXTCMD = ();
3504 %EXTICMD = (); 4242 %EXTICMD = ();
3505 4243
3506 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3507 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3509 4247
3510 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3511 eval { 4249 eval {
3512 $cb->($pkg); 4250 $cb->($pkg);
3513 1 4251 1
3514 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
4253 }
4254
4255 trace "... clearing $pkg";
4256 clear_package $pkg;
3515 } 4257 }
3516 4258
3517 warn "... nuking $pkg";
3518 Symbol::delete_package $pkg;
3519 }
3520
3521 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3522 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 4262
3525 warn "... unloading $k"; 4263 trace "... unloading $k";
3526 delete $INC{$k}; 4264 delete $INC{$k};
3527 4265
3528 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3530 4268
3531 if (my $cb = $k->can ("unload_module")) { 4269 if (my $cb = $k->can ("unload_module")) {
3532 $cb->(); 4270 $cb->();
4271 }
4272
4273 clear_package $k;
3533 } 4274 }
3534 4275
3535 Symbol::delete_package $k;
3536 }
3537
3538 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 4277 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4278 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 4279
3542 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 4283
3546 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3547 # and global variables created in xs 4285 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3549 4287
3550 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3551 4289
3552 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3553 require cf; 4291 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3555 4293
3556 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3557 cf::reload_config; 4295 cf::reload_config;
3558 4296
3559 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3560 cf::load_extensions; 4298 cf::load_extensions;
3561 4299
4300 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3565 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
4307 }
3568 4308
3569 warn "leaving sync_job"; 4309 cf::_post_init 1;
3570 4310
4311 trace "perl_reload: leaving sync_job";
4312
3571 1 4313 1
3572 } or do { 4314 } or do {
3573 warn $@; 4315 error $@;
3574 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
4317 };
4318
4319 --$RELOAD;
3575 }; 4320 }
3576 4321
3577 warn "reloaded"; 4322 $t1 = AE::time - $t1;
4323 info "perl_reload: completed in ${t1}s\n";
3578}; 4324};
3579 4325
3580our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3581 4327
3582sub reload_perl() { 4328sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 4329 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3585 4331
4332 $RELOAD_WATCHER ||= cf::async {
4333 Coro::AIO::aio_wait cache_extensions;
4334
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 4336 do_reload_perl;
3588 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
4338 };
3589 }; 4339 };
3590} 4340}
3591 4341
3592register_command "reload" => sub { 4342register_command "reload" => sub {
3593 my ($who, $arg) = @_; 4343 my ($who, $arg) = @_;
3599 reload_perl; 4349 reload_perl;
3600 }; 4350 };
3601 } 4351 }
3602}; 4352};
3603 4353
3604unshift @INC, $LIBDIR; 4354#############################################################################
3605 4355
3606my $bug_warning = 0; 4356my $bug_warning = 0;
3607 4357
3608our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN;
3610
3611sub wait_for_tick { 4358sub wait_for_tick() {
3612 return if tick_inhibit; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3613 return if $Coro::current == $Coro::main;
3614 4360
3615 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3616 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait;
3618} 4362}
3619 4363
3620sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3621 return if tick_inhibit; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3622 return if $Coro::current == $Coro::main;
3623 4366
3624 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 4369 $signal->wait;
3627} 4370}
3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4374 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3632 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3633 return; 4376 return;
3634 } 4377 }
3635 4378
3636 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4380
4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3637 4382
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4384 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4385 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4387 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3644 }; 4389 };
3645 } 4390 }
3646 4391
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3648 $sig->send; 4393 $sig->send;
3649 } 4394 }
3650 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3651 $sig->send;
3652 }
3653 4396
3654 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3656 4399
3657 if (0) { 4400 if (0) {
3658 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3662 } 4405 }
3663 } 4406 }
3664} 4407}
3665 4408
3666{ 4409{
3667 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3668 4412
3669 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3672 4416
3673 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4420 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4421 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4422 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4423 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4424
3680 cf::sync_job { 4425 cf::sync_job {
3681 eval { 4426 eval {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 }; 4446 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 }; 4449 };
4450
4451 info "database initialised";
3705} 4452}
3706 4453
3707{ 4454{
3708 # configure IO::AIO 4455 # configure IO::AIO
3709 4456
4457 info "initialising aio";
3710 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3713} 4462}
3714 4463
3715my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3716 4466
3717sub _log_backtrace { 4467sub _log_backtrace {
3718 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3719 4469
3720 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3721 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3722 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3724 ++$_log_backtrace; 4478 ++$_log_backtrace;
4479 my $perl_bt = Carp::longmess $msg;
3725 async { 4480 async {
3726 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3727 4482
3728 my @bt = fork_call { 4483 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4484 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4495 }
3741 4496
3742 @funcs 4497 @funcs
3743 }; 4498 };
3744 4499
3745 LOG llevInfo, "[ABT] $msg\n"; 4500 LOG llevInfo, "[ABT] $perl_bt\n";
4501 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4503 --$_log_backtrace;
3748 }; 4504 };
3749 } else { 4505 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3752 } 4508 }
3753} 4509}
3754 4510
3755# load additional modules 4511# load additional modules
3756use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3757 4514
3758END { cf::emergency_save } 4515END { cf::emergency_save }
3759 4516
37601 45171
3761 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines