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.416 by root, Fri Apr 11 13:59:06 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 )
552} 776}
553 777
554=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
555 779
556=cut 780=cut
593within each server. 817within each server.
594 818
595=cut 819=cut
596 820
597sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
598 my ($name) = @_; 825 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
600 827
601 eval { 828 eval {
602 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
612} 839}
613 840
614our $DB; 841our $DB;
615 842
616sub db_init { 843sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
619 };
620} 845}
621 846
622sub db_get($$) { 847sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
624 849
625 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
626 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
627 854
628 $! ? () 855 $! ? ()
629 : $data 856 : $data
630 }
631} 857}
632 858
633sub db_put($$$) { 859sub db_put($$$) {
634 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
663 889
664 my @data; 890 my @data;
665 my $md5; 891 my $md5;
666 892
667 for (0 .. $#$src) { 893 for (0 .. $#$src) {
668 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
669 or Carp::croak "$src->[$_]: $!";
670 } 895 }
671 896
672 # if processing is expensive, check 897 # if processing is expensive, check
673 # checksum first 898 # checksum first
674 if (1) { 899 if (1) {
687 912
688 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
689 } 914 }
690 } 915 }
691 916
692 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
693 my $data = $process->(\@data); 918 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
695 920
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 922
698 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
701 926
711 936
712=cut 937=cut
713 938
714sub datalog($@) { 939sub datalog($@) {
715 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 942}
718 943
719=back 944=back
720 945
721=cut 946=cut
722 947
723############################################################################# 948#############################################################################
724 949
725=head2 ATTACHABLE OBJECTS 950=head2 ATTACHABLE OBJECTS
726 951
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 953attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 954to it. All such attachable objects support the following methods.
730 955
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 1007=item cf::CLASS::attachment $name, ...
783 1008
784Register an attachment by C<$name> through which attachable objects of the 1009Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 1010given CLASS can refer to this attachment.
786 1011
787Some classes such as crossfire maps and objects can specify attachments 1012Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 1014
790These calls expect any number of the following handler/hook descriptions: 1015These calls expect any number of the following handler/hook descriptions:
791 1016
792=over 4 1017=over 4
916 1141
917 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1144
920 } elsif (ref $type) { 1145 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
922 1147
923 } else { 1148 } else {
924 shift @arg; 1149 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
926 } 1151 }
927 } 1152 }
928} 1153}
929 1154
930sub _object_attach { 1155sub _object_attach {
940 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
941 } 1166 }
942 1167
943 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
944 } else { 1169 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1171 }
947 1172
948 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
949} 1174}
950 1175
1009 1234
1010 for (@$callbacks) { 1235 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1012 1237
1013 if ($@) { 1238 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1240 override;
1017 } 1241 }
1018 1242
1019 return 1 if $override; 1243 return 1 if $override;
1020 } 1244 }
1083 1307
1084sub reattach { 1308sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1309 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1310 my ($obj) = @_;
1087 1311
1312 # no longer needed after getting rid of delete_package?
1088 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
1089 1314
1090 my $registry = $obj->registry; 1315 my $registry = $obj->registry;
1091 1316
1092 @$registry = (); 1317 @$registry = ();
1093 1318
1098 for (@$attach) { 1323 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1101 } 1326 }
1102 } else { 1327 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1329 }
1105 } 1330 }
1106} 1331}
1107 1332
1108cf::attachable->attach ( 1333cf::attachable->attach (
1135 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1136 1361
1137 sync_job { 1362 sync_job {
1138 if (length $$rdata) { 1363 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1142 1368
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1370 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1376 aio_close $fh;
1148 1377
1149 if (@$objs) { 1378 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1380 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1387 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1389 }
1158 } else { 1390 } else {
1159 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1160 } 1392 }
1161 1393
1162 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1395
1396 $filename =~ s%/[^/]+$%%;
1397 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1398 } else {
1164 warn "FATAL: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1165 } 1400 }
1166 } else { 1401 } else {
1167 aio_unlink $filename; 1402 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1169 } 1404 }
1193 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1429 $av = $st->{objs};
1195 } 1430 }
1196 1431
1197 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1200 1436
1201 ($data, $av) 1437 ($data, $av)
1202} 1438}
1203 1439
1204=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1208=cut 1444=cut
1209 1445
1210############################################################################# 1446#############################################################################
1211# command handling &c 1447# command handling &c
1212 1448
1213=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1214 1450
1215Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1216$name. 1452$name.
1217 1453
1218=cut 1454=cut
1224 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1225 1461
1226 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1227} 1463}
1228 1464
1229=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1230 1466
1231Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1232extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1233received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1234the 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
1235has logged in successfully. 1471has logged in successfully.
1236 1472
1237If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1238called.
1239 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
1240=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1241 1481
1242Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1243exticmd 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
1244are 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
1245is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1246log-in. 1486log-in.
1247 1487
1248If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1249called.
1250 1489
1251=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1252 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
1253sub register_extcmd { 1497sub register_extcmd($$) {
1254 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1255 1499
1256 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1257} 1501}
1258 1502
1259sub register_exticmd { 1503sub register_async_extcmd($$) {
1260 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1261 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1262 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1263} 1513}
1264 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1521use File::Glob ();
1522
1265cf::player->attach ( 1523cf::player->attach (
1266 on_command => sub { 1524 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1268 1526
1269 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1270 or return; 1528 or return;
1271 1529
1279 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1280 1538
1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1282 1540
1283 if (ref $msg) { 1541 if (ref $msg) {
1284 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1285 "ARRAY" eq ref $msg
1286 ? @$msg
1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1288 1543
1289 my @reply;
1290
1291 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}) {
1292 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1293 } 1562 }
1294 1563
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1298 } else { 1564 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1566 }
1301 1567
1302 cf::override; 1568 cf::override;
1303 }, 1569 },
1304); 1570);
1305 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
1306sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1307 cf::sync_job { 1601 cf::sync_job {
1308 my %todo; 1602 my %todo;
1309 1603
1310 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1605 next unless -r $path;
1329 1623
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1626
1333 $ext{source} = 1627 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1336 . $source 1630 . $source
1337 . "\n};\n1"; 1631 . "\n};\n1";
1338 1632
1339 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1340 } 1634 }
1341 1635
1636 my $pass = 0;
1342 my %done; 1637 my %done;
1343 while (%todo) { 1638 while (%todo) {
1344 my $progress; 1639 my $progress;
1345 1640
1641 ++$pass;
1642
1643 ext:
1346 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1646 next ext
1349 unless exists $done{$_}; 1647 unless exists $done{$_};
1350 } 1648 }
1351 1649
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1651
1354 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 $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1665
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1667 if exists $v->{meta}{mandatory};
1362 1668
1363 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;
1364 } 1678 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1679 }
1370 1680
1371 skip: 1681 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1691 }
1375 }; 1692 };
1376} 1693}
1377 1694
1378############################################################################# 1695#############################################################################
1379 1696
1380=back 1697=back
1381 1698
1382=head2 CORE EXTENSIONS 1699=head2 CORE EXTENSIONS
1383 1700
1384Functions and methods that extend core crossfire objects. 1701Functions and methods that extend core deliantra objects.
1385 1702
1386=cut 1703=cut
1387 1704
1388package cf::player; 1705package cf::player;
1389 1706
1432 1749
1433sub exists($) { 1750sub exists($) {
1434 my ($login) = @_; 1751 my ($login) = @_;
1435 1752
1436 $cf::PLAYER{$login} 1753 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1754 or !aio_stat path $login
1438} 1755}
1439 1756
1440sub find($) { 1757sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1758 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1759 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1771 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1772 or return;
1456 1773
1457 my $pl = cf::player::load_pl $f 1774 my $pl = cf::player::load_pl $f
1458 or return; 1775 or return;
1776
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1777 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1778 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1462 } 1780 }
1463 } 1781 }
1464} 1782}
1465 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
1466sub save($) { 1797sub save($) {
1467 my ($pl) = @_; 1798 my ($pl) = @_;
1468 1799
1469 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1470 1801
1473 1804
1474 return if $pl->{deny_save}; 1805 return if $pl->{deny_save};
1475 1806
1476 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1477 $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];
1478 1814
1479 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1816 cf::cede_to_tick;
1481} 1817}
1482 1818
1514 my ($pl) = @_; 1850 my ($pl) = @_;
1515 1851
1516 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1517 1853
1518 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1519 $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
1520 1856
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1858 $pl->deactivate;
1859
1860 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1524 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1525 1865
1526 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1566 1906
1567 for my $login (@$dirs) { 1907 for my $login (@$dirs) {
1568 my $path = path $login; 1908 my $path = path $login;
1569 1909
1570 # a .pst is a dead give-away for a valid player 1910 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1911 # if no pst file found, open and chekc for blocked users
1912 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1913 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1914 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1915 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1916 }
1576 1917
1580 1921
1581 \@logins 1922 \@logins
1582} 1923}
1583 1924
1584=item $player->maps 1925=item $player->maps
1926
1927=item cf::player::maps $login
1585 1928
1586Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1587player. May block. 1930player. May block.
1588 1931
1589=cut 1932=cut
1607 } 1950 }
1608 1951
1609 \@paths 1952 \@paths
1610} 1953}
1611 1954
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1956
1614Expand crossfire pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704
1705=item $player->ext_reply ($msgid, @msg)
1706
1707Sends an ext reply to the player.
1708
1709=cut
1710
1711sub ext_reply($$@) {
1712 my ($self, $id, @msg) = @_;
1713
1714 $self->ns->ext_reply ($id, @msg)
1715}
1716 1958
1717=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1718 1960
1719Sends an ext event to the client. 1961Sends an ext event to the client.
1720 1962
1740 1982
1741=cut 1983=cut
1742 1984
1743sub find_by_path($) { 1985sub find_by_path($) {
1744 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1745 1989
1746 my ($match, $specificity); 1990 my ($match, $specificity);
1747 1991
1748 for my $region (list) { 1992 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1775our $MAX_RESET = 3600; 2019our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 2020our $DEFAULT_RESET = 3000;
1777 2021
1778sub generate_random_map { 2022sub generate_random_map {
1779 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1780 # mit "rum" bekleckern, nicht 2024
2025 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2026
1781 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1789 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1790 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1791 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1792 (cf::region::find $rmp->{region}), $rmp->{custom}
1793 )
1794} 2028}
1795 2029
1796=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1797 2031
1798Register 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
1803 2037
1804sub register { 2038sub register {
1805 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 2040 my $pkg = caller;
1807 2041
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 2043
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 2045}
1813 2046
1814# also paths starting with '/' 2047# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 2049
1817sub thawer_merge { 2050sub thawer_merge {
1818 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1819 2052
1820 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1825} 2058}
1826 2059
1827sub normalise { 2060sub normalise {
1828 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1829 2062
1830 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1831 2064
1832 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1833 2066
1834 # map plan: 2067 # map plan:
1835 # 2068 #
1850 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1851 $path = "$base/$path"; 2084 $path = "$base/$path";
1852 } 2085 }
1853 2086
1854 for ($path) { 2087 for ($path) {
1855 redo if s{//}{/};
1856 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1857 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1858 } 2090 }
1859 2091
1860 $path 2092 $path
1874 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1875 return $self; 2107 return $self;
1876 } 2108 }
1877 } 2109 }
1878 2110
1879 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1880 () 2112 ()
1881} 2113}
1882 2114
2115# may re-bless or do other evil things
1883sub init { 2116sub init {
1884 my ($self) = @_; 2117 my ($self) = @_;
1885 2118
1886 $self 2119 $self
1887} 2120}
1906 2139
1907# the temporary/swap location 2140# the temporary/swap location
1908sub save_path { 2141sub save_path {
1909 my ($self) = @_; 2142 my ($self) = @_;
1910 2143
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2144 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 2145 "$TMPDIR/$path.map"
1913} 2146}
1914 2147
1915# the unique path, undef == no special unique path 2148# the unique path, undef == no special unique path
1916sub uniq_path { 2149sub uniq_path {
1917 my ($self) = @_; 2150 my ($self) = @_;
1918 2151
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2152 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 2153 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 2154}
1931 2155
1932sub decay_objects { 2156sub decay_objects {
1933 my ($self) = @_; 2157 my ($self) = @_;
1934 2158
1961 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1962 2186
1963 1 2187 1
1964} 2188}
1965 2189
2190# used to laod the header of an original map
1966sub load_header_orig { 2191sub load_header_orig {
1967 my ($self) = @_; 2192 my ($self) = @_;
1968 2193
1969 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1970} 2195}
1971 2196
2197# used to laod the header of an instantiated map
1972sub load_header_temp { 2198sub load_header_temp {
1973 my ($self) = @_; 2199 my ($self) = @_;
1974 2200
1975 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1976} 2202}
1977 2203
2204# called after loading the header from an instantiated map
1978sub prepare_temp { 2205sub prepare_temp {
1979 my ($self) = @_; 2206 my ($self) = @_;
1980 2207
1981 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1982 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1983 # safety 2210 # safety
1984 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1985 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1986} 2213}
1987 2214
2215# called after loading the header from an original map
1988sub prepare_orig { 2216sub prepare_orig {
1989 my ($self) = @_; 2217 my ($self) = @_;
1990 2218
1991 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1992 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2016 2244
2017sub find; 2245sub find;
2018sub find { 2246sub find {
2019 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2020 2248
2249 cf::cede_to_tick;
2250
2021 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2022 2252
2023 cf::lock_wait "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2255
2026 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2257 my $map = new_from_path cf::map $path
2031 or return; 2258 or return;
2032 2259
2033 $map->{last_save} = $cf::RUNTIME; 2260 $map->{last_save} = $cf::RUNTIME;
2034 2261
2036 or return; 2263 or return;
2037 2264
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2265 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2266 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2267 #$cf::WAIT_FOR_TICK->wait;
2268 undef $guard2;
2041 undef $guard1; 2269 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2270 $map->reset;
2044 return find $path; 2271 return find $path;
2045 } 2272 }
2046 2273
2047 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
2048 } 2275 }
2049} 2276}
2050 2277
2051sub pre_load { } 2278sub pre_load { }
2052sub post_load { } 2279#sub post_load { } # XS
2053 2280
2054sub load { 2281sub load {
2055 my ($self) = @_; 2282 my ($self) = @_;
2056 2283
2057 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
2060 2287
2061 { 2288 {
2062 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2063 2290
2064 return unless $self->valid; 2291 return unless $self->valid;
2065 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2066
2067 $self->in_memory (cf::MAP_LOADING);
2068 2293
2069 $self->alloc; 2294 $self->alloc;
2070 2295
2071 $self->pre_load; 2296 $self->pre_load;
2072 cf::cede_to_tick; 2297 cf::cede_to_tick;
2073 2298
2299 if (exists $self->{load_path}) {
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2301 $f->skip_block;
2076 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2077 or return; 2303 or return;
2078 2304
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2305 $self->post_load_original
2080 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2081 2307
2082 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2309 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2086 $self->clear_unique_items; 2312 $self->clear_unique_items;
2087 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2089 } 2316 }
2090 } 2317 }
2091 }
2092 2318
2093 $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);
2094 2326
2095 cf::cede_to_tick; 2327 cf::cede_to_tick;
2096 # now do the right thing for maps 2328 # now do the right thing for maps
2097 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2098 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2102 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2335 $self->decay_objects;
2104 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2105 $self->update_buttons; 2337 $self->update_buttons;
2106 cf::cede_to_tick; 2338 cf::cede_to_tick;
2107 $self->set_darkness_map; 2339 #$self->activate; # no longer activate maps automatically
2108 cf::cede_to_tick;
2109 $self->activate;
2110 } 2340 }
2111 2341
2112 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2114
2115 $self->in_memory (cf::MAP_IN_MEMORY);
2116 } 2344 }
2117 2345
2118 $self->post_load; 2346 $self->post_load;
2119}
2120 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
2121sub customise_for { 2354sub customise_for {
2122 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2123 2356
2124 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2358 if $self->per_player;
2128# if $self->per_party; 2361# if $self->per_party;
2129 2362
2130 $self 2363 $self
2131} 2364}
2132 2365
2133# find and load all maps in the 3x3 area around a map
2134sub load_neighbours {
2135 my ($map) = @_;
2136
2137 my @neigh; # diagonal neighbours
2138
2139 for (0 .. 3) {
2140 my $neigh = $map->tile_path ($_)
2141 or next;
2142 $neigh = find $neigh, $map
2143 or next;
2144 $neigh->load;
2145
2146 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 }
2150
2151 for (grep defined $_->[0], @neigh) {
2152 my ($path, $origin) = @$_;
2153 my $neigh = find $path, $origin
2154 or next;
2155 $neigh->load;
2156 }
2157}
2158
2159sub find_sync { 2366sub find_sync {
2160 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2161 2368
2162 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
2163} 2374}
2164 2375
2165sub do_load_sync { 2376sub do_load_sync {
2166 my ($map) = @_; 2377 my ($map) = @_;
2167 2378
2379 # it's a bug to call this from the main context
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2170 2382
2171 cf::sync_job { $map->load }; 2383 $map->load;
2172} 2384}
2173 2385
2174our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2176 2388
2177sub find_async { 2389sub find_async {
2178 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2179 2391
2180 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2181 2393
2182 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2395 return $map if !$load || $map->linkable;
2184 } 2396 }
2185 2397
2186 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2187 2399
2188 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2189 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2190 2402
2191 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2192 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2193 if (my $map = find $k) { 2405 if (my $map = find $k) {
2194 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2195 } 2407 }
2196 2408
2197 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2198 } 2410 }
2199 } 2411 }
2202 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2203 2415
2204 () 2416 ()
2205} 2417}
2206 2418
2419# common code, used by both ->save and ->swapout
2207sub save { 2420sub _save {
2208 my ($self) = @_; 2421 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2422
2212 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2213 2424
2214 return unless $self->dirty; 2425 return unless $self->dirty;
2215 2426
2224 2435
2225 cf::async { 2436 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2437 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2438 $_->contr->save for $self->players;
2228 }; 2439 };
2440
2441 cf::get_slot 0.02;
2229 2442
2230 if ($uniq) { 2443 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2444 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2445 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2446 } else {
2234 $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);
2235 } 2448 }
2236} 2449}
2237 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2238sub swap_out { 2459sub swap_out {
2239 my ($self) = @_; 2460 my ($self) = @_;
2240 2461
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2246 return if $self->players; 2466 return if $self->players;
2247 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
2248 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2249 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
2250 $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};
2251 2518
2252 $self->deactivate; 2519 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2521 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2522
2300 $self->unlink_save; 2523 $self->unlink_save;
2301 $self->destroy; 2524 $self->destroy;
2302} 2525}
2303 2526
2311 2534
2312 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2313 2536
2314 $self->unlink_save; 2537 $self->unlink_save;
2315 2538
2316 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2544
2370 2593
2371sub unique_maps() { 2594sub unique_maps() {
2372 [ 2595 [
2373 map { 2596 map {
2374 utf8::decode $_; 2597 utf8::decode $_;
2375 /\.map$/ 2598 s/\.map$//; # TODO future compatibility hack
2599 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2600 ? ()
2376 ? normalise $_ 2601 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2603 ]
2380} 2604}
2381 2605
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}
2637
2382=back 2638=back
2383 2639
2384=head3 cf::object 2640=head3 cf::object
2385 2641
2386=cut 2642=cut
2389 2645
2390=over 4 2646=over 4
2391 2647
2392=item $ob->inv_recursive 2648=item $ob->inv_recursive
2393 2649
2394Returns 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.
2395 2652
2396=cut 2653=cut
2397 2654
2398sub inv_recursive_; 2655sub inv_recursive_;
2399sub inv_recursive_ { 2656sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2661 inv_recursive_ inv $_[0]
2405} 2662}
2406 2663
2407=item $ref = $ob->ref 2664=item $ref = $ob->ref
2408 2665
2409creates 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.
2410 2667
2411=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2412 2669
2413returns 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,
2414even if the object actually exists. May block. 2671even if the object actually exists. May block.
2415 2672
2416=cut 2673=cut
2417 2674
2418sub deref { 2675sub deref {
2446can 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
2447dialogue with the given NPC character. 2704dialogue with the given NPC character.
2448 2705
2449=cut 2706=cut
2450 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
2451# rough implementation of a future "reply" method that works 2722# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2723# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2725sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2726 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2737 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2739
2469 } else { 2740 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2741 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2742 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2743 }
2473 } 2744 }
2474} 2745}
2475 2746
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2747=item $object->send_msg ($channel, $msg, $color, [extra...])
2486=item $player_object->may ("access") 2757=item $player_object->may ("access")
2487 2758
2488Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2489(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2490 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
2491=cut 2787=cut
2492 2788
2493sub cf::object::player::may { 2789sub cf::object::player::may {
2494 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2495 2791
2496 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2497 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2498 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2499 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2500} 2796}
2501 2797
2502=item $player_object->enter_link 2798=item $player_object->enter_link
2503 2799
2504Freezes 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}>).
2505 2801
2506The 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.
2507I<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.
2508 2806
2509Will 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.
2510 2814
2511=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2512 2816
2513Moves 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
2514map. 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
2532sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2533 my ($self) = @_; 2837 my ($self) = @_;
2534 2838
2535 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2536 2840
2841 ++$self->{_link_recursion};
2842
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2844
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2541 2847
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2849}
2544 2850
2545sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2547 2853
2564 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2566 2872
2567 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2570 2876
2571 $map->load; 2877 $map->load;
2572 $map->load_neighbours;
2573 2878
2574 return unless $self->contr->active; 2879 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2880
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2579} 2883 # entering was successful
2884 delete $self->{_link_recursion};
2885 # only activate afterwards, to support waiting in hooks
2886 $self->activate_recursive;
2887 }
2580 2888
2889}
2890
2581=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)]])
2582 2892
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be called at the end of this process. 2897be called at the end of this process.
2588 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
2589=cut 2902=cut
2590 2903
2591our $GOTOGEN; 2904our $GOTOGEN;
2592 2905
2593sub cf::object::player::goto { 2906sub cf::object::player::goto {
2594 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 }
2595 2914
2596 # 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
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2917
2599 $self->enter_link; 2918 $self->enter_link;
2619 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2620 } 2939 }
2621 } 2940 }
2622 2941
2623 my $map = eval { 2942 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2625 2944
2626 if ($map) { 2945 if ($map) {
2627 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2948 } else {
2630 $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);
2631 } 2950 }
2632 2951
2633 $map 2952 $map
2641 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2644 } 2963 }
2645 2964
2646 $done->() if $done; 2965 $done->($self) if $done;
2647 })->prio (1); 2966 })->prio (1);
2648} 2967}
2649 2968
2650=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2651 2970
2671} 2990}
2672 2991
2673sub prepare_random_map { 2992sub prepare_random_map {
2674 my ($exit) = @_; 2993 my ($exit) = @_;
2675 2994
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2995 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2996 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2997 # that depends on the exit object
2681 2998
2682 my $rmp = parse_random_map_params $exit->msg; 2999 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 3001 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 3002 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 3003 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 3004 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 3005 $rmp->{origin_y} = $exit->y;
3006
3007 $exit->map->touch;
2689 } 3008 }
2690 3009
2691 $rmp->{random_seed} ||= $exit->random_seed; 3010 $rmp->{random_seed} ||= $exit->random_seed;
2692 3011
2693 my $data = cf::encode_json $rmp; 3012 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 3013 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 3014 my $meta = "$RANDOMDIR/$md5.meta";
2696 3015
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3016 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 3017 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 3018 undef $fh;
2700 aio_rename "$meta~", $meta; 3019 aio_rename "$meta~", $meta;
2701 3020
3021 my $slaying = "?random/$md5";
3022
3023 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 3024 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 3025 $exit->msg (undef);
3026 }
2704 } 3027 }
2705} 3028}
2706 3029
2707sub cf::object::player::enter_exit { 3030sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 3031 my ($self, $exit) = @_;
2709 3032
2710 return unless $self->type == cf::PLAYER; 3033 return unless $self->type == cf::PLAYER;
2711 3034
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 3035 $self->enter_link;
2724 3036
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 3037 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3038 $Coro::current->{desc} = "enter_exit";
2731 3039
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 3070 $self->goto ($map, $x, $y);
2735 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
2736 1; 3076 1
2737 }) { 3077 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2742 3082
2743 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 3084 $self->leave_link;
2745 } 3085 }
2746 })->prio (1); 3086 })->prio (1);
2747} 3087}
2748 3088
2749=head3 cf::client 3089=head3 cf::client
2750 3090
2751=over 4 3091=over 4
2752 3092
2753=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2754 3094
2755Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2756should not be used under normal circumstances. 3096them as required.
2757 3097
2758=cut 3098=cut
2759 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2760sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2761 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2762 3104
2763 utf8::encode $text; 3105 # try lzf for large packets
2764 $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);
2765} 3116}
2766 3117
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 3119
2769Send 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
2770client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2771the 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
2772the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2773 3124
2774=cut 3125=cut
2775 3126
2776# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2778 "c/identify" => { 3135 "c/identify" => {
2779 id => "infobox", 3136 id => "infobox",
2780 title => "Identify", 3137 title => "Identify",
2781 reply => undef, 3138 reply => undef,
2782 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2784 "c/examine" => { 3141 "c/examine" => {
2785 id => "infobox", 3142 id => "infobox",
2786 title => "Examine", 3143 title => "Examine",
2787 reply => undef, 3144 reply => undef,
2788 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",
2789 }, 3152 },
2790 "c/book" => { 3153 "c/book" => {
2791 id => "infobox", 3154 id => "infobox",
2792 title => "Book", 3155 title => "Book",
2793 reply => undef, 3156 reply => undef,
2809 id => "infobox", 3172 id => "infobox",
2810 title => "Body Parts", 3173 title => "Body Parts",
2811 reply => undef, 3174 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 3213 "c/uptime" => {
2815 id => "infobox", 3214 id => "infobox",
2816 title => "Uptime", 3215 title => "Uptime",
2817 reply => undef, 3216 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3217 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 3220 id => "infobox",
2822 title => "Map Info", 3221 title => "Map Info",
2823 reply => undef, 3222 reply => undef,
2824 tooltip => "Information related to the maps", 3223 tooltip => "Information related to the maps",
2825 }, 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,
2826); 3245);
2827 3246
2828sub cf::client::send_msg { 3247sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3248 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3249
2831 $msg = $self->pl->expand_cfpod ($msg); 3250 $msg = $self->pl->expand_cfpod ($msg)
3251 unless $color & cf::NDI_VERBATIM;
2832 3252
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3253 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3254
2835 # check predefined channels, for the benefit of C 3255 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3256 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3257 $channel = $CHANNEL{$channel};
2838 3258
2839 $self->ext_msg (channel_info => $channel) 3259 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3260 $channel = $channel->{id};
2843 3261
2844 } elsif (ref $channel) { 3262 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3263 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3264 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3265 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3266 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3267 }
2851 3268
2852 $channel = $channel->{id}; 3269 $channel = $channel->{id};
2853 } 3270 }
2854 3271
2855 return unless @extra || length $msg; 3272 return unless @extra || length $msg;
2856 3273
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3274 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3275 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3276 if $color & cf::NDI_DEF;
2861 3277
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3278 my $pkt = "msg "
3279 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3281 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3282
2876 $color &= cf::NDI_COLOR_MASK; 3283 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3284}
2890 3285
2891=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2892 3287
2893Sends an ext event to the client. 3288Sends an ext event to the client.
2895=cut 3290=cut
2896 3291
2897sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2899 3294
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 }
2906}
2907
2908=item $client->ext_reply ($msgid, @msg)
2909
2910Sends an ext reply to the client.
2911
2912=cut
2913
2914sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_;
2916
2917 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 }
2924} 3296}
2925 3297
2926=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2927 3299
2928Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2948 3320
2949 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2950 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2951 3323
2952 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;
2953} 3364}
2954 3365
2955cf::client->attach ( 3366cf::client->attach (
2956 on_connect => sub { 3367 on_connect => sub {
2957 my ($ns) = @_; 3368 my ($ns) = @_;
2983 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
2984 3395
2985 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2986 3397
2987 if (ref $msg) { 3398 if (ref $msg) {
2988 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2989 "ARRAY" eq ref $msg
2990 ? @$msg
2991 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2992 3400
2993 my @reply;
2994
2995 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}) {
2996 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
2997 } 3419 }
2998
2999 $ns->ext_reply ($reply, @reply)
3000 if $reply;
3001
3002 } else { 3420 } else {
3003 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";
3004 } 3422 }
3005 3423
3006 cf::override; 3424 cf::override;
3007 }, 3425 },
3008); 3426);
3028 3446
3029 $coro 3447 $coro
3030} 3448}
3031 3449
3032cf::client->attach ( 3450cf::client->attach (
3033 on_destroy => sub { 3451 on_client_destroy => sub {
3034 my ($ns) = @_; 3452 my ($ns) = @_;
3035 3453
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3455 },
3038); 3456);
3054our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3055 3473
3056$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3057 3475
3058$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3061 sort time 3479 sort time
3062)); 3480));
3063 3481
3064# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3067 3485
3068The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
3069 3487
3070 cf::object 3488 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3490 insert remove name archname title slaying race decrease split
3491 value
3073 3492
3074 cf::object::player 3493 cf::object::player
3075 player 3494 player
3076 3495
3077 cf::player 3496 cf::player
3082 3501
3083=cut 3502=cut
3084 3503
3085for ( 3504for (
3086 ["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
3087 insert remove inv name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3092) { 3511) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3514 for @funs;
3097} 3515}
3098 3516
3113 3531
3114 my $qcode = $code; 3532 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3117 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
3118 local $_; 3539 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3540
3121 my $eval = 3541 my $eval =
3122 "do {\n" 3542 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3545 . $code
3126 . "\n}" 3546 . "\n}"
3127 ; 3547 ;
3128 3548
3549 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 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 }
3132 3558
3133 if ($@) { 3559 if ($@) {
3134 warn "$@"; 3560 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3137 } 3563 }
3138 3564
3139 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3140} 3566}
3141 3567
3155=cut 3581=cut
3156 3582
3157sub register_script_function { 3583sub register_script_function {
3158 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3159 3585
3160 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3162} 3588}
3163 3589
3164=back 3590=back
3165 3591
3166=cut 3592=cut
3167 3593
3168############################################################################# 3594#############################################################################
3169# the server's init and main functions 3595# the server's init and main functions
3170 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
3171sub load_facedata($) { 3674sub load_facedata($) {
3172 my ($path) = @_; 3675 my ($path) = @_;
3173 3676
3174 # HACK to clear player env face cache, we need some signal framework
3175 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = ();
3177
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3678
3180 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3181 3680
3182 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3183 0 < aio_load $path, $facedata
3184 or die "$path: $!";
3185
3186 $facedata = Coro::Storable::thaw $facedata;
3187 3682
3188 $facedata->{version} == 2 3683 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3190 3685
3191 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3192 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3193 type => FT_RSRC, 3688
3194 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
3195 }; 3690
3196 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3197 3694
3198 { 3695 {
3199 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3200 3697
3201 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3701
3204 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3206 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};
3207 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};
3208 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3209 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3210 } 3709 }
3211 3710
3212 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3213 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3214 3713
3217 3716
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3720 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3722 }
3224
3225 cf::cede_to_tick;
3226 } 3723 }
3227 } 3724 }
3228 3725
3229 { 3726 {
3230 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3231 3728
3232 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3233 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3234 cf::cede_to_tick;
3235 } 3731 }
3236 3732
3237 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3238 } 3734 }
3239 3735
3240 { 3736 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3244 3738
3245 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3246 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
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3743
3250 if ($info->{type} & 1) {
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 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;
3265 } else { 3750 } else {
3266 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3267 } 3752 }
3268
3269 cf::cede_to_tick;
3270 } 3753 }
3271 } 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;
3272 3765
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3275 1 3770 1
3276} 3771}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3772
3298register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3300 3775
3301 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3777 $ns->fx_want ($k, $v);
3303 } 3778 }
3304}; 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}
3305 3804
3306sub reload_regions { 3805sub reload_regions {
3307 # 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
3308 # for this (global event?) 3807 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3808 %ext::player_env::MUSIC_FACE_CACHE = ();
3316 if exists $_->{match}; 3815 if exists $_->{match};
3317 } 3816 }
3318} 3817}
3319 3818
3320sub reload_facedata { 3819sub reload_facedata {
3321 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3322 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3323} 3822}
3324 3823
3325sub reload_archetypes { 3824sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references 3827
3329 # this really needs to be done in an extra post-pass 3828 cf::face::set
3330 # (which needs to be synchronous, so solve it differently) 3829 "res/skill_info" => FT_RSRC,
3331 load_resource_file "$DATADIR/archetypes" 3830 JSON::XS->new->utf8->canonical->encode (
3332 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;
3333} 3853}
3334 3854
3335sub reload_treasures { 3855sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3338} 3858}
3339 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
3340sub reload_resources { 3880sub reload_resources {
3341 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3342 3882
3883 reload_materials;
3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3887 reload_archetypes;
3343 reload_regions; 3888 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3889 reload_treasures;
3348 3890
3349 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3892}
3355 3893
3356sub reload_config { 3894sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3358 or return;
3359 3896
3360 local $/; 3897 my $config = load_file "$CONFDIR/config";
3361 *CFG = YAML::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3362 3900
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3902
3365 $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};
3366 $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};
3367 3905
3368 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3372 }; 3910 };
3373 warn $@ if $@; 3911 warn $@ if $@;
3374 } 3912 }
3375} 3913}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3380 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#
3381 (async { 3956 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3384 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3385 }; 3960 };
3386 3961
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3393 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;
3394} 4005}
3395 4006
3396############################################################################# 4007#############################################################################
3397# initialisation and cleanup 4008# initialisation and cleanup
3398 4009
3399# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3400BEGIN { 4011BEGIN {
3401 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3405 }; 4016 };
3406 } 4017 }
3407} 4018}
3408 4019
3409sub write_runtime { 4020sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 4021 my $t0 = AE::time;
3411 4022
3412 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3414 4025
3415 IO::AIO::aio_utime $runtime, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 4027
3417 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3418 4029
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 4031 or return;
3421 4032
3422 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 4045 aio_utime $fh, undef, undef;
3435 4046
3436 close $fh 4047 close $fh
3437 or return; 4048 or return;
3438 4049
3439 aio_rename "$runtime~", $runtime 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 4051 and return;
3441 4052
3442 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 4054
3444 1 4055 1
3445} 4056}
3446 4057
3447our $uuid_lock; 4058our $uuid_lock;
3456 my $uuid = "$LOCALDIR/uuid"; 4067 my $uuid = "$LOCALDIR/uuid";
3457 4068
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 4069 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 4070 or return;
3460 4071
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 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;
3462 $uuid_skip = 0; 4080 $uuid_skip = 0;
3463 4081
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 4082 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 4083 and return;
3466 4084
3472 or return; 4090 or return;
3473 4091
3474 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3475 and return; 4093 and return;
3476 4094
3477 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3478 4096
3479 1 4097 1
3480 4098
3481} 4099}
3482 4100
3488} 4106}
3489 4107
3490sub emergency_save() { 4108sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3492 4110
3493 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;
3494 4117
3495 cf::sync_job { 4118 cf::sync_job {
4119 cf::write_runtime_sync; # external watchdog should not bark
4120
3496 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 4127 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 4129 $pl->save;
3505 } 4130 }
3506 warn "end emergency player save\n"; 4131 info "emergency_perl_save: end player save\n";
3507 4132
3508 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";
3509 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 4138 $map->valid or next;
3512 $map->save; 4139 $map->save;
3513 } 4140 }
3514 warn "end emergency map save\n"; 4141 info "emergency_perl_save: end map save\n";
3515 4142
3516 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";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3519 4148
3520 warn "begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 4150 write_uuid_sync 1;
3522 warn "end write uuid\n"; 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
3523 }; 4171 };
3524 4172
3525 warn "leave emergency perl save\n"; 4173 info "emergency_perl_save: leave\n";
3526} 4174}
3527 4175
3528sub post_cleanup { 4176sub post_cleanup {
3529 my ($make_core) = @_; 4177 my ($make_core) = @_;
3530 4178
4179 IO::AIO::flush;
4180
3531 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3532 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 }
3533} 4211}
3534 4212
3535sub do_reload_perl() { 4213sub do_reload_perl() {
3536 # can/must only be called in main 4214 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3538 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3539 return; 4217 return;
3540 } 4218 }
3541 4219
3542 warn "reloading..."; 4220 return if $RELOAD++;
3543 4221
3544 warn "entering sync_job"; 4222 my $t1 = AE::time;
3545 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
3546 cf::sync_job { 4230 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark
3548 cf::emergency_save; 4231 #cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark
3550 4232
3551 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV;
3553
3554 # if anything goes wrong in here, we should simply crash as we already saved
3555
3556 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs;
3562 warn "iterate...";
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = (); 4235 %EXT_CORO = ();
3570 4236
3571 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3572 %COMMAND = (); 4238 %COMMAND = ();
3573 4239
3574 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3575 %EXTCMD = (); 4241 %EXTCMD = ();
3576 %EXTICMD = (); 4242 %EXTICMD = ();
3577 4243
3578 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3579 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3581 4247
3582 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3583 eval { 4249 eval {
3584 $cb->($pkg); 4250 $cb->($pkg);
3585 1 4251 1
3586 } 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;
3587 } 4257 }
3588 4258
3589 warn "... nuking $pkg";
3590 Symbol::delete_package $pkg;
3591 }
3592
3593 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3594 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 4262
3597 warn "... unloading $k"; 4263 trace "... unloading $k";
3598 delete $INC{$k}; 4264 delete $INC{$k};
3599 4265
3600 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3602 4268
3603 if (my $cb = $k->can ("unload_module")) { 4269 if (my $cb = $k->can ("unload_module")) {
3604 $cb->(); 4270 $cb->();
4271 }
4272
4273 clear_package $k;
3605 } 4274 }
3606 4275
3607 Symbol::delete_package $k;
3608 }
3609
3610 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 4277 clear_package "safe::$_"
3612 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);
3613 4279
3614 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 4283
3618 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3619 # and global variables created in xs 4285 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3621 4287
3622 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3623 4289
3624 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3625 require cf; 4291 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3627 4293
3628 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3629 cf::reload_config; 4295 cf::reload_config;
3630 4296
3631 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3632 cf::load_extensions; 4298 cf::load_extensions;
3633 4299
4300 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3637 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
4307 }
3640 4308
3641 warn "leaving sync_job"; 4309 cf::_post_init 1;
3642 4310
4311 trace "perl_reload: leaving sync_job";
4312
3643 1 4313 1
3644 } or do { 4314 } or do {
3645 warn $@; 4315 error $@;
3646 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
4317 };
4318
4319 --$RELOAD;
3647 }; 4320 }
3648 4321
3649 warn "reloaded"; 4322 $t1 = AE::time - $t1;
4323 info "perl_reload: completed in ${t1}s\n";
3650}; 4324};
3651 4325
3652our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3653 4327
3654sub reload_perl() { 4328sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 4329 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3657 4331
4332 $RELOAD_WATCHER ||= cf::async {
4333 Coro::AIO::aio_wait cache_extensions;
4334
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 4336 do_reload_perl;
3660 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
4338 };
3661 }; 4339 };
3662} 4340}
3663 4341
3664register_command "reload" => sub { 4342register_command "reload" => sub {
3665 my ($who, $arg) = @_; 4343 my ($who, $arg) = @_;
3671 reload_perl; 4349 reload_perl;
3672 }; 4350 };
3673 } 4351 }
3674}; 4352};
3675 4353
3676unshift @INC, $LIBDIR; 4354#############################################################################
3677 4355
3678my $bug_warning = 0; 4356my $bug_warning = 0;
3679 4357
3680our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN;
3682
3683sub wait_for_tick { 4358sub wait_for_tick() {
3684 return if tick_inhibit; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3685 return if $Coro::current == $Coro::main;
3686 4360
3687 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3688 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait;
3690} 4362}
3691 4363
3692sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3693 return if tick_inhibit; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3694 return if $Coro::current == $Coro::main;
3695 4366
3696 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 4369 $signal->wait;
3699} 4370}
3703 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"
3704 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3705 return; 4376 return;
3706 } 4377 }
3707 4378
3708 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#
3709 4382
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $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.;
3712 Coro::async_pool { 4385 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 4387 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3716 }; 4389 };
3717 } 4390 }
3718 4391
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3720 $sig->send; 4393 $sig->send;
3721 } 4394 }
3722 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3723 $sig->send;
3724 }
3725 4396
3726 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3727 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3728 4399
3729 if (0) { 4400 if (0) {
3730 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3731 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3734 } 4405 }
3735 } 4406 }
3736} 4407}
3737 4408
3738{ 4409{
3739 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3740 4412
3741 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3744 4416
3745 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | 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;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4422 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4423 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4424
3752 cf::sync_job { 4425 cf::sync_job {
3753 eval { 4426 eval {
3772 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3773 }; 4446 };
3774 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3775 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3776 }; 4449 };
4450
4451 info "database initialised";
3777} 4452}
3778 4453
3779{ 4454{
3780 # configure IO::AIO 4455 # configure IO::AIO
3781 4456
4457 info "initialising aio";
3782 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3785} 4462}
3786 4463
3787my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3788 4466
3789sub _log_backtrace { 4467sub _log_backtrace {
3790 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3791 4469
3792 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3793 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3794 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3796 ++$_log_backtrace; 4478 ++$_log_backtrace;
4479 my $perl_bt = Carp::longmess $msg;
3797 async { 4480 async {
3798 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3799 4482
3800 my @bt = fork_call { 4483 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4484 @addr = map { sprintf "%x", $_ } @addr;
3812 } 4495 }
3813 4496
3814 @funcs 4497 @funcs
3815 }; 4498 };
3816 4499
3817 LOG llevInfo, "[ABT] $msg\n"; 4500 LOG llevInfo, "[ABT] $perl_bt\n";
4501 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4503 --$_log_backtrace;
3820 }; 4504 };
3821 } else { 4505 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3824 } 4508 }
3825} 4509}
3826 4510
3827# load additional modules 4511# load additional modules
3828use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3829 4514
3830END { cf::emergency_save } 4515END { cf::emergency_save }
3831 4516
38321 45171
3833 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines