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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
15use Coro 4.32 (); 41use Coro ();
16use Coro::State; 42use Coro::State;
17use Coro::Handle; 43use Coro::Handle;
18use Coro::EV; 44use Coro::EV;
45use Coro::AnyEvent;
19use Coro::Timer; 46use Coro::Timer;
20use Coro::Signal; 47use Coro::Signal;
21use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
50use Coro::AnyEvent;
22use Coro::AIO; 51use Coro::AIO;
23use Coro::BDB; 52use Coro::BDB 1.6;
24use Coro::Storable; 53use Coro::Storable;
25use Coro::Util (); 54use Coro::Util ();
26 55
56use Guard ();
27use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
28use BDB (); 58use BDB ();
29use Data::Dumper; 59use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 60use Fcntl;
32use YAML::Syck (); 61use YAML::XS ();
62use CBOR::XS ();
33use IO::AIO 2.51 (); 63use IO::AIO ();
34use Time::HiRes;
35use Compress::LZF; 64use Compress::LZF;
36use Digest::MD5 (); 65use Digest::MD5 ();
66
67AnyEvent::detect;
37 68
38# configure various modules to our taste 69# configure various modules to our taste
39# 70#
40$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 79
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 80# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 82
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
50 86
51our %COMMAND = (); 87our %COMMAND = ();
52our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
53 89
54our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
56our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
59 97
60our $RELOAD; # number of reloads so far 98our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
62 102
63our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
64our $DATADIR = datadir; 105our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
68our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
74our %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;
75 126
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 129our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
82 131
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 135our $DB_ENV;
88 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
89our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
90 141
91our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
93our $NOW; 145our $NOW;
94 146
95our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
99# used to convert map paths into valid unix filenames by replacing / by ∕ 151# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 152our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 153
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 155our $LOADAVG; # same thing, but with alpha-smoothing
156our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 157our $TICK_START; # for load detecting purposes
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;
105 166
106binmode STDOUT; 167binmode STDOUT;
107binmode STDERR; 168binmode STDERR;
108 169
109# read virtual server time, if available 170# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 171unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 172 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
114} 175}
176
177eval "sub TICK() { $TICK } 1" or die;
115 178
116mkdir $_ 179mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 181
119our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
120 183
121sub cf::map::normalise; 184sub cf::map::normalise;
122 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
123############################################################################# 190#############################################################################
124 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
125=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
126 204
127=over 4 205=over 4
128 206
129=item $cf::UPTIME 207=item $cf::UPTIME
130 208
131The 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.
132 225
133=item $cf::RUNTIME 226=item $cf::RUNTIME
134 227
135The 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
136every server tick. 229every server tick.
137 230
138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
141 234
142Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
143directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
145database environment. 238database environment.
146 239
147=item $cf::NOW
148
149The time of the last (current) server tick.
150
151=item $cf::TICK
152
153The interval between server ticks, in seconds.
154
155=item $cf::LOADAVG 240=item $cf::LOADAVG
156 241
157The 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
158(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
159objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
167Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 253from wherever your confdir points to.
169 254
170=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
171 256
172These 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.
173returns 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
174per 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();
175 278
176=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
177 280
178This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
179C<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
180that call. 283that call.
181 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
182=back 291=back
183 292
184=cut 293=cut
185 294
186BEGIN { 295sub error(@) { LOG llevError, join "", @_ }
187 *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 {
188 my $msg = join "", @_; 302 my $msg = join "", @_;
189 303
190 $msg .= "\n" 304 $msg .= "\n"
191 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
192 306
193 $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;
194 308
195 LOG llevError, $msg; 309 LOG llevWarn, $msg;
196 }; 310};
197}
198 311
199$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
313 return unless $^S eq 0; # "eq", not "=="
314
200 warn Carp::longmess $_[0]; 315 error Carp::longmess $_[0];
316
317 if (in_main) {#d#
318 error "DIEHOOK called in main context, Coro bug?\n";#d#
319 return;#d#
320 }#d#
321
322 # kill coroutine otherwise
201 Coro::terminate; 323 Coro::terminate
202}; 324};
203 325
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 326@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 327@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 328@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214for my $pkg (qw( 336for my $pkg (qw(
215 cf::global cf::attachable 337 cf::global cf::attachable
216 cf::object cf::object::player 338 cf::object cf::object::player
217 cf::client cf::player 339 cf::client cf::player
218 cf::arch cf::living 340 cf::arch cf::living
341 cf::map cf::mapspace
219 cf::map cf::party cf::region 342 cf::party cf::region
220)) { 343)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 345}
224 346
225$EV::DIED = sub { 347$EV::DIED = sub {
226 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
227}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
228 355
229############################################################################# 356#############################################################################
230 357
231=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
232 359
253 $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;
254 $d 381 $d
255 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
256} 383}
257 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
258=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
259 438
260Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
261 440
262=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
268our $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
269 448
270sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
272 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
273=item cf::lock_wait $string 528=item cf::lock_wait $string
274 529
275Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
276 531
277=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
278 533
279Wait 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
280a 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,
281for example when the coroutine gets canceled), the lock is automatically 536for example when the coroutine gets canceled), the lock is automatically
282returned. 537returned.
283 538
284Locks 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
285deadlocked coro. 540deadlocked coro.
291 546
292Return 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.
293 548
294=cut 549=cut
295 550
296our %LOCK; 551our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 552
299sub lock_wait($) { 553sub lock_wait($) {
300 my ($key) = @_; 554 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 555}
313 556
314sub lock_acquire($) { 557sub lock_acquire($) {
315 my ($key) = @_; 558 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 559}
329 560
330sub lock_active($) { 561sub lock_active($) {
331 my ($key) = @_; 562 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 563}
335 564
336sub freeze_mainloop { 565sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 566 tick_inhibit_inc;
338 567
339 my $guard = Coro::guard { 568 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 569}
345 570
346=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
347 572
348Like 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
349get spread over timer. 574get spread over time.
350 575
351=cut 576=cut
352 577
353sub periodic($$) { 578sub periodic($$) {
354 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
358 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
359} 584}
360 585
361=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
362 587
363Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
364This 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
365of 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.
366 595
367The 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
368used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
369 598
370Useful for short background jobs. 599Useful for short background jobs.
371 600
372=cut 601=cut
373 602
374our @SLOT_QUEUE; 603our @SLOT_QUEUE;
375our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
376 606
377$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
380 610
381 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
382 613
383 while () { 614 while () {
384 next_job: 615 next_job:
616
617 Coro::cede;
618
385 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
386 if ($avail > 0.01) { 620
387 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
389 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send; 625 $job->[2]->send;
391 Coro::cede;
392 goto next_job; 626 goto next_job;
393 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
394 } 629 }
395 } 630 }
396 631
397 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
398 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
399 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait;
401 } else { 634 } else {
635 $busy = 0;
402 Coro::schedule; 636 Coro::schedule;
403 } 637 }
404 } 638 }
405}; 639};
406 640
407sub get_slot($;$$) { 641sub get_slot($;$$) {
642 return if tick_inhibit || $Coro::current == $Coro::main;
643
408 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
409 645
410 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
411 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
412 649
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
427BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
428 665
429=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
430 667
431The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
432is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
433partly 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
434acceptable. 671acceptable.
435 672
436If 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
437the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
441=cut 678=cut
442 679
443sub sync_job(&) { 680sub sync_job(&) {
444 my ($job) = @_; 681 my ($job) = @_;
445 682
446 if ($Coro::current == $Coro::main) { 683 if (in_main) {
447 my $time = EV::time; 684 my $time = AE::time;
448 685
449 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
451 688
452 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
453 690
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
457 692
458 my $busy = 1; 693 my $busy = 1;
459 my @res; 694 my @res;
460 695
461 (async { 696 (async {
462 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
463 @res = eval { $job->() }; 698 @res = eval { $job->() };
464 warn $@ if $@; 699 error $@ if $@;
465 undef $busy; 700 undef $busy;
466 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
467 702
468 while ($busy) { 703 while ($busy) {
469 if (Coro::nready) { 704 if (Coro::nready) {
470 Coro::cede_notself; 705 Coro::cede_notself;
471 } else { 706 } else {
472 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
473 } 708 }
474 } 709 }
475 710
476 $time = EV::time - $time; 711 my $time = AE::time - $time;
477 712
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
482 714
483 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
484 } else { 716 } else {
485 # we are in another coroutine, how wonderful, everything just works 717 # we are in another coroutine, how wonderful, everything just works
486 718
506 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
507 739
508 $coro 740 $coro
509} 741}
510 742
511=item fork_call { }, $args 743=item fork_call { }, @args
512 744
513Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
514process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
515Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
516never block itself or use any form of event handling. 748never block itself or use any form of event handling.
517 749
518=cut 750=cut
519 751
752sub post_fork {
753 reset_signals;
754}
755
520sub fork_call(&@) { 756sub fork_call(&@) {
521 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
522 758
523 # we seemingly have to make a local copy of the whole thing,
524 # otherwise perl prematurely frees the stuff :/
525 # TODO: investigate and fix (likely this will be rather laborious)
526
527 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
528 reset_signals; 760 cf::post_fork;
529 &$cb 761 &$cb
530 }, @args; 762 } @args;
531 763
532 wantarray ? @res : $res[-1] 764 wantarray ? @res : $res[-1]
765}
766
767sub objinfo {
768 (
769 "counter value" => cf::object::object_count,
770 "objects created" => cf::object::create_count,
771 "objects destroyed" => cf::object::destroy_count,
772 "freelist size" => cf::object::free_count,
773 "allocated objects" => cf::object::objects_size,
774 "active objects" => cf::object::actives_size,
775 )
776}
777
778=item $coin = coin_from_name $name
779
780=cut
781
782our %coin_alias = (
783 "silver" => "silvercoin",
784 "silvercoin" => "silvercoin",
785 "silvercoins" => "silvercoin",
786 "gold" => "goldcoin",
787 "goldcoin" => "goldcoin",
788 "goldcoins" => "goldcoin",
789 "platinum" => "platinacoin",
790 "platinumcoin" => "platinacoin",
791 "platinumcoins" => "platinacoin",
792 "platina" => "platinacoin",
793 "platinacoin" => "platinacoin",
794 "platinacoins" => "platinacoin",
795 "royalty" => "royalty",
796 "royalties" => "royalty",
797);
798
799sub coin_from_name($) {
800 $coin_alias{$_[0]}
801 ? cf::arch::find $coin_alias{$_[0]}
802 : undef
533} 803}
534 804
535=item $value = cf::db_get $family => $key 805=item $value = cf::db_get $family => $key
536 806
537Returns a single value from the environment database. 807Returns a single value from the environment database.
547within each server. 817within each server.
548 818
549=cut 819=cut
550 820
551sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
552 my ($name) = @_; 825 my ($name) = @_;
553 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
554 827
555 eval { 828 eval {
556 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
566} 839}
567 840
568our $DB; 841our $DB;
569 842
570sub db_init { 843sub db_init {
571 cf::sync_job {
572 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
573 };
574} 845}
575 846
576sub db_get($$) { 847sub db_get($$) {
577 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
578 849
579 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
580 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
581 854
582 $! ? () 855 $! ? ()
583 : $data 856 : $data
584 }
585} 857}
586 858
587sub db_put($$$) { 859sub db_put($$$) {
588 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
589 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
617 889
618 my @data; 890 my @data;
619 my $md5; 891 my $md5;
620 892
621 for (0 .. $#$src) { 893 for (0 .. $#$src) {
622 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
623 or Carp::croak "$src->[$_]: $!";
624 } 895 }
625 896
626 # if processing is expensive, check 897 # if processing is expensive, check
627 # checksum first 898 # checksum first
628 if (1) { 899 if (1) {
641 912
642 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
643 } 914 }
644 } 915 }
645 916
646 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
647 my $data = $process->(\@data); 918 my $data = $process->(\@data);
648 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
649 920
650 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
651 922
652 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
653 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
654 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
655 926
665 936
666=cut 937=cut
667 938
668sub datalog($@) { 939sub datalog($@) {
669 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
670 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
671} 942}
672 943
673=back 944=back
674 945
675=cut 946=cut
676 947
677############################################################################# 948#############################################################################
678 949
679=head2 ATTACHABLE OBJECTS 950=head2 ATTACHABLE OBJECTS
680 951
681Many 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
682attach callbacks/event handlers (a collection of which is called an "attachment") 953attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 954to it. All such attachable objects support the following methods.
684 955
685In 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>
686C<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
736=item cf::CLASS::attachment $name, ... 1007=item cf::CLASS::attachment $name, ...
737 1008
738Register an attachment by C<$name> through which attachable objects of the 1009Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 1010given CLASS can refer to this attachment.
740 1011
741Some classes such as crossfire maps and objects can specify attachments 1012Some classes such as deliantra maps and objects can specify attachments
742that 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.
743 1014
744These calls expect any number of the following handler/hook descriptions: 1015These calls expect any number of the following handler/hook descriptions:
745 1016
746=over 4 1017=over 4
870 1141
871 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
872 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
873 1144
874 } elsif (ref $type) { 1145 } elsif (ref $type) {
875 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
876 1147
877 } else { 1148 } else {
878 shift @arg; 1149 shift @arg;
879 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
880 } 1151 }
881 } 1152 }
882} 1153}
883 1154
884sub _object_attach { 1155sub _object_attach {
894 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
895 } 1166 }
896 1167
897 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
898 } else { 1169 } else {
899 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
900 } 1171 }
901 1172
902 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
903} 1174}
904 1175
963 1234
964 for (@$callbacks) { 1235 for (@$callbacks) {
965 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
966 1237
967 if ($@) { 1238 if ($@) {
968 warn "$@";
969 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
970 override; 1240 override;
971 } 1241 }
972 1242
973 return 1 if $override; 1243 return 1 if $override;
974 } 1244 }
1037 1307
1038sub reattach { 1308sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1309 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1310 my ($obj) = @_;
1041 1311
1312 # no longer needed after getting rid of delete_package?
1042 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
1043 1314
1044 my $registry = $obj->registry; 1315 my $registry = $obj->registry;
1045 1316
1046 @$registry = (); 1317 @$registry = ();
1047 1318
1052 for (@$attach) { 1323 for (@$attach) {
1053 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1054 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1055 } 1326 }
1056 } else { 1327 } else {
1057 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1058 } 1329 }
1059 } 1330 }
1060} 1331}
1061 1332
1062cf::attachable->attach ( 1333cf::attachable->attach (
1089 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1090 1361
1091 sync_job { 1362 sync_job {
1092 if (length $$rdata) { 1363 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1096 1368
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1370 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 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 }
1101 close $fh; 1376 aio_close $fh;
1102 1377
1103 if (@$objs) { 1378 if (@$objs) {
1104 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) {
1105 chmod SAVE_MODE, $fh; 1380 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1108 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 }
1109 close $fh; 1387 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1389 }
1112 } else { 1390 } else {
1113 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1114 } 1392 }
1115 1393
1116 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1395
1396 $filename =~ s%/[^/]+$%%;
1397 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1398 } else {
1118 warn "FATAL: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1119 } 1400 }
1120 } else { 1401 } else {
1121 aio_unlink $filename; 1402 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1123 } 1404 }
1147 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs}; 1429 $av = $st->{objs};
1149 } 1430 }
1150 1431
1151 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1152 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1153 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1154 1436
1155 ($data, $av) 1437 ($data, $av)
1156} 1438}
1157 1439
1158=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1162=cut 1444=cut
1163 1445
1164############################################################################# 1446#############################################################################
1165# command handling &c 1447# command handling &c
1166 1448
1167=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1168 1450
1169Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1170$name. 1452$name.
1171 1453
1172=cut 1454=cut
1178 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1179 1461
1180 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1181} 1463}
1182 1464
1183=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1184 1466
1185Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1186extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1187received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1188the 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
1189has logged in successfully. 1471has logged in successfully.
1190 1472
1191If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1192called.
1193 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
1194=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1195 1481
1196Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1197exticmd 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
1198are 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
1199is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1200log-in. 1486log-in.
1201 1487
1202If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1203called.
1204 1489
1205=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1206 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
1207sub register_extcmd { 1497sub register_extcmd($$) {
1208 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1209 1499
1210 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1211} 1501}
1212 1502
1213sub register_exticmd { 1503sub register_async_extcmd($$) {
1214 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1215 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1216 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1217} 1513}
1218 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1521use File::Glob ();
1522
1219cf::player->attach ( 1523cf::player->attach (
1220 on_command => sub { 1524 on_unknown_command => sub {
1221 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1222 1526
1223 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1224 or return; 1528 or return;
1225 1529
1233 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1234 1538
1235 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1236 1540
1237 if (ref $msg) { 1541 if (ref $msg) {
1238 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1239 "ARRAY" eq ref $msg
1240 ? @$msg
1241 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1242 1543
1243 my @reply;
1244
1245 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}) {
1246 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1247 } 1562 }
1248 1563
1249 $pl->ext_reply ($reply, @reply)
1250 if $reply;
1251
1252 } else { 1564 } else {
1253 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1254 } 1566 }
1255 1567
1256 cf::override; 1568 cf::override;
1257 }, 1569 },
1258); 1570);
1259 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
1260sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1261 cf::sync_job { 1601 cf::sync_job {
1262 my %todo; 1602 my %todo;
1263 1603
1264 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1265 next unless -r $path; 1605 next unless -r $path;
1283 1623
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1626
1287 $ext{source} = 1627 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1289 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1290 . $source 1630 . $source
1291 . "\n};\n1"; 1631 . "\n};\n1";
1292 1632
1293 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1294 } 1634 }
1295 1635
1636 my $pass = 0;
1296 my %done; 1637 my %done;
1297 while (%todo) { 1638 while (%todo) {
1298 my $progress; 1639 my $progress;
1299 1640
1641 ++$pass;
1642
1643 ext:
1300 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1301 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1302 goto skip 1646 next ext
1303 unless exists $done{$_}; 1647 unless exists $done{$_};
1304 } 1648 }
1305 1649
1306 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1307 1651
1308 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 $@) {
1309 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1310 : "$v->{base}: extension inactive.\n";
1311 1665
1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1312 if (exists $v->{meta}{mandatory}) { 1667 if exists $v->{meta}{mandatory};
1313 warn $msg; 1668
1314 warn "mandatory extension failed to load, exiting.\n"; 1669 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1315 exit 1; 1670 delete $todo{$k};
1316 } 1671 } else {
1317 1672 $done{$k} = delete $todo{$k};
1318 warn $msg; 1673 push @EXTS, $v->{pkg};
1674 $progress = 1;
1675
1676 info "$v->{base}: extension inactive.\n"
1677 unless $active;
1319 } 1678 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
1324 } 1679 }
1325 1680
1326 skip: 1681 unless ($progress) {
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1328 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 }
1329 } 1691 }
1330 }; 1692 };
1331} 1693}
1332 1694
1333############################################################################# 1695#############################################################################
1334 1696
1335=back 1697=back
1336 1698
1337=head2 CORE EXTENSIONS 1699=head2 CORE EXTENSIONS
1338 1700
1339Functions and methods that extend core crossfire objects. 1701Functions and methods that extend core deliantra objects.
1340 1702
1341=cut 1703=cut
1342 1704
1343package cf::player; 1705package cf::player;
1344 1706
1387 1749
1388sub exists($) { 1750sub exists($) {
1389 my ($login) = @_; 1751 my ($login) = @_;
1390 1752
1391 $cf::PLAYER{$login} 1753 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1754 or !aio_stat path $login
1393} 1755}
1394 1756
1395sub find($) { 1757sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1758 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1759 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1771 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1772 or return;
1411 1773
1412 my $pl = cf::player::load_pl $f 1774 my $pl = cf::player::load_pl $f
1413 or return; 1775 or return;
1776
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1777 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1778 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1417 } 1780 }
1418 } 1781 }
1419} 1782}
1420 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
1421sub save($) { 1797sub save($) {
1422 my ($pl) = @_; 1798 my ($pl) = @_;
1423 1799
1424 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1425 1801
1428 1804
1429 return if $pl->{deny_save}; 1805 return if $pl->{deny_save};
1430 1806
1431 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1432 $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];
1433 1814
1434 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1816 cf::cede_to_tick;
1436} 1817}
1437 1818
1469 my ($pl) = @_; 1850 my ($pl) = @_;
1470 1851
1471 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1472 1853
1473 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1474 $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
1475 1856
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1477 $pl->deactivate; 1858 $pl->deactivate;
1859
1860 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1479 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1480 1865
1481 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1483 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1521 1906
1522 for my $login (@$dirs) { 1907 for my $login (@$dirs) {
1523 my $path = path $login; 1908 my $path = path $login;
1524 1909
1525 # a .pst is a dead give-away for a valid player 1910 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1911 # if no pst file found, open and chekc for blocked users
1912 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1913 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1914 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1915 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1916 }
1531 1917
1535 1921
1536 \@logins 1922 \@logins
1537} 1923}
1538 1924
1539=item $player->maps 1925=item $player->maps
1926
1927=item cf::player::maps $login
1540 1928
1541Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1542player. May block. 1930player. May block.
1543 1931
1544=cut 1932=cut
1562 } 1950 }
1563 1951
1564 \@paths 1952 \@paths
1565} 1953}
1566 1954
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1956
1569Expand crossfire pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659
1660=item $player->ext_reply ($msgid, @msg)
1661
1662Sends an ext reply to the player.
1663
1664=cut
1665
1666sub ext_reply($$@) {
1667 my ($self, $id, @msg) = @_;
1668
1669 $self->ns->ext_reply ($id, @msg)
1670}
1671 1958
1672=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1673 1960
1674Sends an ext event to the client. 1961Sends an ext event to the client.
1675 1962
1695 1982
1696=cut 1983=cut
1697 1984
1698sub find_by_path($) { 1985sub find_by_path($) {
1699 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1700 1989
1701 my ($match, $specificity); 1990 my ($match, $specificity);
1702 1991
1703 for my $region (list) { 1992 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1730our $MAX_RESET = 3600; 2019our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 2020our $DEFAULT_RESET = 3000;
1732 2021
1733sub generate_random_map { 2022sub generate_random_map {
1734 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1735 # mit "rum" bekleckern, nicht 2024
2025 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2026
1736 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1744 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1745 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1746 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1747 (cf::region::find $rmp->{region}), $rmp->{custom}
1748 )
1749} 2028}
1750 2029
1751=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1752 2031
1753Register 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
1758 2037
1759sub register { 2038sub register {
1760 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 2040 my $pkg = caller;
1762 2041
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 2043
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 2045}
1768 2046
1769# also paths starting with '/' 2047# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 2049
1772sub thawer_merge { 2050sub thawer_merge {
1773 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1774 2052
1775 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1780} 2058}
1781 2059
1782sub normalise { 2060sub normalise {
1783 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1784 2062
1785 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1786 2064
1787 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1788 2066
1789 # map plan: 2067 # map plan:
1790 # 2068 #
1805 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1806 $path = "$base/$path"; 2084 $path = "$base/$path";
1807 } 2085 }
1808 2086
1809 for ($path) { 2087 for ($path) {
1810 redo if s{//}{/};
1811 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1812 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1813 } 2090 }
1814 2091
1815 $path 2092 $path
1829 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1830 return $self; 2107 return $self;
1831 } 2108 }
1832 } 2109 }
1833 2110
1834 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1835 () 2112 ()
1836} 2113}
1837 2114
2115# may re-bless or do other evil things
1838sub init { 2116sub init {
1839 my ($self) = @_; 2117 my ($self) = @_;
1840 2118
1841 $self 2119 $self
1842} 2120}
1861 2139
1862# the temporary/swap location 2140# the temporary/swap location
1863sub save_path { 2141sub save_path {
1864 my ($self) = @_; 2142 my ($self) = @_;
1865 2143
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2144 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 2145 "$TMPDIR/$path.map"
1868} 2146}
1869 2147
1870# the unique path, undef == no special unique path 2148# the unique path, undef == no special unique path
1871sub uniq_path { 2149sub uniq_path {
1872 my ($self) = @_; 2150 my ($self) = @_;
1873 2151
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2152 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 2153 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 2154}
1886 2155
1887sub decay_objects { 2156sub decay_objects {
1888 my ($self) = @_; 2157 my ($self) = @_;
1889 2158
1916 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1917 2186
1918 1 2187 1
1919} 2188}
1920 2189
2190# used to laod the header of an original map
1921sub load_header_orig { 2191sub load_header_orig {
1922 my ($self) = @_; 2192 my ($self) = @_;
1923 2193
1924 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1925} 2195}
1926 2196
2197# used to laod the header of an instantiated map
1927sub load_header_temp { 2198sub load_header_temp {
1928 my ($self) = @_; 2199 my ($self) = @_;
1929 2200
1930 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1931} 2202}
1932 2203
2204# called after loading the header from an instantiated map
1933sub prepare_temp { 2205sub prepare_temp {
1934 my ($self) = @_; 2206 my ($self) = @_;
1935 2207
1936 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1937 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1938 # safety 2210 # safety
1939 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1940 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1941} 2213}
1942 2214
2215# called after loading the header from an original map
1943sub prepare_orig { 2216sub prepare_orig {
1944 my ($self) = @_; 2217 my ($self) = @_;
1945 2218
1946 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1947 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
1971 2244
1972sub find; 2245sub find;
1973sub find { 2246sub find {
1974 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
1975 2248
2249 cf::cede_to_tick;
2250
1976 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
1977 2252
1978 cf::lock_wait "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2255
1981 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 2257 my $map = new_from_path cf::map $path
1986 or return; 2258 or return;
1987 2259
1988 $map->{last_save} = $cf::RUNTIME; 2260 $map->{last_save} = $cf::RUNTIME;
1989 2261
1991 or return; 2263 or return;
1992 2264
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2265 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2266 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2267 #$cf::WAIT_FOR_TICK->wait;
2268 undef $guard2;
1996 undef $guard1; 2269 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2270 $map->reset;
1999 return find $path; 2271 return find $path;
2000 } 2272 }
2001 2273
2002 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
2003 } 2275 }
2004} 2276}
2005 2277
2006sub pre_load { } 2278sub pre_load { }
2007sub post_load { } 2279#sub post_load { } # XS
2008 2280
2009sub load { 2281sub load {
2010 my ($self) = @_; 2282 my ($self) = @_;
2011 2283
2012 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
2015 2287
2016 { 2288 {
2017 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2018 2290
2019 return unless $self->valid; 2291 return unless $self->valid;
2020 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2021
2022 $self->in_memory (cf::MAP_LOADING);
2023 2293
2024 $self->alloc; 2294 $self->alloc;
2025 2295
2026 $self->pre_load; 2296 $self->pre_load;
2027 cf::cede_to_tick; 2297 cf::cede_to_tick;
2028 2298
2299 if (exists $self->{load_path}) {
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2301 $f->skip_block;
2031 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2032 or return; 2303 or return;
2033 2304
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2305 $self->post_load_original
2035 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2036 2307
2037 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2309 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2040 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2041 $self->clear_unique_items; 2312 $self->clear_unique_items;
2042 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2043 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2044 } 2316 }
2045 } 2317 }
2046 }
2047 2318
2048 $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);
2049 2326
2050 cf::cede_to_tick; 2327 cf::cede_to_tick;
2051 # now do the right thing for maps 2328 # now do the right thing for maps
2052 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2053 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2057 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2335 $self->decay_objects;
2059 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2060 $self->update_buttons; 2337 $self->update_buttons;
2061 cf::cede_to_tick; 2338 cf::cede_to_tick;
2062 $self->set_darkness_map; 2339 #$self->activate; # no longer activate maps automatically
2063 cf::cede_to_tick;
2064 $self->activate;
2065 } 2340 }
2066 2341
2067 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2069
2070 $self->in_memory (cf::MAP_IN_MEMORY);
2071 } 2344 }
2072 2345
2073 $self->post_load; 2346 $self->post_load;
2074}
2075 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
2076sub customise_for { 2354sub customise_for {
2077 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2078 2356
2079 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2358 if $self->per_player;
2083# if $self->per_party; 2361# if $self->per_party;
2084 2362
2085 $self 2363 $self
2086} 2364}
2087 2365
2088# find and load all maps in the 3x3 area around a map
2089sub load_neighbours {
2090 my ($map) = @_;
2091
2092 my @neigh; # diagonal neighbours
2093
2094 for (0 .. 3) {
2095 my $neigh = $map->tile_path ($_)
2096 or next;
2097 $neigh = find $neigh, $map
2098 or next;
2099 $neigh->load;
2100
2101 push @neigh,
2102 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2103 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2104 }
2105
2106 for (grep defined $_->[0], @neigh) {
2107 my ($path, $origin) = @$_;
2108 my $neigh = find $path, $origin
2109 or next;
2110 $neigh->load;
2111 }
2112}
2113
2114sub find_sync { 2366sub find_sync {
2115 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2116 2368
2117 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
2118} 2374}
2119 2375
2120sub do_load_sync { 2376sub do_load_sync {
2121 my ($map) = @_; 2377 my ($map) = @_;
2122 2378
2379 # it's a bug to call this from the main context
2123 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2124 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2125 2382
2126 cf::sync_job { $map->load }; 2383 $map->load;
2127} 2384}
2128 2385
2129our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2130our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2131 2388
2132sub find_async { 2389sub find_async {
2133 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2134 2391
2135 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2136 2393
2137 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2395 return $map if !$load || $map->linkable;
2139 } 2396 }
2140 2397
2141 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2142 2399
2143 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2144 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2145 2402
2146 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2147 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2148 if (my $map = find $k) { 2405 if (my $map = find $k) {
2149 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2150 } 2407 }
2151 2408
2152 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2153 } 2410 }
2154 } 2411 }
2157 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2158 2415
2159 () 2416 ()
2160} 2417}
2161 2418
2419# common code, used by both ->save and ->swapout
2162sub save { 2420sub _save {
2163 my ($self) = @_; 2421 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2422
2167 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2168 2424
2169 return unless $self->dirty; 2425 return unless $self->dirty;
2170 2426
2179 2435
2180 cf::async { 2436 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2437 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2438 $_->contr->save for $self->players;
2183 }; 2439 };
2440
2441 cf::get_slot 0.02;
2184 2442
2185 if ($uniq) { 2443 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2444 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2445 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2446 } else {
2189 $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);
2190 } 2448 }
2191} 2449}
2192 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2193sub swap_out { 2459sub swap_out {
2194 my ($self) = @_; 2460 my ($self) = @_;
2195 2461
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2201 return if $self->players; 2466 return if $self->players;
2202 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
2203 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2204 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
2205 $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};
2206 2518
2207 $self->deactivate; 2519 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->clear; 2521 $self->clear;
2210}
2211
2212sub reset_at {
2213 my ($self) = @_;
2214
2215 # TODO: safety, remove and allow resettable per-player maps
2216 return 1e99 if $self->{deny_reset};
2217
2218 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2219 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2220
2221 $time + $to
2222}
2223
2224sub should_reset {
2225 my ($self) = @_;
2226
2227 $self->reset_at <= $cf::RUNTIME
2228}
2229
2230sub reset {
2231 my ($self) = @_;
2232
2233 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234
2235 return if $self->players;
2236
2237 warn "resetting map ", $self->path;
2238
2239 $self->in_memory (cf::MAP_SWAPPED);
2240
2241 # need to save uniques path
2242 unless ($self->{deny_save}) {
2243 my $uniq = $self->uniq_path; utf8::encode $uniq;
2244
2245 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2246 if $uniq;
2247 }
2248
2249 delete $cf::MAP{$self->path};
2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->clear;
2254 2522
2255 $self->unlink_save; 2523 $self->unlink_save;
2256 $self->destroy; 2524 $self->destroy;
2257} 2525}
2258 2526
2266 2534
2267 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2268 2536
2269 $self->unlink_save; 2537 $self->unlink_save;
2270 2538
2271 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2272 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2273 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2274 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2276 2544
2325 2593
2326sub unique_maps() { 2594sub unique_maps() {
2327 [ 2595 [
2328 map { 2596 map {
2329 utf8::decode $_; 2597 utf8::decode $_;
2330 /\.map$/ 2598 s/\.map$//; # TODO future compatibility hack
2599 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2600 ? ()
2331 ? normalise $_ 2601 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2603 ]
2335} 2604}
2336 2605
2337package cf; 2606=item cf::map::static_maps
2607
2608Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2609file in the shared directory excluding F</styles> and F</editor>). May
2610block.
2611
2612=cut
2613
2614sub static_maps() {
2615 my @dirs = "";
2616 my @maps;
2617
2618 while (@dirs) {
2619 my $dir = shift @dirs;
2620
2621 next if $dir eq "/styles" || $dir eq "/editor";
2622
2623 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2624 or return;
2625
2626 for (@$files) {
2627 s/\.map$// or next;
2628 utf8::decode $_;
2629 push @maps, "$dir/$_";
2630 }
2631
2632 push @dirs, map "$dir/$_", @$dirs;
2633 }
2634
2635 \@maps
2636}
2338 2637
2339=back 2638=back
2340 2639
2341=head3 cf::object 2640=head3 cf::object
2342 2641
2346 2645
2347=over 4 2646=over 4
2348 2647
2349=item $ob->inv_recursive 2648=item $ob->inv_recursive
2350 2649
2351Returns 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.
2352 2652
2353=cut 2653=cut
2354 2654
2355sub inv_recursive_; 2655sub inv_recursive_;
2356sub inv_recursive_ { 2656sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2661 inv_recursive_ inv $_[0]
2362} 2662}
2363 2663
2364=item $ref = $ob->ref 2664=item $ref = $ob->ref
2365 2665
2366creates 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.
2367 2667
2368=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2369 2669
2370returns 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,
2371even if the object actually exists. May block. 2671even if the object actually exists. May block.
2372 2672
2373=cut 2673=cut
2374 2674
2375sub deref { 2675sub deref {
2403can 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
2404dialogue with the given NPC character. 2704dialogue with the given NPC character.
2405 2705
2406=cut 2706=cut
2407 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
2408# rough implementation of a future "reply" method that works 2722# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2723# with dialog boxes.
2410#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
2411sub cf::object::player::reply($$$;$) { 2725sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2726 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2737 my $dialog = $pl->{npc_dialog};
2424 $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));
2425 2739
2426 } else { 2740 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2741 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2742 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2743 }
2430 } 2744 }
2431} 2745}
2432 2746
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2747=item $object->send_msg ($channel, $msg, $color, [extra...])
2443=item $player_object->may ("access") 2757=item $player_object->may ("access")
2444 2758
2445Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2446(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2447 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
2448=cut 2787=cut
2449 2788
2450sub cf::object::player::may { 2789sub cf::object::player::may {
2451 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2452 2791
2453 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2454 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2455 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2456 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2457} 2796}
2458 2797
2459=item $player_object->enter_link 2798=item $player_object->enter_link
2460 2799
2461Freezes 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}>).
2462 2801
2463The 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.
2464I<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.
2465 2806
2466Will 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.
2467 2814
2468=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2469 2816
2470Moves 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
2471map. 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
2489sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2490 my ($self) = @_; 2837 my ($self) = @_;
2491 2838
2492 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2493 2840
2841 ++$self->{_link_recursion};
2842
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2844
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2498 2847
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2849}
2501 2850
2502sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2504 2853
2521 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2523 2872
2524 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2527 2876
2528 $map->load; 2877 $map->load;
2529 $map->load_neighbours;
2530 2878
2531 return unless $self->contr->active; 2879 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2880
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2536} 2883 # entering was successful
2884 delete $self->{_link_recursion};
2885 # only activate afterwards, to support waiting in hooks
2886 $self->activate_recursive;
2887 }
2537 2888
2889}
2890
2538=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)]])
2539 2892
2540Moves 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
2541her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2542that 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
2543the 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
2544be called at the end of this process. 2897be called at the end of this process.
2545 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
2546=cut 2902=cut
2547 2903
2548our $GOTOGEN; 2904our $GOTOGEN;
2549 2905
2550sub cf::object::player::goto { 2906sub cf::object::player::goto {
2551 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 }
2552 2914
2553 # 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
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2917
2556 $self->enter_link; 2918 $self->enter_link;
2576 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2577 } 2939 }
2578 } 2940 }
2579 2941
2580 my $map = eval { 2942 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2582 2944
2583 if ($map) { 2945 if ($map) {
2584 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2948 } else {
2587 $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);
2588 } 2950 }
2589 2951
2590 $map 2952 $map
2598 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2601 } 2963 }
2602 2964
2603 $done->() if $done; 2965 $done->($self) if $done;
2604 })->prio (1); 2966 })->prio (1);
2605} 2967}
2606 2968
2607=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2608 2970
2628} 2990}
2629 2991
2630sub prepare_random_map { 2992sub prepare_random_map {
2631 my ($exit) = @_; 2993 my ($exit) = @_;
2632 2994
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2995 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2996 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2997 # that depends on the exit object
2638 2998
2639 my $rmp = parse_random_map_params $exit->msg; 2999 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 3001 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 3002 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 3003 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 3004 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 3005 $rmp->{origin_y} = $exit->y;
3006
3007 $exit->map->touch;
2646 } 3008 }
2647 3009
2648 $rmp->{random_seed} ||= $exit->random_seed; 3010 $rmp->{random_seed} ||= $exit->random_seed;
2649 3011
2650 my $data = cf::encode_json $rmp; 3012 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 3013 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 3014 my $meta = "$RANDOMDIR/$md5.meta";
2653 3015
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3016 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 3017 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 3018 undef $fh;
2657 aio_rename "$meta~", $meta; 3019 aio_rename "$meta~", $meta;
2658 3020
3021 my $slaying = "?random/$md5";
3022
3023 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 3024 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 3025 $exit->msg (undef);
3026 }
2661 } 3027 }
2662} 3028}
2663 3029
2664sub cf::object::player::enter_exit { 3030sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 3031 my ($self, $exit) = @_;
2666 3032
2667 return unless $self->type == cf::PLAYER; 3033 return unless $self->type == cf::PLAYER;
2668 3034
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 3035 $self->enter_link;
2681 3036
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 3037 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3038 $Coro::current->{desc} = "enter_exit";
2688 3039
2689 $self->deactivate_recursive; # just to be sure
2690 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
2691 $self->goto ($slaying, $hp, $sp); 3070 $self->goto ($map, $x, $y);
2692 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
2693 1; 3076 1
2694 }) { 3077 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "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. "
2697 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2699 3082
2700 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2701 $self->leave_link; 3084 $self->leave_link;
2702 } 3085 }
2703 })->prio (1); 3086 })->prio (1);
2704} 3087}
2705 3088
2706=head3 cf::client 3089=head3 cf::client
2707 3090
2708=over 4 3091=over 4
2709 3092
2710=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2711 3094
2712Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2713should not be used under normal circumstances. 3096them as required.
2714 3097
2715=cut 3098=cut
2716 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2717sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2718 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2719 3104
2720 utf8::encode $text; 3105 # try lzf for large packets
2721 $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);
2722} 3116}
2723 3117
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 3119
2726Send 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
2727client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2728the 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
2729the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2730 3124
2731=cut 3125=cut
2732 3126
2733# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2735 "c/identify" => { 3135 "c/identify" => {
2736 id => "infobox", 3136 id => "infobox",
2737 title => "Identify", 3137 title => "Identify",
2738 reply => undef, 3138 reply => undef,
2739 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2741 "c/examine" => { 3141 "c/examine" => {
2742 id => "infobox", 3142 id => "infobox",
2743 title => "Examine", 3143 title => "Examine",
2744 reply => undef, 3144 reply => undef,
2745 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",
2746 }, 3152 },
2747 "c/book" => { 3153 "c/book" => {
2748 id => "infobox", 3154 id => "infobox",
2749 title => "Book", 3155 title => "Book",
2750 reply => undef, 3156 reply => undef,
2766 id => "infobox", 3172 id => "infobox",
2767 title => "Body Parts", 3173 title => "Body Parts",
2768 reply => undef, 3174 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you posess and are available",
2770 }, 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 },
2771 "c/uptime" => { 3213 "c/uptime" => {
2772 id => "infobox", 3214 id => "infobox",
2773 title => "Uptime", 3215 title => "Uptime",
2774 reply => undef, 3216 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 3217 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 3220 id => "infobox",
2779 title => "Map Info", 3221 title => "Map Info",
2780 reply => undef, 3222 reply => undef,
2781 tooltip => "Information related to the maps", 3223 tooltip => "Information related to the maps",
2782 }, 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,
2783); 3245);
2784 3246
2785sub cf::client::send_msg { 3247sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3248 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3249
2788 $msg = $self->pl->expand_cfpod ($msg); 3250 $msg = $self->pl->expand_cfpod ($msg)
3251 unless $color & cf::NDI_VERBATIM;
2789 3252
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3253 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3254
2792 # check predefined channels, for the benefit of C 3255 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3256 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3257 $channel = $CHANNEL{$channel};
2795 3258
2796 $self->ext_msg (channel_info => $channel) 3259 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3260 $channel = $channel->{id};
2800 3261
2801 } elsif (ref $channel) { 3262 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3263 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3264 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3265 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3266 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3267 }
2808 3268
2809 $channel = $channel->{id}; 3269 $channel = $channel->{id};
2810 } 3270 }
2811 3271
2812 return unless @extra || length $msg; 3272 return unless @extra || length $msg;
2813 3273
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3274 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3275 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3276 if $color & cf::NDI_DEF;
2818 3277
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3278 my $pkt = "msg "
3279 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3281 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 3282
2833 $color &= cf::NDI_COLOR_MASK; 3283 $self->send_big_packet ($pkt);
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846} 3284}
2847 3285
2848=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2849 3287
2850Sends an ext event to the client. 3288Sends an ext event to the client.
2852=cut 3290=cut
2853 3291
2854sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2856 3294
2857 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 }
2863}
2864
2865=item $client->ext_reply ($msgid, @msg)
2866
2867Sends an ext reply to the client.
2868
2869=cut
2870
2871sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_;
2873
2874 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881} 3296}
2882 3297
2883=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2884 3299
2885Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2905 3320
2906 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2907 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2908 3323
2909 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;
2910} 3364}
2911 3365
2912cf::client->attach ( 3366cf::client->attach (
2913 on_connect => sub { 3367 on_connect => sub {
2914 my ($ns) = @_; 3368 my ($ns) = @_;
2940 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
2941 3395
2942 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2943 3397
2944 if (ref $msg) { 3398 if (ref $msg) {
2945 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2946 "ARRAY" eq ref $msg
2947 ? @$msg
2948 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2949 3400
2950 my @reply;
2951
2952 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}) {
2953 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
2954 } 3419 }
2955
2956 $ns->ext_reply ($reply, @reply)
2957 if $reply;
2958
2959 } else { 3420 } else {
2960 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";
2961 } 3422 }
2962 3423
2963 cf::override; 3424 cf::override;
2964 }, 3425 },
2965); 3426);
2985 3446
2986 $coro 3447 $coro
2987} 3448}
2988 3449
2989cf::client->attach ( 3450cf::client->attach (
2990 on_destroy => sub { 3451 on_client_destroy => sub {
2991 my ($ns) = @_; 3452 my ($ns) = @_;
2992 3453
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3455 },
2995); 3456);
3011our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3012 3473
3013$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3014 3475
3015$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3018 sort time 3479 sort time
3019)); 3480));
3020 3481
3021# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3024 3485
3025The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
3026 3487
3027 cf::object 3488 cf::object
3028 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
3029 insert remove name archname title slaying race decrease_ob_nr 3490 insert remove name archname title slaying race decrease split
3491 value
3030 3492
3031 cf::object::player 3493 cf::object::player
3032 player 3494 player
3033 3495
3034 cf::player 3496 cf::player
3039 3501
3040=cut 3502=cut
3041 3503
3042for ( 3504for (
3043 ["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
3044 insert remove inv name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3049) { 3511) {
3050 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3053 for @funs; 3514 for @funs;
3054} 3515}
3055 3516
3070 3531
3071 my $qcode = $code; 3532 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3074 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
3075 local $_; 3539 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3540
3078 my $eval = 3541 my $eval =
3079 "do {\n" 3542 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3545 . $code
3083 . "\n}" 3546 . "\n}"
3084 ; 3547 ;
3085 3548
3549 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 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 }
3089 3558
3090 if ($@) { 3559 if ($@) {
3091 warn "$@"; 3560 warn "$@",
3092 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3094 } 3563 }
3095 3564
3096 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3097} 3566}
3098 3567
3112=cut 3581=cut
3113 3582
3114sub register_script_function { 3583sub register_script_function {
3115 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3116 3585
3117 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3119} 3588}
3120 3589
3121=back 3590=back
3122 3591
3123=cut 3592=cut
3124 3593
3125############################################################################# 3594#############################################################################
3126# the server's init and main functions 3595# the server's init and main functions
3127 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
3128sub load_facedata($) { 3674sub load_facedata($) {
3129 my ($path) = @_; 3675 my ($path) = @_;
3130 3676
3131 # HACK to clear player env face cache, we need some signal framework
3132 # for this (global event?)
3133 %ext::player_env::MUSIC_FACE_CACHE = ();
3134
3135 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3136 3678
3137 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3138 3680
3139 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3140 0 < aio_load $path, $facedata
3141 or die "$path: $!";
3142
3143 $facedata = Coro::Storable::thaw $facedata;
3144 3682
3145 $facedata->{version} == 2 3683 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3147 3685
3148 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3149 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3150 type => FT_RSRC, 3688
3151 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
3152 }; 3690
3153 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3154 3694
3155 { 3695 {
3156 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3157 3697
3158 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3701
3161 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3163 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};
3164 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};
3165 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3166 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3167 } 3709 }
3168 3710
3169 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3170 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3171 3713
3174 3716
3175 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3176 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3178 } else { 3720 } else {
3179 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3180 } 3722 }
3181
3182 cf::cede_to_tick;
3183 } 3723 }
3184 } 3724 }
3185 3725
3186 { 3726 {
3187 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3188 3728
3189 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3190 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3191 cf::cede_to_tick;
3192 } 3731 }
3193 3732
3194 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3195 } 3734 }
3196 3735
3197 { 3736 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3201 3738
3202 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3203 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
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3743
3207 if ($info->{type} & 1) {
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 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;
3222 } else { 3750 } else {
3223 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3224 } 3752 }
3225
3226 cf::cede_to_tick;
3227 } 3753 }
3228 } 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;
3229 3765
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3231 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3232 1 3770 1
3233} 3771}
3234
3235cf::global->attach (on_resource_update => sub {
3236 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3237 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3238
3239 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3240 my $sound = $soundconf->{compat}[$_]
3241 or next;
3242
3243 my $face = cf::face::find "sound/$sound->[1]";
3244 cf::sound::set $sound->[0] => $face;
3245 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3246 }
3247
3248 while (my ($k, $v) = each %{$soundconf->{event}}) {
3249 my $face = cf::face::find "sound/$v";
3250 cf::sound::set $k => $face;
3251 }
3252 }
3253});
3254 3772
3255register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3256 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3257 3775
3258 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3777 $ns->fx_want ($k, $v);
3260 } 3778 }
3261}; 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}
3262 3804
3263sub reload_regions { 3805sub reload_regions {
3264 # 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
3265 # for this (global event?) 3807 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3808 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 if exists $_->{match}; 3815 if exists $_->{match};
3274 } 3816 }
3275} 3817}
3276 3818
3277sub reload_facedata { 3819sub reload_facedata {
3278 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3279 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3280} 3822}
3281 3823
3282sub reload_archetypes { 3824sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references 3827
3286 # this really needs to be done in an extra post-pass 3828 cf::face::set
3287 # (which needs to be synchronous, so solve it differently) 3829 "res/skill_info" => FT_RSRC,
3288 load_resource_file "$DATADIR/archetypes" 3830 JSON::XS->new->utf8->canonical->encode (
3289 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;
3290} 3853}
3291 3854
3292sub reload_treasures { 3855sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3295} 3858}
3296 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
3297sub reload_resources { 3880sub reload_resources {
3298 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3299 3882
3883 reload_materials;
3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3887 reload_archetypes;
3300 reload_regions; 3888 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3889 reload_treasures;
3305 3890
3306 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3307}
3308
3309sub init {
3310 reload_resources;
3311} 3892}
3312 3893
3313sub reload_config { 3894sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3315 or return;
3316 3896
3317 local $/; 3897 my $config = load_file "$CONFDIR/config";
3318 *CFG = YAML::Syck::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3319 3900
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3321 3902
3322 $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};
3323 $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};
3324 3905
3325 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3329 }; 3910 };
3330 warn $@ if $@; 3911 warn $@ if $@;
3331 } 3912 }
3332} 3913}
3333 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
3334sub 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
3335 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3337 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#
3338 (async { 3956 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3341 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3342 }; 3960 };
3343 3961
3962 evthread_start IO::AIO::poll_fileno;
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;
3344 reload_config; 3976 reload_config;
3345 db_init; 3977
3978 cf::init_uuid;
3979 cf::init_signals;
3980 cf::init_skills;
3981
3982 cf::init_beforeplay;
3983
3984 atomic;
3985
3346 load_extensions; 3986 load_extensions;
3347 3987
3348 $TICK_WATCHER->start; 3988 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3989
3350 EV::loop; 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;
3351} 4005}
3352 4006
3353############################################################################# 4007#############################################################################
3354# initialisation and cleanup 4008# initialisation and cleanup
3355 4009
3356# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3357BEGIN { 4011BEGIN {
3358 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3362 }; 4016 };
3363 } 4017 }
3364} 4018}
3365 4019
3366sub write_runtime { 4020sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 4021 my $t0 = AE::time;
3368 4022
3369 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3371 4025
3372 IO::AIO::aio_utime $runtime, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 4027
3374 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3375 4029
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 4031 or return;
3378 4032
3379 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 4045 aio_utime $fh, undef, undef;
3392 4046
3393 close $fh 4047 close $fh
3394 or return; 4048 or return;
3395 4049
3396 aio_rename "$runtime~", $runtime 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 4051 and return;
3398 4052
3399 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 4054
3401 1 4055 1
4056}
4057
4058our $uuid_lock;
4059our $uuid_skip;
4060
4061sub write_uuid_sync($) {
4062 $uuid_skip ||= $_[0];
4063
4064 return if $uuid_lock;
4065 local $uuid_lock = 1;
4066
4067 my $uuid = "$LOCALDIR/uuid";
4068
4069 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
4070 or return;
4071
4072 my $value = uuid_seq uuid_cur;
4073
4074 unless ($value) {
4075 info "cowardly refusing to write zero uuid value!\n";
4076 return;
4077 }
4078
4079 my $value = uuid_str $value + $uuid_skip;
4080 $uuid_skip = 0;
4081
4082 (aio_write $fh, 0, (length $value), $value, 0) <= 0
4083 and return;
4084
4085 # always fsync - this file is important
4086 aio_fsync $fh
4087 and return;
4088
4089 close $fh
4090 or return;
4091
4092 aio_rename "$uuid~", $uuid
4093 and return;
4094
4095 trace "uuid file written ($value).\n";
4096
4097 1
4098
4099}
4100
4101sub write_uuid($$) {
4102 my ($skip, $sync) = @_;
4103
4104 $sync ? write_uuid_sync $skip
4105 : async { write_uuid_sync $skip };
3402} 4106}
3403 4107
3404sub emergency_save() { 4108sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3406 4110
3407 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;
3408 4117
3409 cf::sync_job { 4118 cf::sync_job {
4119 cf::write_runtime_sync; # external watchdog should not bark
4120
3410 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 4127 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 4129 $pl->save;
3419 } 4130 }
3420 warn "end emergency player save\n"; 4131 info "emergency_perl_save: end player save\n";
3421 4132
3422 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";
3423 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 4138 $map->valid or next;
3426 $map->save; 4139 $map->save;
3427 } 4140 }
3428 warn "end emergency map save\n"; 4141 info "emergency_perl_save: end map save\n";
3429 4142
3430 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";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
4148
4149 info "emergency_perl_save: begin write uuid\n";
4150 write_uuid_sync 1;
4151 info "emergency_perl_save: end write uuid\n";
4152
4153 cf::write_runtime_sync; # external watchdog should not bark
4154
4155 trace "emergency_perl_save: syncing database to disk";
4156 BDB::db_env_txn_checkpoint $DB_ENV;
4157
4158 info "emergency_perl_save: starting sync\n";
4159 IO::AIO::aio_sync sub {
4160 info "emergency_perl_save: finished sync\n";
4161 };
4162
4163 cf::write_runtime_sync; # external watchdog should not bark
4164
4165 trace "emergency_perl_save: flushing outstanding aio requests";
4166 while (IO::AIO::nreqs || BDB::nreqs) {
4167 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4168 }
4169
4170 cf::write_runtime_sync; # external watchdog should not bark
3433 }; 4171 };
3434 4172
3435 warn "leave emergency perl save\n"; 4173 info "emergency_perl_save: leave\n";
3436} 4174}
3437 4175
3438sub post_cleanup { 4176sub post_cleanup {
3439 my ($make_core) = @_; 4177 my ($make_core) = @_;
3440 4178
4179 IO::AIO::flush;
4180
3441 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3442 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 }
3443} 4211}
3444 4212
3445sub do_reload_perl() { 4213sub do_reload_perl() {
3446 # can/must only be called in main 4214 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3448 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3449 return; 4217 return;
3450 } 4218 }
3451 4219
3452 warn "reloading..."; 4220 return if $RELOAD++;
3453 4221
3454 warn "entering sync_job"; 4222 my $t1 = AE::time;
3455 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
3456 cf::sync_job { 4230 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark
3458 cf::emergency_save; 4231 #cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark
3460 4232
3461 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV;
3463
3464 # if anything goes wrong in here, we should simply crash as we already saved
3465
3466 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs;
3472 warn "iterate...";
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = (); 4235 %EXT_CORO = ();
3480 4236
3481 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3482 %COMMAND = (); 4238 %COMMAND = ();
3483 4239
3484 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3485 %EXTCMD = (); 4241 %EXTCMD = ();
3486 %EXTICMD = (); 4242 %EXTICMD = ();
3487 4243
3488 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3489 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3491 4247
3492 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3493 eval { 4249 eval {
3494 $cb->($pkg); 4250 $cb->($pkg);
3495 1 4251 1
3496 } 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;
3497 } 4257 }
3498 4258
3499 warn "... nuking $pkg";
3500 Symbol::delete_package $pkg;
3501 }
3502
3503 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3504 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 4262
3507 warn "... unloading $k"; 4263 trace "... unloading $k";
3508 delete $INC{$k}; 4264 delete $INC{$k};
3509 4265
3510 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3512 4268
3513 if (my $cb = $k->can ("unload_module")) { 4269 if (my $cb = $k->can ("unload_module")) {
3514 $cb->(); 4270 $cb->();
4271 }
4272
4273 clear_package $k;
3515 } 4274 }
3516 4275
3517 Symbol::delete_package $k;
3518 }
3519
3520 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 4277 clear_package "safe::$_"
3522 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);
3523 4279
3524 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 4283
3528 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3529 # and global variables created in xs 4285 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3531 4287
3532 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3533 4289
3534 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3535 require cf; 4291 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3537 4293
3538 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3539 cf::reload_config; 4295 cf::reload_config;
3540 4296
3541 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3542 cf::load_extensions; 4298 cf::load_extensions;
3543 4299
4300 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3547 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
4307 }
3550 4308
3551 warn "leaving sync_job"; 4309 cf::_post_init 1;
3552 4310
4311 trace "perl_reload: leaving sync_job";
4312
3553 1 4313 1
3554 } or do { 4314 } or do {
3555 warn $@; 4315 error $@;
3556 warn "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3557 exit 1; 4317 };
4318
4319 --$RELOAD;
3558 }; 4320 }
3559 4321
3560 warn "reloaded"; 4322 $t1 = AE::time - $t1;
4323 info "perl_reload: completed in ${t1}s\n";
3561}; 4324};
3562 4325
3563our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3564 4327
3565sub reload_perl() { 4328sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 4329 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3568 4331
4332 $RELOAD_WATCHER ||= cf::async {
4333 Coro::AIO::aio_wait cache_extensions;
4334
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4336 do_reload_perl;
3570 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
3571 do_reload_perl; 4338 };
3572 }; 4339 };
3573} 4340}
3574 4341
3575register_command "reload" => sub { 4342register_command "reload" => sub {
3576 my ($who, $arg) = @_; 4343 my ($who, $arg) = @_;
3582 reload_perl; 4349 reload_perl;
3583 }; 4350 };
3584 } 4351 }
3585}; 4352};
3586 4353
3587unshift @INC, $LIBDIR; 4354#############################################################################
3588 4355
3589my $bug_warning = 0; 4356my $bug_warning = 0;
3590 4357
3591our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN;
3593
3594sub wait_for_tick { 4358sub wait_for_tick() {
3595 return unless $TICK_WATCHER->is_active; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3596 return if $Coro::current == $Coro::main;
3597 4360
3598 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3599 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait;
3601} 4362}
3602 4363
3603sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3604 return unless $TICK_WATCHER->is_active; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3605 return if $Coro::current == $Coro::main;
3606 4366
3607 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 4369 $signal->wait;
3610} 4370}
3611 4371
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4372sub tick {
3613 if ($Coro::current != $Coro::main) { 4373 if ($Coro::current != $Coro::main) {
3614 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"
3615 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3616 return; 4376 return;
3617 } 4377 }
3618 4378
3619 $NOW = $tick_start = EV::now; 4379 cf::one_tick; # one server iteration
3620 4380
3621 cf::server_tick; # one server iteration 4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 4382
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $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.;
3628 Coro::async_pool { 4385 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 4387 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3632 }; 4389 };
3633 } 4390 }
3634 4391
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3636 $sig->send; 4393 $sig->send;
3637 } 4394 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3639 $sig->send;
3640 }
3641 4396
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4399
3645 _post_tick; 4400 if (0) {
3646}; 4401 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4402 my $jitter = $TICK_START - $NEXT_TICK;
4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4404 debug "jitter $JITTER\n";#d#
4405 }
4406 }
4407}
3648 4408
3649{ 4409{
3650 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3651 4412
3652 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3655 4416
3656 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | 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;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4422 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4423 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4424
3663 cf::sync_job { 4425 cf::sync_job {
3664 eval { 4426 eval {
3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3684 }; 4446 };
3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3687 }; 4449 };
4450
4451 info "database initialised";
3688} 4452}
3689 4453
3690{ 4454{
3691 # configure IO::AIO 4455 # configure IO::AIO
3692 4456
4457 info "initialising aio";
3693 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3696} 4462}
3697 4463
3698my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3699 4466
3700sub _log_backtrace { 4467sub _log_backtrace {
3701 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3702 4469
3703 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3704 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3705 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3707 ++$_log_backtrace; 4478 ++$_log_backtrace;
4479 my $perl_bt = Carp::longmess $msg;
3708 async { 4480 async {
3709 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3710 4482
3711 my @bt = fork_call { 4483 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4484 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4495 }
3724 4496
3725 @funcs 4497 @funcs
3726 }; 4498 };
3727 4499
3728 LOG llevInfo, "[ABT] $msg\n"; 4500 LOG llevInfo, "[ABT] $perl_bt\n";
4501 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4503 --$_log_backtrace;
3731 }; 4504 };
3732 } else { 4505 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3735 } 4508 }
3736} 4509}
3737 4510
3738# load additional modules 4511# load additional modules
3739use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3740 4514
3741END { cf::emergency_save } 4515END { cf::emergency_save }
3742 4516
37431 45171
3744 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines