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.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.595 by root, Fri Nov 9 16:27:55 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
36 40
37use Coro (); 41use Coro ();
38use Coro::State; 42use Coro::State;
39use Coro::Handle; 43use Coro::Handle;
40use Coro::EV; 44use Coro::EV;
41use Coro::AnyEvent; 45use Coro::AnyEvent;
42use Coro::Timer; 46use Coro::Timer;
43use Coro::Signal; 47use Coro::Signal;
44use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
45use Coro::AnyEvent; 50use Coro::AnyEvent;
46use Coro::AIO; 51use Coro::AIO;
47use Coro::BDB 1.6; 52use Coro::BDB 1.6;
48use Coro::Storable; 53use Coro::Storable;
49use Coro::Util (); 54use Coro::Util ();
50 55
56use Guard ();
51use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
52use BDB (); 58use BDB ();
53use Data::Dumper; 59use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 60use Fcntl;
56use YAML (); 61use YAML::XS ();
57use IO::AIO (); 62use IO::AIO ();
58use Time::HiRes; 63use Time::HiRes;
59use Compress::LZF; 64use Compress::LZF;
60use Digest::MD5 (); 65use Digest::MD5 ();
61 66
66$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 72Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 73
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 74$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 75
71{ 76# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::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
86} 79
80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 82
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
89 86
90our %COMMAND = (); 87our %COMMAND = ();
91our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
92 89
93our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
94our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
95our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
98 97
99our $RELOAD; # number of reloads so far 98our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
101 102
102our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
103our $DATADIR = datadir; 105our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
106our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
107our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
108our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
110our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
111our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
112our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
115 118
116our %RESOURCE; 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;
117 126
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 129our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
122 131
123our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 135our $DB_ENV;
127 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
128our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 141
130our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
132our $NOW; 145our $NOW;
133 146
134our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
140 153
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 155our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 156our $JITTER; # average jitter
144our $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;
145 166
146binmode STDOUT; 167binmode STDOUT;
147binmode STDERR; 168binmode STDERR;
148 169
149# read virtual server time, if available 170# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 172 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
154} 175}
155 176
177eval "sub TICK() { $TICK } 1" or die;
178
156mkdir $_ 179mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 181
159our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
160 183
161sub cf::map::normalise; 184sub cf::map::normalise;
162 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
163############################################################################# 190#############################################################################
164 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
165=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
166 204
167=over 4 205=over 4
168 206
169=item $cf::UPTIME 207=item $cf::UPTIME
170 208
171The 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.
172 225
173=item $cf::RUNTIME 226=item $cf::RUNTIME
174 227
175The 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
176every server tick. 229every server tick.
177 230
178=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
179$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
180$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
181 234
182Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
183directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
184unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
185database environment. 238database environment.
186 239
187=item $cf::NOW
188
189The time of the last (current) server tick.
190
191=item $cf::TICK
192
193The interval between server ticks, in seconds.
194
195=item $cf::LOADAVG 240=item $cf::LOADAVG
196 241
197The 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
198(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
199objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
208from wherever your confdir points to. 253from wherever your confdir points to.
209 254
210=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
211 256
212These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
213returns directly I<after> the tick processing (and consequently, can only wake one process 258returns directly I<after> the tick processing (and consequently, can only wake one thread
214per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
215 260
261Note that cf::Wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
277
216=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
217 279
218This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call. 282that call.
221 283
284=item %cf::REFLECT
285
286Contains, for each (C++) class name, a hash reference with information
287about object members (methods, scalars, arrays and flags) and other
288metadata, which is useful for introspection.
289
222=back 290=back
223 291
224=cut 292=cut
225 293
226BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
227 *CORE::GLOBAL::warn = sub { 295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
300$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 301 my $msg = join "", @_;
229 302
230 $msg .= "\n" 303 $msg .= "\n"
231 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
232 305
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 307
235 LOG llevError, $msg; 308 LOG llevWarn, $msg;
236 }; 309};
237}
238 310
239$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
241 313
242 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 318 return;#d#
245 }#d# 319 }#d#
246 320
247 # kill coroutine otherwise 321 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 322 Coro::terminate
250}; 323};
251
252$SIG{__DIE__} = sub { }; #d#?
253 324
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
271)) { 342)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 344}
274 345
275$EV::DIED = sub { 346$EV::DIED = sub {
276 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
277}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
278 354
279############################################################################# 355#############################################################################
280 356
281=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
282 358
303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
304 $d 380 $d
305 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
306} 382}
307 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
308=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
309 437
310Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
311 439
312=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 447
320sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
322 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
482=item cf::post_init { BLOCK }
483
484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
485but I<before> the server starts ticking again.
486
487The codeblock will have a single boolean argument to indicate whether this
488is a reload or not.
489
490=cut
491
492sub post_init(&) {
493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
511}
512
323=item cf::lock_wait $string 513=item cf::lock_wait $string
324 514
325Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
326 516
327=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
328 518
329Wait until the given lock is available and then acquires it and returns 519Wait until the given lock is available and then acquires it and returns
330a Coro::guard object. If the guard object gets destroyed (goes out of scope, 520a L<Guard> object. If the guard object gets destroyed (goes out of scope,
331for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
332returned. 522returned.
333 523
334Locks are *not* recursive, locking from the same coro twice results in a 524Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro. 525deadlocked coro.
341 531
342Return true if the lock is currently active, i.e. somebody has locked it. 532Return true if the lock is currently active, i.e. somebody has locked it.
343 533
344=cut 534=cut
345 535
346our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 537
349sub lock_wait($) { 538sub lock_wait($) {
350 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 540}
363 541
364sub lock_acquire($) { 542sub lock_acquire($) {
365 my ($key) = @_; 543 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 544}
379 545
380sub lock_active($) { 546sub lock_active($) {
381 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 548}
385 549
386sub freeze_mainloop { 550sub freeze_mainloop {
387 tick_inhibit_inc; 551 tick_inhibit_inc;
388 552
389 Coro::guard \&tick_inhibit_dec; 553 &Guard::guard (\&tick_inhibit_dec);
390} 554}
391 555
392=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
393 557
394Like EV::periodic, but randomly selects a starting point so that the actions 558Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer. 559get spread over time.
396 560
397=cut 561=cut
398 562
399sub periodic($$) { 563sub periodic($$) {
400 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
404 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
405} 569}
406 570
407=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
408 572
409Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
410This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
411of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority les than zero, interactive jobs
579should use 100 or more.
412 580
413The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
414used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
415 583
416Useful for short background jobs. 584Useful for short background jobs.
417 585
418=cut 586=cut
419 587
420our @SLOT_QUEUE; 588our @SLOT_QUEUE;
421our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
422 591
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
426 595
427 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
428 598
429 while () { 599 while () {
430 next_job: 600 next_job:
601
431 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 603
433 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 608 $job->[2]->send;
437 Coro::cede; 609 Coro::cede;
438 goto next_job; 610 goto next_job;
439 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 613 }
441 } 614 }
442 615
443 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
446 $signal->wait;
447 } else { 619 } else {
620 $busy = 0;
448 Coro::schedule; 621 Coro::schedule;
449 } 622 }
450 } 623 }
451}; 624};
452 625
453sub get_slot($;$$) { 626sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
455 628
456 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
457 630
458 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
459 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
460 634
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
489=cut 663=cut
490 664
491sub sync_job(&) { 665sub sync_job(&) {
492 my ($job) = @_; 666 my ($job) = @_;
493 667
494 if ($Coro::current == $Coro::main) { 668 if (in_main) {
495 my $time = EV::time; 669 my $time = AE::time;
496 670
497 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
498 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
499 673
500 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
501 675
502 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
503 677
504 my $busy = 1; 678 my $busy = 1;
505 my @res; 679 my @res;
506 680
507 (async { 681 (async {
508 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
509 @res = eval { $job->() }; 683 @res = eval { $job->() };
510 warn $@ if $@; 684 error $@ if $@;
511 undef $busy; 685 undef $busy;
512 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
513 687
514 while ($busy) { 688 while ($busy) {
515 if (Coro::nready) { 689 if (Coro::nready) {
517 } else { 691 } else {
518 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
519 } 693 }
520 } 694 }
521 695
522 my $time = EV::time - $time; 696 my $time = AE::time - $time;
523 697
524 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
525 699
526 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
527 } else { 701 } else {
549 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
550 724
551 $coro 725 $coro
552} 726}
553 727
554=item fork_call { }, $args 728=item fork_call { }, @args
555 729
556Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
557process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
558Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
559never block itself or use any form of event handling. 733never block itself or use any form of event handling.
560 734
561=cut 735=cut
562 736
737sub post_fork {
738 reset_signals;
739}
740
563sub fork_call(&@) { 741sub fork_call(&@) {
564 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
565 743
566 # we seemingly have to make a local copy of the whole thing, 744 # we seemingly have to make a local copy of the whole thing,
567 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
568 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
569 747
570 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
571 reset_signals; 749 cf::post_fork;
572 &$cb 750 &$cb
573 }, @args; 751 } @args;
574 752
575 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
754}
755
756sub objinfo {
757 (
758 "counter value" => cf::object::object_count,
759 "objects created" => cf::object::create_count,
760 "objects destroyed" => cf::object::destroy_count,
761 "freelist size" => cf::object::free_count,
762 "allocated objects" => cf::object::objects_size,
763 "active objects" => cf::object::actives_size,
764 )
576} 765}
577 766
578=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
579 768
580=cut 769=cut
617within each server. 806within each server.
618 807
619=cut 808=cut
620 809
621sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
622 my ($name) = @_; 814 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
624 816
625 eval { 817 eval {
626 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
636} 828}
637 829
638our $DB; 830our $DB;
639 831
640sub db_init { 832sub db_init {
641 cf::sync_job {
642 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
643 };
644} 834}
645 835
646sub db_get($$) { 836sub db_get($$) {
647 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
648 838
649 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
650 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
651 843
652 $! ? () 844 $! ? ()
653 : $data 845 : $data
654 }
655} 846}
656 847
657sub db_put($$$) { 848sub db_put($$$) {
658 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
659 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
687 878
688 my @data; 879 my @data;
689 my $md5; 880 my $md5;
690 881
691 for (0 .. $#$src) { 882 for (0 .. $#$src) {
692 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
693 or Carp::croak "$src->[$_]: $!";
694 } 884 }
695 885
696 # if processing is expensive, check 886 # if processing is expensive, check
697 # checksum first 887 # checksum first
698 if (1) { 888 if (1) {
715 905
716 my $t1 = Time::HiRes::time; 906 my $t1 = Time::HiRes::time;
717 my $data = $process->(\@data); 907 my $data = $process->(\@data);
718 my $t2 = Time::HiRes::time; 908 my $t2 = Time::HiRes::time;
719 909
720 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
721 911
722 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
723 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
724 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
725 915
735 925
736=cut 926=cut
737 927
738sub datalog($@) { 928sub datalog($@) {
739 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
740 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
741} 931}
742 932
743=back 933=back
744 934
745=cut 935=cut
940 1130
941 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
942 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
943 1133
944 } elsif (ref $type) { 1134 } elsif (ref $type) {
945 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
946 1136
947 } else { 1137 } else {
948 shift @arg; 1138 shift @arg;
949 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
950 } 1140 }
951 } 1141 }
952} 1142}
953 1143
954sub _object_attach { 1144sub _object_attach {
964 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
965 } 1155 }
966 1156
967 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
968 } else { 1158 } else {
969 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
970 } 1160 }
971 1161
972 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
973} 1163}
974 1164
1033 1223
1034 for (@$callbacks) { 1224 for (@$callbacks) {
1035 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1036 1226
1037 if ($@) { 1227 if ($@) {
1038 warn "$@";
1039 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1040 override; 1229 override;
1041 } 1230 }
1042 1231
1043 return 1 if $override; 1232 return 1 if $override;
1044 } 1233 }
1123 for (@$attach) { 1312 for (@$attach) {
1124 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1125 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1126 } 1315 }
1127 } else { 1316 } else {
1128 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1129 } 1318 }
1130 } 1319 }
1131} 1320}
1132 1321
1133cf::attachable->attach ( 1322cf::attachable->attach (
1160 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1161 1350
1162 sync_job { 1351 sync_job {
1163 if (length $$rdata) { 1352 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1165 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1166 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1167 1357
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 aio_fsync $fh if $cf::USE_FSYNC; 1361 if ($cf::USE_FSYNC) {
1362 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1363 aio_fsync $fh;
1364 }
1172 aio_close $fh; 1365 aio_close $fh;
1173 1366
1174 if (@$objs) { 1367 if (@$objs) {
1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1368 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1369 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1370 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1371 aio_write $fh, 0, (length $data), $data, 0;
1179 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 }
1180 aio_close $fh; 1376 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1377 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1378 }
1183 } else { 1379 } else {
1184 aio_unlink "$filename.pst"; 1380 aio_unlink "$filename.pst";
1185 } 1381 }
1186 1382
1187 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1384
1385 $filename =~ s%/[^/]+$%%;
1386 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1387 } else {
1189 warn "FATAL: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1190 } 1389 }
1191 } else { 1390 } else {
1192 aio_unlink $filename; 1391 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1194 } 1393 }
1218 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs}; 1418 $av = $st->{objs};
1220 } 1419 }
1221 1420
1222 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1223 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1224 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1225 1425
1226 ($data, $av) 1426 ($data, $av)
1227} 1427}
1228 1428
1229=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1233=cut 1433=cut
1234 1434
1235############################################################################# 1435#############################################################################
1236# command handling &c 1436# command handling &c
1237 1437
1238=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1239 1439
1240Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1241$name. 1441$name.
1242 1442
1243=cut 1443=cut
1249 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1250 1450
1251 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1252} 1452}
1253 1453
1254=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1255 1455
1256Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1257extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1258received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1259the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1260has logged in successfully. 1460has logged in successfully.
1261 1461
1262If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1263called.
1264 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1265=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1266 1470
1267Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1268exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd packet. Exti commands are processed by the server as soon as they
1269are received, i.e. out of order w.r.t. other commands. The first argument 1473are received, i.e. out of order w.r.t. other commands. The first argument
1270is a client socket. Exti commands can be received anytime, even before 1474is a client socket. Exti commands can be received anytime, even before
1271log-in. 1475log-in.
1272 1476
1273If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1274called.
1275 1478
1276=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1277 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1278sub register_extcmd { 1486sub register_extcmd($$) {
1279 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1280 1488
1281 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1282} 1490}
1283 1491
1284sub register_exticmd { 1492sub register_async_extcmd($$) {
1285 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1286 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1287 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1288} 1502}
1289 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1510use File::Glob ();
1511
1290cf::player->attach ( 1512cf::player->attach (
1291 on_command => sub { 1513 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1293 1515
1294 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1295 or return; 1517 or return;
1296 1518
1304 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1305 1527
1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1307 1529
1308 if (ref $msg) { 1530 if (ref $msg) {
1309 my ($type, $reply, @payload) = 1531 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313 1532
1314 my @reply;
1315
1316 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1317 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1318 } 1551 }
1319 1552
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1323 } else { 1553 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1555 }
1326 1556
1327 cf::override; 1557 cf::override;
1328 }, 1558 },
1329); 1559);
1330 1560
1561# "readahead" all extensions
1562sub cache_extensions {
1563 my $grp = IO::AIO::aio_group;
1564
1565 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1566 for (grep /\.ext$/, @{$_[0]}) {
1567 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1568 }
1569 };
1570
1571 $grp
1572}
1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1331sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1332 cf::sync_job { 1590 cf::sync_job {
1333 my %todo; 1591 my %todo;
1334 1592
1335 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1336 next unless -r $path; 1594 next unless -r $path;
1354 1612
1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1357 1615
1358 $ext{source} = 1616 $ext{source} =
1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1360 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1361 . $source 1619 . $source
1362 . "\n};\n1"; 1620 . "\n};\n1";
1363 1621
1364 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1365 } 1623 }
1366 1624
1625 my $pass = 0;
1367 my %done; 1626 my %done;
1368 while (%todo) { 1627 while (%todo) {
1369 my $progress; 1628 my $progress;
1370 1629
1630 ++$pass;
1631
1632 ext:
1371 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1372 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1373 goto skip 1635 next ext
1374 unless exists $done{$_}; 1636 unless exists $done{$_};
1375 } 1637 }
1376 1638
1377 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1378 1640
1379 unless (eval $v->{source}) { 1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1650 my $active = eval $source;
1651
1652 if (length $@) {
1380 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1381 : "$v->{base}: extension inactive.\n";
1382 1654
1383 if (exists $v->{meta}{mandatory}) {
1384 warn $msg;
1385 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1386 } 1656 if exists $v->{meta}{mandatory};
1387 1657
1388 warn $msg; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1659 delete $todo{$k};
1660 } else {
1661 $done{$k} = delete $todo{$k};
1662 push @EXTS, $v->{pkg};
1663 $progress = 1;
1664
1665 info "$v->{base}: extension inactive.\n"
1666 unless $active;
1389 } 1667 }
1390
1391 $done{$k} = delete $todo{$k};
1392 push @EXTS, $v->{pkg};
1393 $progress = 1;
1394 } 1668 }
1395 1669
1396 skip: 1670 unless ($progress) {
1397 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1398 unless $progress; 1672
1673 while (my ($k, $v) = each %todo) {
1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1675 if exists $v->{meta}{mandatory};
1676 }
1677
1678 last;
1679 }
1399 } 1680 }
1400 }; 1681 };
1401} 1682}
1402 1683
1403############################################################################# 1684#############################################################################
1457 1738
1458sub exists($) { 1739sub exists($) {
1459 my ($login) = @_; 1740 my ($login) = @_;
1460 1741
1461 $cf::PLAYER{$login} 1742 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1743 or !aio_stat path $login
1463} 1744}
1464 1745
1465sub find($) { 1746sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1747 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1748 my $login = $_[0];
1487 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1488 } 1769 }
1489 } 1770 }
1490} 1771}
1491 1772
1773cf::player->attach (
1774 on_load => sub {
1775 my ($pl, $path) = @_;
1776
1777 # restore slots saved in save, below
1778 my $slots = delete $pl->{_slots};
1779
1780 $pl->ob->current_weapon ($slots->[0]);
1781 $pl->combat_ob ($slots->[1]);
1782 $pl->ranged_ob ($slots->[2]);
1783 },
1784);
1785
1492sub save($) { 1786sub save($) {
1493 my ($pl) = @_; 1787 my ($pl) = @_;
1494 1788
1495 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1496 1790
1501 1795
1502 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1503 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1504 1798
1505 cf::get_slot 0.01; 1799 cf::get_slot 0.01;
1800
1801 # save slots, to be restored later
1802 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1506 1803
1507 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1508 cf::cede_to_tick; 1805 cf::cede_to_tick;
1509} 1806}
1510 1807
1544 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1545 1842
1546 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1548 1845
1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1550 $pl->deactivate; 1847 $pl->deactivate;
1848
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1553 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1554 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1555 1854
1556 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1557 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1558 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1612 \@logins 1911 \@logins
1613} 1912}
1614 1913
1615=item $player->maps 1914=item $player->maps
1616 1915
1916=item cf::player::maps $login
1917
1617Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1618player. May block. 1919player. May block.
1619 1920
1620=cut 1921=cut
1621 1922
1642 1943
1643=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1644 1945
1645Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1646 1947
1647=item $player->ext_reply ($msgid, @msg)
1648
1649Sends an ext reply to the player.
1650
1651=cut
1652
1653sub ext_reply($$@) {
1654 my ($self, $id, @msg) = @_;
1655
1656 $self->ns->ext_reply ($id, @msg)
1657}
1658
1659=item $player->ext_msg ($type, @msg) 1948=item $player->ext_msg ($type, @msg)
1660 1949
1661Sends an ext event to the client. 1950Sends an ext event to the client.
1662 1951
1663=cut 1952=cut
1682 1971
1683=cut 1972=cut
1684 1973
1685sub find_by_path($) { 1974sub find_by_path($) {
1686 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1687 1978
1688 my ($match, $specificity); 1979 my ($match, $specificity);
1689 1980
1690 for my $region (list) { 1981 for my $region (list) {
1691 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1720sub generate_random_map { 2011sub generate_random_map {
1721 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1722 2013
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724 2015
1725 # mit "rum" bekleckern, nicht
1726 $self->_create_random_map ( 2016 $self->_create_random_map ($rmp);
1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1730 $rmp->{exit_on_final_map},
1731 $rmp->{xsize}, $rmp->{ysize},
1732 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1733 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1734 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1735 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1736 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1737 (cf::region::find $rmp->{region}), $rmp->{custom}
1738 )
1739} 2017}
1740 2018
1741=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1742 2020
1743Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1748 2026
1749sub register { 2027sub register {
1750 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1751 my $pkg = caller; 2029 my $pkg = caller;
1752 2030
1753 no strict;
1754 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1755 2032
1756 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1757} 2034}
1758 2035
1759# also paths starting with '/' 2036# also paths starting with '/'
1760$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1761 2038
1762sub thawer_merge { 2039sub thawer_merge {
1763 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1764 2041
1765 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1770} 2047}
1771 2048
1772sub normalise { 2049sub normalise {
1773 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1774 2051
1775 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1776 2053
1777 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1778 2055
1779 # map plan: 2056 # map plan:
1780 # 2057 #
1795 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1796 $path = "$base/$path"; 2073 $path = "$base/$path";
1797 } 2074 }
1798 2075
1799 for ($path) { 2076 for ($path) {
1800 redo if s{//}{/};
1801 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1802 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1803 } 2079 }
1804 2080
1805 $path 2081 $path
1819 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1820 return $self; 2096 return $self;
1821 } 2097 }
1822 } 2098 }
1823 2099
1824 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1825 () 2101 ()
1826} 2102}
1827 2103
2104# may re-bless or do other evil things
1828sub init { 2105sub init {
1829 my ($self) = @_; 2106 my ($self) = @_;
1830 2107
1831 $self 2108 $self
1832} 2109}
1863 2140
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2141 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 2142 "$UNIQUEDIR/$path"
1866} 2143}
1867 2144
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 2145sub decay_objects {
1878 my ($self) = @_; 2146 my ($self) = @_;
1879 2147
1880 return if $self->{deny_reset}; 2148 return if $self->{deny_reset};
1881 2149
1906 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1907 2175
1908 1 2176 1
1909} 2177}
1910 2178
2179# used to laod the header of an original map
1911sub load_header_orig { 2180sub load_header_orig {
1912 my ($self) = @_; 2181 my ($self) = @_;
1913 2182
1914 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1915} 2184}
1916 2185
2186# used to laod the header of an instantiated map
1917sub load_header_temp { 2187sub load_header_temp {
1918 my ($self) = @_; 2188 my ($self) = @_;
1919 2189
1920 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1921} 2191}
1922 2192
2193# called after loading the header from an instantiated map
1923sub prepare_temp { 2194sub prepare_temp {
1924 my ($self) = @_; 2195 my ($self) = @_;
1925 2196
1926 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1927 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1928 # safety 2199 # safety
1929 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1930 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1931} 2202}
1932 2203
2204# called after loading the header from an original map
1933sub prepare_orig { 2205sub prepare_orig {
1934 my ($self) = @_; 2206 my ($self) = @_;
1935 2207
1936 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
1937 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
1961 2233
1962sub find; 2234sub find;
1963sub find { 2235sub find {
1964 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
1965 2237
2238 cf::cede_to_tick;
2239
1966 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
1967 2241
1968 cf::lock_wait "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2244
1971 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2246 my $map = new_from_path cf::map $path
1976 or return; 2247 or return;
1977 2248
1978 $map->{last_save} = $cf::RUNTIME; 2249 $map->{last_save} = $cf::RUNTIME;
1979 2250
1991 2262
1992 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
1993 } 2264 }
1994} 2265}
1995 2266
1996sub pre_load { } 2267sub pre_load { }
1997sub post_load { } 2268#sub post_load { } # XS
1998 2269
1999sub load { 2270sub load {
2000 my ($self) = @_; 2271 my ($self) = @_;
2001 2272
2002 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
2005 2276
2006 { 2277 {
2007 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2008 2279
2009 return unless $self->valid; 2280 return unless $self->valid;
2010 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2011
2012 $self->in_memory (cf::MAP_LOADING);
2013 2282
2014 $self->alloc; 2283 $self->alloc;
2015 2284
2016 $self->pre_load; 2285 $self->pre_load;
2017 cf::cede_to_tick; 2286 cf::cede_to_tick;
2018 2287
2288 if (exists $self->{load_path}) {
2019 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block; 2290 $f->skip_block;
2021 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2022 or return; 2292 or return;
2023 2293
2024 $self->post_load_original 2294 $self->post_load_original
2025 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2026 2296
2027 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2028 utf8::encode $uniq; 2298 utf8::encode $uniq;
2029 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2031 $self->clear_unique_items; 2301 $self->clear_unique_items;
2032 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2034 } 2305 }
2035 } 2306 }
2036 }
2037 2307
2038 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2039 2315
2040 cf::cede_to_tick; 2316 cf::cede_to_tick;
2041 # now do the right thing for maps 2317 # now do the right thing for maps
2042 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2043 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2047 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2324 $self->decay_objects;
2049 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2050 $self->update_buttons; 2326 $self->update_buttons;
2051 cf::cede_to_tick; 2327 cf::cede_to_tick;
2052 $self->set_darkness_map; 2328 #$self->activate; # no longer activate maps automatically
2053 cf::cede_to_tick;
2054 $self->activate;
2055 } 2329 }
2056 2330
2057 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2059
2060 $self->in_memory (cf::MAP_ACTIVE);
2061 } 2333 }
2062 2334
2063 $self->post_load; 2335 $self->post_load;
2064}
2065 2336
2337 1
2338}
2339
2340# customize the map for a given player, i.e.
2341# return the _real_ map. used by e.g. per-player
2342# maps to change the path to ~playername/mappath
2066sub customise_for { 2343sub customise_for {
2067 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2068 2345
2069 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2070 if $self->per_player; 2347 if $self->per_player;
2073# if $self->per_party; 2350# if $self->per_party;
2074 2351
2075 $self 2352 $self
2076} 2353}
2077 2354
2078# find and load all maps in the 3x3 area around a map
2079sub load_neighbours {
2080 my ($map) = @_;
2081
2082 my @neigh; # diagonal neighbours
2083
2084 for (0 .. 3) {
2085 my $neigh = $map->tile_path ($_)
2086 or next;
2087 $neigh = find $neigh, $map
2088 or next;
2089 $neigh->load;
2090
2091 push @neigh,
2092 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2093 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2094 }
2095
2096 for (grep defined $_->[0], @neigh) {
2097 my ($path, $origin) = @$_;
2098 my $neigh = find $path, $origin
2099 or next;
2100 $neigh->load;
2101 }
2102}
2103
2104sub find_sync { 2355sub find_sync {
2105 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2106 2357
2107 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2108} 2363}
2109 2364
2110sub do_load_sync { 2365sub do_load_sync {
2111 my ($map) = @_; 2366 my ($map) = @_;
2112 2367
2368 # it's a bug to call this from the main context
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2115 2371
2116 cf::sync_job { $map->load }; 2372 $map->load;
2117} 2373}
2118 2374
2119our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2120our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2121 2377
2122sub find_async { 2378sub find_async {
2123 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2124 2380
2125 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2126 2382
2127 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2129 } 2385 }
2130 2386
2131 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2132 2388
2133 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2147 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2148 2404
2149 () 2405 ()
2150} 2406}
2151 2407
2408# common code, used by both ->save and ->swapout
2152sub save { 2409sub _save {
2153 my ($self) = @_; 2410 my ($self) = @_;
2154
2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
2156 2411
2157 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2158 2413
2159 return unless $self->dirty; 2414 return unless $self->dirty;
2160 2415
2180 } else { 2435 } else {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2436 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2182 } 2437 }
2183} 2438}
2184 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2185sub swap_out { 2448sub swap_out {
2186 my ($self) = @_; 2449 my ($self) = @_;
2187 2450
2188 # save first because save cedes
2189 $self->save;
2190
2191 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2192 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2193 return if $self->players; 2455 return if $self->players;
2194 return if $self->in_memory != cf::MAP_ACTIVE; 2456
2457 # first deactivate the map and "unlink" it from the core
2458 $self->deactivate;
2459 $_->clear_links_to ($self) for values %cf::MAP;
2460 $self->state (cf::MAP_SWAPPED);
2461
2462 # then atomically save
2463 $self->_save;
2464
2465 # then free the map
2466 $self->clear;
2467}
2468
2469sub reset_at {
2470 my ($self) = @_;
2471
2472 # TODO: safety, remove and allow resettable per-player maps
2195 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2196 2474
2475 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2476 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2477
2478 $time + $to
2479}
2480
2481sub should_reset {
2482 my ($self) = @_;
2483
2484 $self->reset_at <= $cf::RUNTIME
2485}
2486
2487sub reset {
2488 my ($self) = @_;
2489
2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2491
2492 return if $self->players;
2493
2494 cf::trace "resetting map ", $self->path, "\n";
2495
2197 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2497
2498 # need to save uniques path
2499 unless ($self->{deny_save}) {
2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2501
2502 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2503 if $uniq;
2504 }
2505
2506 delete $cf::MAP{$self->path};
2198 2507
2199 $self->deactivate; 2508 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->clear; 2510 $self->clear;
2202}
2203
2204sub reset_at {
2205 my ($self) = @_;
2206
2207 # TODO: safety, remove and allow resettable per-player maps
2208 return 1e99 if $self->{deny_reset};
2209
2210 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2211 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2212
2213 $time + $to
2214}
2215
2216sub should_reset {
2217 my ($self) = @_;
2218
2219 $self->reset_at <= $cf::RUNTIME
2220}
2221
2222sub reset {
2223 my ($self) = @_;
2224
2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226
2227 return if $self->players;
2228
2229 warn "resetting map ", $self->path;
2230
2231 $self->in_memory (cf::MAP_SWAPPED);
2232
2233 # need to save uniques path
2234 unless ($self->{deny_save}) {
2235 my $uniq = $self->uniq_path; utf8::encode $uniq;
2236
2237 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2238 if $uniq;
2239 }
2240
2241 delete $cf::MAP{$self->path};
2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
2245 $self->clear;
2246 2511
2247 $self->unlink_save; 2512 $self->unlink_save;
2248 $self->destroy; 2513 $self->destroy;
2249} 2514}
2250 2515
2258 2523
2259 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2260 2525
2261 $self->unlink_save; 2526 $self->unlink_save;
2262 2527
2263 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2264 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2265 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2266 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2268 2533
2325 : normalise $_ 2590 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2592 ]
2328} 2593}
2329 2594
2595=item cf::map::static_maps
2596
2597Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2598file in the shared directory excluding F</styles> and F</editor>). May
2599block.
2600
2601=cut
2602
2603sub static_maps() {
2604 my @dirs = "";
2605 my @maps;
2606
2607 while (@dirs) {
2608 my $dir = shift @dirs;
2609
2610 next if $dir eq "/styles" || $dir eq "/editor";
2611
2612 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2613 or return;
2614
2615 for (@$files) {
2616 s/\.map$// or next;
2617 utf8::decode $_;
2618 push @maps, "$dir/$_";
2619 }
2620
2621 push @dirs, map "$dir/$_", @$dirs;
2622 }
2623
2624 \@maps
2625}
2626
2330=back 2627=back
2331 2628
2332=head3 cf::object 2629=head3 cf::object
2333 2630
2334=cut 2631=cut
2399 2696
2400our $SAY_CHANNEL = { 2697our $SAY_CHANNEL = {
2401 id => "say", 2698 id => "say",
2402 title => "Map", 2699 title => "Map",
2403 reply => "say ", 2700 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2701 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2702};
2406 2703
2407our $CHAT_CHANNEL = { 2704our $CHAT_CHANNEL = {
2408 id => "chat", 2705 id => "chat",
2409 title => "Chat", 2706 title => "Chat",
2466 2763
2467Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2468 2765
2469The player should be reasonably safe there for short amounts of time (e.g. 2766The player should be reasonably safe there for short amounts of time (e.g.
2470for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2767for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link 2768though, as the player cannot control the character while it is on the link
2472map. 2769map.
2473 2770
2474Will never block. 2771Will never block.
2475 2772
2476=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2497sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2498 my ($self) = @_; 2795 my ($self) = @_;
2499 2796
2500 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2501 2798
2799 ++$self->{_link_recursion};
2800
2502 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2503 2802
2504 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2505 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2506 2805
2507 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2508} 2807}
2509 2808
2510sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2511 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2512 2811
2529 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2531 2830
2532 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2535 2834
2536 $map->load; 2835 $map->load;
2537 $map->load_neighbours;
2538 2836
2539 return unless $self->contr->active; 2837 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2838
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2545} 2841 # entering was successful
2842 delete $self->{_link_recursion};
2843 # only activate afterwards, to support waiting in hooks
2844 $self->activate_recursive;
2845 }
2546 2846
2847}
2848
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2850
2549Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2853that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2854the new (success) or old (failed) map position. In either case, $done will
2559 2861
2560our $GOTOGEN; 2862our $GOTOGEN;
2561 2863
2562sub cf::object::player::goto { 2864sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2564 2872
2565 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2875
2568 $self->enter_link; 2876 $self->enter_link;
2588 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2589 } 2897 }
2590 } 2898 }
2591 2899
2592 my $map = eval { 2900 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2594 2902
2595 if ($map) { 2903 if ($map) {
2596 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2906 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2908 }
2601 2909
2602 $map 2910 $map
2610 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2613 } 2921 }
2614 2922
2615 $done->() if $done; 2923 $done->($self) if $done;
2616 })->prio (1); 2924 })->prio (1);
2617} 2925}
2618 2926
2619=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2620 2928
2688 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2689 2997
2690 unless (eval { 2998 unless (eval {
2691 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2692 3000
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2702 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2704 3027
2705 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2706 3029
2707 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2713 $self->message ("Something went wrong deep within the deliantra server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2717 3040
2718 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 3042 $self->leave_link;
2720 } 3043 }
2721 })->prio (1); 3044 })->prio (1);
2722} 3045}
2723 3046
2735sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2737 3060
2738 utf8::encode $text; 3061 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3062 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3063}
3064
3065=item $client->send_big_packet ($pkt)
3066
3067Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required.
3069
3070=cut
3071
3072our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3073
3074sub cf::client::send_big_packet {
3075 my ($self, $pkt) = @_;
3076
3077 # try lzf for large packets
3078 $pkt = "lzf " . Compress::LZF::compress $pkt
3079 if 1024 <= length $pkt and $self->{can_lzf};
3080
3081 # split very large packets
3082 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3083 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3084 $pkt = "frag";
3085 }
3086
3087 $self->send_packet ($pkt);
2740} 3088}
2741 3089
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3091
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3092Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3096
2749=cut 3097=cut
2750 3098
2751# non-persistent channels (usually the info channel) 3099# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3100our %CHANNEL = (
3101 "c/motd" => {
3102 id => "infobox",
3103 title => "MOTD",
3104 reply => undef,
3105 tooltip => "The message of the day",
3106 },
2753 "c/identify" => { 3107 "c/identify" => {
2754 id => "infobox", 3108 id => "infobox",
2755 title => "Identify", 3109 title => "Identify",
2756 reply => undef, 3110 reply => undef,
2757 tooltip => "Items recently identified", 3111 tooltip => "Items recently identified",
2759 "c/examine" => { 3113 "c/examine" => {
2760 id => "infobox", 3114 id => "infobox",
2761 title => "Examine", 3115 title => "Examine",
2762 reply => undef, 3116 reply => undef,
2763 tooltip => "Signs and other items you examined", 3117 tooltip => "Signs and other items you examined",
3118 },
3119 "c/shopinfo" => {
3120 id => "infobox",
3121 title => "Shop Info",
3122 reply => undef,
3123 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3124 },
2765 "c/book" => { 3125 "c/book" => {
2766 id => "infobox", 3126 id => "infobox",
2767 title => "Book", 3127 title => "Book",
2768 reply => undef, 3128 reply => undef,
2784 id => "infobox", 3144 id => "infobox",
2785 title => "Body Parts", 3145 title => "Body Parts",
2786 reply => undef, 3146 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3147 tooltip => "Shows which body parts you posess and are available",
2788 }, 3148 },
3149 "c/statistics" => {
3150 id => "infobox",
3151 title => "Statistics",
3152 reply => undef,
3153 tooltip => "Shows your primary statistics",
3154 },
3155 "c/skills" => {
3156 id => "infobox",
3157 title => "Skills",
3158 reply => undef,
3159 tooltip => "Shows your experience per skill and item power",
3160 },
3161 "c/shopitems" => {
3162 id => "infobox",
3163 title => "Shop Items",
3164 reply => undef,
3165 tooltip => "Shows the items currently for sale in this shop",
3166 },
3167 "c/resistances" => {
3168 id => "infobox",
3169 title => "Resistances",
3170 reply => undef,
3171 tooltip => "Shows your resistances",
3172 },
3173 "c/pets" => {
3174 id => "infobox",
3175 title => "Pets",
3176 reply => undef,
3177 tooltip => "Shows information abotu your pets/a specific pet",
3178 },
3179 "c/perceiveself" => {
3180 id => "infobox",
3181 title => "Perceive Self",
3182 reply => undef,
3183 tooltip => "You gained detailed knowledge about yourself",
3184 },
2789 "c/uptime" => { 3185 "c/uptime" => {
2790 id => "infobox", 3186 id => "infobox",
2791 title => "Uptime", 3187 title => "Uptime",
2792 reply => undef, 3188 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3189 tooltip => "How long the server has been running since last restart",
2802 id => "party", 3198 id => "party",
2803 title => "Party", 3199 title => "Party",
2804 reply => "gsay ", 3200 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 3201 tooltip => "Messages and chat related to your party",
2806 }, 3202 },
3203 "c/death" => {
3204 id => "death",
3205 title => "Death",
3206 reply => undef,
3207 tooltip => "Reason for and more info about your most recent death",
3208 },
3209 "c/say" => $SAY_CHANNEL,
3210 "c/chat" => $CHAT_CHANNEL,
2807); 3211);
2808 3212
2809sub cf::client::send_msg { 3213sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 3214 my ($self, $channel, $msg, $color, @extra) = @_;
2811 3215
2816 3220
2817 # check predefined channels, for the benefit of C 3221 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 3222 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 3223 $channel = $CHANNEL{$channel};
2820 3224
2821 $self->ext_msg (channel_info => $channel) 3225 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 3226 $channel = $channel->{id};
2825 3227
2826 } elsif (ref $channel) { 3228 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 3229 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 3230 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 3231 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 3232 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 3233 }
2833 3234
2834 $channel = $channel->{id}; 3235 $channel = $channel->{id};
2835 } 3236 }
2836 3237
2837 return unless @extra || length $msg; 3238 return unless @extra || length $msg;
2838 3239
2839 if ($self->can_msg) {
2840 # default colour, mask it out 3240 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3241 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 3242 if $color & cf::NDI_DEF;
2843 3243
2844 my $pkt = "msg " 3244 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 3245 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 3247 );
2848 3248
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 3249 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 3250}
2886 3251
2887=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2888 3253
2889Sends an ext event to the client. 3254Sends an ext event to the client.
2891=cut 3256=cut
2892 3257
2893sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2895 3260
2896 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 }
2902}
2903
2904=item $client->ext_reply ($msgid, @msg)
2905
2906Sends an ext reply to the client.
2907
2908=cut
2909
2910sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_;
2912
2913 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 }
2920} 3262}
2921 3263
2922=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2923 3265
2924Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
2979 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
2980 3322
2981 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2982 3324
2983 if (ref $msg) { 3325 if (ref $msg) {
2984 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2985 "ARRAY" eq ref $msg
2986 ? @$msg
2987 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2988 3327
2989 my @reply;
2990
2991 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
2992 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
2993 } 3346 }
2994
2995 $ns->ext_reply ($reply, @reply)
2996 if $reply;
2997
2998 } else { 3347 } else {
2999 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3000 } 3349 }
3001 3350
3002 cf::override; 3351 cf::override;
3003 }, 3352 },
3004); 3353);
3024 3373
3025 $coro 3374 $coro
3026} 3375}
3027 3376
3028cf::client->attach ( 3377cf::client->attach (
3029 on_destroy => sub { 3378 on_client_destroy => sub {
3030 my ($ns) = @_; 3379 my ($ns) = @_;
3031 3380
3032 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3033 }, 3382 },
3034); 3383);
3050our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3051 3400
3052$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3053 3402
3054$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3057 sort time 3406 sort time
3058)); 3407));
3059 3408
3060# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3064The following functions and methods are available within a safe environment: 3413The following functions and methods are available within a safe environment:
3065 3414
3066 cf::object 3415 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3416 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3417 insert remove name archname title slaying race decrease split
3418 value
3069 3419
3070 cf::object::player 3420 cf::object::player
3071 player 3421 player
3072 3422
3073 cf::player 3423 cf::player
3079=cut 3429=cut
3080 3430
3081for ( 3431for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3432 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3433 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3436 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3088) { 3438) {
3089 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3092 for @funs; 3441 for @funs;
3093} 3442}
3094 3443
3109 3458
3110 my $qcode = $code; 3459 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3113 3462
3463 %vars = (_dummy => 0) unless %vars;
3464
3465 my @res;
3114 local $_; 3466 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3467
3117 my $eval = 3468 my $eval =
3118 "do {\n" 3469 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3472 . $code
3122 . "\n}" 3473 . "\n}"
3123 ; 3474 ;
3124 3475
3476 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3480 sub_generation_inc;
3481 } else {
3482 local @cf::_safe_eval_args = values %vars;
3483 @res = wantarray ? eval eval : scalar eval $eval;
3484 }
3128 3485
3129 if ($@) { 3486 if ($@) {
3130 warn "$@"; 3487 warn "$@",
3131 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3133 } 3490 }
3134 3491
3135 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3136} 3493}
3137 3494
3151=cut 3508=cut
3152 3509
3153sub register_script_function { 3510sub register_script_function {
3154 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3155 3512
3156 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3158} 3515}
3159 3516
3160=back 3517=back
3161 3518
3162=cut 3519=cut
3163 3520
3164############################################################################# 3521#############################################################################
3165# the server's init and main functions 3522# the server's init and main functions
3523
3524our %FACEHASH; # hash => idx, #d# HACK for http server
3525
3526# internal api, not fianlised
3527sub add_face {
3528 my ($name, $type, $data) = @_;
3529
3530 my $idx = cf::face::find $name;
3531
3532 if ($idx) {
3533 delete $FACEHASH{cf::face::get_chksum $idx};
3534 } else {
3535 $idx = cf::face::alloc $name;
3536 }
3537
3538 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3539
3540 cf::face::set_type $idx, $type;
3541 cf::face::set_data $idx, 0, $data, $hash;
3542 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3543 $FACEHASH{$hash} = $idx;#d#
3544
3545 $idx
3546}
3166 3547
3167sub load_facedata($) { 3548sub load_facedata($) {
3168 my ($path) = @_; 3549 my ($path) = @_;
3169 3550
3170 # HACK to clear player env face cache, we need some signal framework 3551 # HACK to clear player env face cache, we need some signal framework
3171 # for this (global event?) 3552 # for this (global event?)
3172 %ext::player_env::MUSIC_FACE_CACHE = (); 3553 %ext::player_env::MUSIC_FACE_CACHE = ();
3173 3554
3174 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3555 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3175 3556
3176 warn "loading facedata from $path\n"; 3557 trace "loading facedata from $path\n";
3177 3558
3178 my $facedata; 3559 my $facedata = decode_storable load_file $path;
3179 0 < aio_load $path, $facedata
3180 or die "$path: $!";
3181
3182 $facedata = Coro::Storable::thaw $facedata;
3183 3560
3184 $facedata->{version} == 2 3561 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3562 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3563
3187 # patch in the exptable
3188 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3191 };
3192 cf::cede_to_tick; 3564 cf::cede_to_tick;
3193 3565
3194 { 3566 {
3195 my $faces = $facedata->{faceinfo}; 3567 my $faces = $facedata->{faceinfo};
3196 3568
3197 while (my ($face, $info) = each %$faces) { 3569 for my $face (sort keys %$faces) {
3570 my $info = $faces->{$face};
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3571 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3572
3200 cf::face::set_visibility $idx, $info->{visibility}; 3573 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3574 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3575 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3576 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3577 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3578 $FACEHASH{$info->{hash64}} = $idx;#d#
3204 3579
3205 cf::cede_to_tick; 3580 cf::cede_to_tick;
3206 } 3581 }
3207 3582
3208 while (my ($face, $info) = each %$faces) { 3583 while (my ($face, $info) = each %$faces) {
3213 3588
3214 if (my $smooth = cf::face::find $info->{smooth}) { 3589 if (my $smooth = cf::face::find $info->{smooth}) {
3215 cf::face::set_smooth $idx, $smooth; 3590 cf::face::set_smooth $idx, $smooth;
3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3591 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3217 } else { 3592 } else {
3218 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3593 error "smooth face '$info->{smooth}' not found for face '$face'";
3219 } 3594 }
3220 3595
3221 cf::cede_to_tick; 3596 cf::cede_to_tick;
3222 } 3597 }
3223 } 3598 }
3232 3607
3233 cf::anim::invalidate_all; # d'oh 3608 cf::anim::invalidate_all; # d'oh
3234 } 3609 }
3235 3610
3236 { 3611 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3612 my $res = $facedata->{resource};
3240 3613
3241 while (my ($name, $info) = each %$res) { 3614 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3615 if (defined (my $type = $info->{type})) {
3616 # TODO: different hash - must free and use new index, or cache ixface data queue
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3617 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3618
3246 if ($info->{type} & 1) {
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3619 cf::face::set_type $idx, $type;
3620 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3621 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3622 $FACEHASH{$info->{hash}} = $idx;#d#
3261 } else { 3623 } else {
3262 $RESOURCE{$name} = $info; 3624# $RESOURCE{$name} = $info; # unused
3263 } 3625 }
3264 3626
3265 cf::cede_to_tick; 3627 cf::cede_to_tick;
3266 } 3628 }
3267 } 3629 }
3268 3630
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3631 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270 3632
3271 1 3633 1
3272} 3634}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3293 3635
3294register_exticmd fx_want => sub { 3636register_exticmd fx_want => sub {
3295 my ($ns, $want) = @_; 3637 my ($ns, $want) = @_;
3296 3638
3297 while (my ($k, $v) = each %$want) { 3639 while (my ($k, $v) = each %$want) {
3305 my $status = load_resource_file_ $_[0]; 3647 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100; 3648 get_slot 0.1, 100;
3307 cf::arch::commit_load; 3649 cf::arch::commit_load;
3308 3650
3309 $status 3651 $status
3652}
3653
3654sub reload_exp_table {
3655 _reload_exp_table;
3656
3657 add_face "res/exp_table" => FT_RSRC,
3658 JSON::XS->new->utf8->canonical->encode (
3659 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3660 );
3661}
3662
3663sub reload_materials {
3664 _reload_materials;
3310} 3665}
3311 3666
3312sub reload_regions { 3667sub reload_regions {
3313 # HACK to clear player env face cache, we need some signal framework 3668 # HACK to clear player env face cache, we need some signal framework
3314 # for this (global event?) 3669 # for this (global event?)
3329} 3684}
3330 3685
3331sub reload_archetypes { 3686sub reload_archetypes {
3332 load_resource_file "$DATADIR/archetypes" 3687 load_resource_file "$DATADIR/archetypes"
3333 or die "unable to load archetypes\n"; 3688 or die "unable to load archetypes\n";
3689
3690 add_face "res/skill_info" => FT_RSRC,
3691 JSON::XS->new->utf8->canonical->encode (
3692 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3693 );
3694 add_face "res/spell_paths" => FT_RSRC,
3695 JSON::XS->new->utf8->canonical->encode (
3696 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3697 );
3334} 3698}
3335 3699
3336sub reload_treasures { 3700sub reload_treasures {
3337 load_resource_file "$DATADIR/treasures" 3701 load_resource_file "$DATADIR/treasures"
3338 or die "unable to load treasurelists\n"; 3702 or die "unable to load treasurelists\n";
3339} 3703}
3340 3704
3705sub reload_sound {
3706 trace "loading sound config from $DATADIR/sound\n";
3707
3708 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3709
3710 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3711 my $sound = $soundconf->{compat}[$_]
3712 or next;
3713
3714 my $face = cf::face::find "sound/$sound->[1]";
3715 cf::sound::set $sound->[0] => $face;
3716 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3717 }
3718
3719 while (my ($k, $v) = each %{$soundconf->{event}}) {
3720 my $face = cf::face::find "sound/$v";
3721 cf::sound::set $k => $face;
3722 }
3723}
3724
3341sub reload_resources { 3725sub reload_resources {
3342 warn "reloading resource files...\n"; 3726 trace "reloading resource files...\n";
3343 3727
3728 reload_materials;
3344 reload_facedata; 3729 reload_facedata;
3730 reload_exp_table;
3731 reload_sound;
3345 reload_archetypes; 3732 reload_archetypes;
3346 reload_regions; 3733 reload_regions;
3347 reload_treasures; 3734 reload_treasures;
3348 3735
3349 warn "finished reloading resource files\n"; 3736 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358} 3737}
3359 3738
3360sub reload_config { 3739sub reload_config {
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3740 trace "reloading config file...\n";
3362 or return;
3363 3741
3364 local $/; 3742 my $config = load_file "$CONFDIR/config";
3365 *CFG = YAML::Load <$fh>; 3743 utf8::decode $config;
3744 *CFG = decode_yaml $config;
3366 3745
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3368 3747
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3371 3750
3372 if (exists $CFG{mlockall}) { 3751 if (exists $CFG{mlockall}) {
3395 3774
3396 seek $fh, 0, 0; 3775 seek $fh, 0, 0;
3397 print $fh $$; 3776 print $fh $$;
3398} 3777}
3399 3778
3779sub main_loop {
3780 trace "EV::loop starting\n";
3781 if (1) {
3782 EV::loop;
3783 }
3784 trace "EV::loop returned\n";
3785 goto &main_loop unless $REALLY_UNLOOP;
3786}
3787
3400sub main { 3788sub main {
3401 atomic; 3789 cf::init_globals; # initialise logging
3790
3791 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3792 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3793 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3794 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3795
3796 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3797
3403 # we must not ever block the main coroutine 3798 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3799 $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3800 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3801 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3802 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3803 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3804 })->prio (Coro::PRIO_MAX);
3410 }; 3805 };
3411 3806
3412 { 3807 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3808
3809 cf::sync_job {
3810 cf::incloader::init ();
3811
3812 db_init;
3813
3814 cf::init_anim;
3815 cf::init_attackmess;
3816 cf::init_dynamic;
3817
3818 cf::load_settings;
3819
3820 reload_resources;
3414 reload_config; 3821 reload_config;
3415 db_init; 3822
3823 cf::init_uuid;
3824 cf::init_signals;
3825 cf::init_skills;
3826
3827 cf::init_beforeplay;
3828
3829 atomic;
3830
3416 load_extensions; 3831 load_extensions;
3417 3832
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3833 utime time, time, $RUNTIMEFILE;
3422 3834
3423 # no (long-running) fork's whatsoever before this point(!) 3835 # no (long-running) fork's whatsoever before this point(!)
3836 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3837 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3838
3426 EV::loop; 3839 cf::_post_init 0;
3840 };
3841
3842 cf::object::thawer::errors_are_fatal 0;
3843 info "parse errors in files are no longer fatal from this point on.\n";
3844
3845 AE::postpone {
3846 undef &main; # free gobs of memory :)
3847 };
3848
3849 goto &main_loop;
3427} 3850}
3428 3851
3429############################################################################# 3852#############################################################################
3430# initialisation and cleanup 3853# initialisation and cleanup
3431 3854
3432# install some emergency cleanup handlers 3855# install some emergency cleanup handlers
3433BEGIN { 3856BEGIN {
3434 our %SIGWATCHER = (); 3857 our %SIGWATCHER = ();
3435 for my $signal (qw(INT HUP TERM)) { 3858 for my $signal (qw(INT HUP TERM)) {
3436 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3859 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3437 cf::cleanup "SIG$signal"; 3860 cf::cleanup "SIG$signal";
3438 }; 3861 };
3439 } 3862 }
3440} 3863}
3441 3864
3442sub write_runtime_sync { 3865sub write_runtime_sync {
3866 my $t0 = AE::time;
3867
3443 # first touch the runtime file to show we are still running: 3868 # first touch the runtime file to show we are still running:
3444 # the fsync below can take a very very long time. 3869 # the fsync below can take a very very long time.
3445 3870
3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3871 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3447 3872
3448 my $guard = cf::lock_acquire "write_runtime"; 3873 my $guard = cf::lock_acquire "write_runtime";
3449 3874
3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3875 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3451 or return; 3876 or return;
3452 3877
3453 my $value = $cf::RUNTIME + 90 + 10; 3878 my $value = $cf::RUNTIME + 90 + 10;
3454 # 10 is the runtime save interval, for a monotonic clock 3879 # 10 is the runtime save interval, for a monotonic clock
3455 # 60 allows for the watchdog to kill the server. 3880 # 60 allows for the watchdog to kill the server.
3468 or return; 3893 or return;
3469 3894
3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3895 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3471 and return; 3896 and return;
3472 3897
3473 warn "runtime file written.\n"; 3898 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3474 3899
3475 1 3900 1
3476} 3901}
3477 3902
3478our $uuid_lock; 3903our $uuid_lock;
3487 my $uuid = "$LOCALDIR/uuid"; 3912 my $uuid = "$LOCALDIR/uuid";
3488 3913
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3914 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3915 or return;
3491 3916
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3917 my $value = uuid_seq uuid_cur;
3918
3919 unless ($value) {
3920 info "cowardly refusing to write zero uuid value!\n";
3921 return;
3922 }
3923
3924 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3925 $uuid_skip = 0;
3494 3926
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3927 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3928 and return;
3497 3929
3503 or return; 3935 or return;
3504 3936
3505 aio_rename "$uuid~", $uuid 3937 aio_rename "$uuid~", $uuid
3506 and return; 3938 and return;
3507 3939
3508 warn "uuid file written ($value).\n"; 3940 trace "uuid file written ($value).\n";
3509 3941
3510 1 3942 1
3511 3943
3512} 3944}
3513 3945
3519} 3951}
3520 3952
3521sub emergency_save() { 3953sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3954 my $freeze_guard = cf::freeze_mainloop;
3523 3955
3524 warn "enter emergency perl save\n"; 3956 info "emergency_perl_save: enter\n";
3957
3958 # this is a trade-off: we want to be very quick here, so
3959 # save all maps without fsync, and later call a global sync
3960 # (which in turn might be very very slow)
3961 local $USE_FSYNC = 0;
3525 3962
3526 cf::sync_job { 3963 cf::sync_job {
3964 cf::write_runtime_sync; # external watchdog should not bark
3965
3527 # use a peculiar iteration method to avoid tripping on perl 3966 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3967 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3968 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3969 info "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3970 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3971 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3972 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3973 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3974 $pl->save;
3536 } 3975 }
3537 warn "end emergency player save\n"; 3976 info "emergency_perl_save: end player save\n";
3538 3977
3539 warn "begin emergency map save\n"; 3978 cf::write_runtime_sync; # external watchdog should not bark
3979
3980 info "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3981 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3982 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3983 $map->valid or next;
3543 $map->save; 3984 $map->save;
3544 } 3985 }
3545 warn "end emergency map save\n"; 3986 info "emergency_perl_save: end map save\n";
3546 3987
3547 warn "begin emergency database checkpoint\n"; 3988 cf::write_runtime_sync; # external watchdog should not bark
3989
3990 info "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3991 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3992 info "emergency_perl_save: end database checkpoint\n";
3550 3993
3551 warn "begin write uuid\n"; 3994 info "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3995 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3996 info "emergency_perl_save: end write uuid\n";
3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 trace "emergency_perl_save: syncing database to disk";
4001 BDB::db_env_txn_checkpoint $DB_ENV;
4002
4003 info "emergency_perl_save: starting sync\n";
4004 IO::AIO::aio_sync sub {
4005 info "emergency_perl_save: finished sync\n";
4006 };
4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 trace "emergency_perl_save: flushing outstanding aio requests";
4011 while (IO::AIO::nreqs || BDB::nreqs) {
4012 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4013 }
4014
4015 cf::write_runtime_sync; # external watchdog should not bark
3554 }; 4016 };
3555 4017
3556 warn "leave emergency perl save\n"; 4018 info "emergency_perl_save: leave\n";
3557} 4019}
3558 4020
3559sub post_cleanup { 4021sub post_cleanup {
3560 my ($make_core) = @_; 4022 my ($make_core) = @_;
3561 4023
4024 IO::AIO::flush;
4025
3562 warn Carp::longmess "post_cleanup backtrace" 4026 error Carp::longmess "post_cleanup backtrace"
3563 if $make_core; 4027 if $make_core;
3564 4028
3565 my $fh = pidfile; 4029 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$; 4030 unlink $PIDFILE if <$fh> == $$;
3567} 4031}
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4051 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 4052 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 4053 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4054# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 4055 }
3592 warn "cleared package #$pkg\n";#d#
3593} 4056}
3594
3595our $RELOAD; # how many times to reload
3596 4057
3597sub do_reload_perl() { 4058sub do_reload_perl() {
3598 # can/must only be called in main 4059 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 4060 unless (in_main) {
3600 warn "can only reload from main coroutine"; 4061 error "can only reload from main coroutine";
3601 return; 4062 return;
3602 } 4063 }
3603 4064
3604 return if $RELOAD++; 4065 return if $RELOAD++;
3605 4066
4067 my $t1 = AE::time;
4068
3606 while ($RELOAD) { 4069 while ($RELOAD) {
3607 warn "reloading..."; 4070 cf::get_slot 0.1, -1, "reload_perl";
4071 info "perl_reload: reloading...";
3608 4072
3609 warn "entering sync_job"; 4073 trace "perl_reload: entering sync_job";
3610 4074
3611 cf::sync_job { 4075 cf::sync_job {
3612 cf::write_runtime_sync; # external watchdog should not bark
3613 cf::emergency_save; 4076 #cf::emergency_save;
3614 cf::write_runtime_sync; # external watchdog should not bark
3615 4077
3616 warn "syncing database to disk";
3617 BDB::db_env_txn_checkpoint $DB_ENV;
3618
3619 # if anything goes wrong in here, we should simply crash as we already saved
3620
3621 warn "flushing outstanding aio requests";
3622 while (IO::AIO::nreqs || BDB::nreqs) {
3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3624 }
3625
3626 warn "cancelling all extension coros"; 4078 trace "perl_reload: cancelling all extension coros";
3627 $_->cancel for values %EXT_CORO; 4079 $_->cancel for values %EXT_CORO;
3628 %EXT_CORO = (); 4080 %EXT_CORO = ();
3629 4081
3630 warn "removing commands"; 4082 trace "perl_reload: removing commands";
3631 %COMMAND = (); 4083 %COMMAND = ();
3632 4084
3633 warn "removing ext/exti commands"; 4085 trace "perl_reload: removing ext/exti commands";
3634 %EXTCMD = (); 4086 %EXTCMD = ();
3635 %EXTICMD = (); 4087 %EXTICMD = ();
3636 4088
3637 warn "unloading/nuking all extensions"; 4089 trace "perl_reload: unloading/nuking all extensions";
3638 for my $pkg (@EXTS) { 4090 for my $pkg (@EXTS) {
3639 warn "... unloading $pkg"; 4091 trace "... unloading $pkg";
3640 4092
3641 if (my $cb = $pkg->can ("unload")) { 4093 if (my $cb = $pkg->can ("unload")) {
3642 eval { 4094 eval {
3643 $cb->($pkg); 4095 $cb->($pkg);
3644 1 4096 1
3645 } or warn "$pkg unloaded, but with errors: $@"; 4097 } or error "$pkg unloaded, but with errors: $@";
3646 } 4098 }
3647 4099
3648 warn "... clearing $pkg"; 4100 trace "... clearing $pkg";
3649 clear_package $pkg; 4101 clear_package $pkg;
3650 } 4102 }
3651 4103
3652 warn "unloading all perl modules loaded from $LIBDIR"; 4104 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) { 4105 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4106 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655 4107
3656 warn "... unloading $k"; 4108 trace "... unloading $k";
3657 delete $INC{$k}; 4109 delete $INC{$k};
3658 4110
3659 $k =~ s/\.pm$//; 4111 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g; 4112 $k =~ s/\//::/g;
3661 4113
3664 } 4116 }
3665 4117
3666 clear_package $k; 4118 clear_package $k;
3667 } 4119 }
3668 4120
3669 warn "getting rid of safe::, as good as possible"; 4121 trace "perl_reload: getting rid of safe::, as good as possible";
3670 clear_package "safe::$_" 4122 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4123 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 4124
3673 warn "unloading cf.pm \"a bit\""; 4125 trace "perl_reload: unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 4126 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 4127 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 4128
3677 # don't, removes xs symbols, too, 4129 # don't, removes xs symbols, too,
3678 # and global variables created in xs 4130 # and global variables created in xs
3679 #clear_package __PACKAGE__; 4131 #clear_package __PACKAGE__;
3680 4132
3681 warn "unload completed, starting to reload now"; 4133 info "perl_reload: unload completed, starting to reload now";
3682 4134
3683 warn "reloading cf.pm"; 4135 trace "perl_reload: reloading cf.pm";
3684 require cf; 4136 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4137 cf::_connect_to_perl_1;
3686 4138
3687 warn "loading config and database again"; 4139 trace "perl_reload: loading config and database again";
3688 cf::reload_config; 4140 cf::reload_config;
3689 4141
3690 warn "loading extensions"; 4142 trace "perl_reload: loading extensions";
3691 cf::load_extensions; 4143 cf::load_extensions;
3692 4144
4145 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 4146 trace "perl_reload: reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 4147 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 4148 trace "perl_reload: reattaching attachments to maps";
3696 reattach $_ for values %MAP; 4149 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 4150 trace "perl_reload: reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 4151 reattach $_ for values %PLAYER;
4152 }
3699 4153
3700 warn "leaving sync_job"; 4154 cf::_post_init 1;
4155
4156 trace "perl_reload: leaving sync_job";
3701 4157
3702 1 4158 1
3703 } or do { 4159 } or do {
3704 warn $@; 4160 error $@;
3705 cf::cleanup "error while reloading, exiting."; 4161 cf::cleanup "perl_reload: error, exiting.";
3706 }; 4162 };
3707 4163
3708 warn "reloaded";
3709 --$RELOAD; 4164 --$RELOAD;
3710 } 4165 }
4166
4167 $t1 = AE::time - $t1;
4168 info "perl_reload: completed in ${t1}s\n";
3711}; 4169};
3712 4170
3713our $RELOAD_WATCHER; # used only during reload 4171our $RELOAD_WATCHER; # used only during reload
3714 4172
3715sub reload_perl() { 4173sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 4174 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 4175 # coro crashes during coro_state_free->destroy here.
3718 4176
4177 $RELOAD_WATCHER ||= cf::async {
4178 Coro::AIO::aio_wait cache_extensions;
4179
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4180 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 4181 do_reload_perl;
3721 undef $RELOAD_WATCHER; 4182 undef $RELOAD_WATCHER;
4183 };
3722 }; 4184 };
3723} 4185}
3724 4186
3725register_command "reload" => sub { 4187register_command "reload" => sub {
3726 my ($who, $arg) = @_; 4188 my ($who, $arg) = @_;
3732 reload_perl; 4194 reload_perl;
3733 }; 4195 };
3734 } 4196 }
3735}; 4197};
3736 4198
3737unshift @INC, $LIBDIR; 4199#############################################################################
3738 4200
3739my $bug_warning = 0; 4201my $bug_warning = 0;
3740 4202
3741our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN;
3743
3744sub wait_for_tick { 4203sub wait_for_tick() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4204 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3746 4205
3747 my $signal = new Coro::Signal; 4206 $WAIT_FOR_TICK->wait;
3748 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait;
3750} 4207}
3751 4208
3752sub wait_for_tick_begin { 4209sub wait_for_tick_begin() {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 4210 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3754 4211
3755 my $signal = new Coro::Signal; 4212 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 4213 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 4214 $signal->wait;
3758} 4215}
3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4219 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3763 unless ++$bug_warning > 10; 4220 unless ++$bug_warning > 10;
3764 return; 4221 return;
3765 } 4222 }
3766 4223
3767 cf::server_tick; # one server iteration 4224 cf::one_tick; # one server iteration
4225
4226 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3768 4227
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4228 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4229 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 4230 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 4231 $Coro::current->{desc} = "runtime saver";
3773 write_runtime_sync 4232 write_runtime_sync
3774 or warn "ERROR: unable to write runtime file: $!"; 4233 or error "ERROR: unable to write runtime file: $!";
3775 }; 4234 };
3776 } 4235 }
3777 4236
3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4237 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3779 $sig->send; 4238 $sig->send;
3780 } 4239 }
3781 while (my $sig = shift @WAIT_FOR_TICK) { 4240 $WAIT_FOR_TICK->broadcast;
3782 $sig->send;
3783 }
3784 4241
3785 $LOAD = ($NOW - $TICK_START) / $TICK; 4242 $LOAD = ($NOW - $TICK_START) / $TICK;
3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4243 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3787 4244
3788 if (0) { 4245 if (0) {
3789 if ($NEXT_TICK) { 4246 if ($NEXT_TICK) {
3790 my $jitter = $TICK_START - $NEXT_TICK; 4247 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4248 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d# 4249 debug "jitter $JITTER\n";#d#
3793 } 4250 }
3794 } 4251 }
3795} 4252}
3796 4253
3797{ 4254{
3798 # configure BDB 4255 # configure BDB
4256 info "initialising database";
3799 4257
3800 BDB::min_parallel 8; 4258 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 4259 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 4260 #$AnyEvent::BDB::WATCHER->priority (1);
3803 4261
3804 unless ($DB_ENV) { 4262 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 4263 $DB_ENV = BDB::db_env_create;
3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4264 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4265 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4290 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3833 }; 4291 };
3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4292 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4293 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3836 }; 4294 };
4295
4296 info "database initialised";
3837} 4297}
3838 4298
3839{ 4299{
3840 # configure IO::AIO 4300 # configure IO::AIO
3841 4301
4302 info "initialising aio";
3842 IO::AIO::min_parallel 8; 4303 IO::AIO::min_parallel 8;
3843 IO::AIO::max_poll_time $TICK * 0.1; 4304 IO::AIO::max_poll_time $TICK * 0.1;
3844 undef $AnyEvent::AIO::WATCHER; 4305 undef $AnyEvent::AIO::WATCHER;
4306 info "aio initialised";
3845} 4307}
3846 4308
3847my $_log_backtrace; 4309our $_log_backtrace;
4310our $_log_backtrace_last;
3848 4311
3849sub _log_backtrace { 4312sub _log_backtrace {
3850 my ($msg, @addr) = @_; 4313 my ($msg, @addr) = @_;
3851 4314
3852 $msg =~ s/\n//; 4315 $msg =~ s/\n$//;
3853 4316
4317 if ($_log_backtrace_last eq $msg) {
4318 LOG llevInfo, "[ABT] $msg\n";
4319 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3854 # limit the # of concurrent backtraces 4320 # limit the # of concurrent backtraces
3855 if ($_log_backtrace < 2) { 4321 } elsif ($_log_backtrace < 2) {
4322 $_log_backtrace_last = $msg;
3856 ++$_log_backtrace; 4323 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg; 4324 my $perl_bt = Carp::longmess $msg;
3858 async { 4325 async {
3859 $Coro::current->{desc} = "abt $msg"; 4326 $Coro::current->{desc} = "abt $msg";
3860 4327
3880 LOG llevInfo, "[ABT] $_\n" for @bt; 4347 LOG llevInfo, "[ABT] $_\n" for @bt;
3881 --$_log_backtrace; 4348 --$_log_backtrace;
3882 }; 4349 };
3883 } else { 4350 } else {
3884 LOG llevInfo, "[ABT] $msg\n"; 4351 LOG llevInfo, "[ABT] $msg\n";
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4352 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3886 } 4353 }
3887} 4354}
3888 4355
3889# load additional modules 4356# load additional modules
3890use cf::pod; 4357require "cf/$_.pm" for @EXTRA_MODULES;
4358cf::_connect_to_perl_2;
3891 4359
3892END { cf::emergency_save } 4360END { cf::emergency_save }
3893 4361
38941 43621
3895 4363

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines