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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines