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.422 by root, Tue Apr 15 20:46:55 2008 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 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# <http://www.gnu.org/licenses/>.
18# 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 Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
107 134
108our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
110our $NOW; 138our $NOW;
111 139
112our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 149our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
123 151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
159
124binmode STDOUT; 160binmode STDOUT;
125binmode STDERR; 161binmode STDERR;
126 162
127# read virtual server time, if available 163# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
132} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
133 171
134mkdir $_ 172mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 174
137our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
138 176
139sub cf::map::normalise; 177sub cf::map::normalise;
140 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
141############################################################################# 183#############################################################################
142 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
143=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
144 197
145=over 4 198=over 4
146 199
147=item $cf::UPTIME 200=item $cf::UPTIME
148 201
149The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
150 218
151=item $cf::RUNTIME 219=item $cf::RUNTIME
152 220
153The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
154every server tick. 222every server tick.
160Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
163database environment. 231database environment.
164 232
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 233=item $cf::LOADAVG
174 234
175The current CPU load on the server (alpha-smoothed), as a value between 0 235The 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 236(none) and 1 (overloaded), indicating how much time is spent on processing
177objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
186from wherever your confdir points to. 246from wherever your confdir points to.
187 247
188=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
189 249
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These 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 251returns 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. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
194=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
195 272
196This array contains the results of the last C<invoke ()> call. When 273This 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 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 275that call.
199 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
200=back 283=back
201 284
202=cut 285=cut
203 286
204BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 294 my $msg = join "", @_;
207 295
208 $msg .= "\n" 296 $msg .= "\n"
209 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
210 298
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 300
213 LOG llevError, $msg; 301 LOG llevWarn, $msg;
214 }; 302};
215}
216 303
217$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
219 306
220 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 311 return;#d#
223 }#d# 312 }#d#
224 313
225 # kill coroutine otherwise 314 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 315 Coro::terminate
228}; 316};
229
230$SIG{__DIE__} = sub { }; #d#?
231 317
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 328for my $pkg (qw(
243 cf::global cf::attachable 329 cf::global cf::attachable
244 cf::object cf::object::player 330 cf::object cf::object::player
245 cf::client cf::player 331 cf::client cf::player
246 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
247 cf::map cf::party cf::region 334 cf::party cf::region
248)) { 335)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 337}
252 338
253$EV::DIED = sub { 339$EV::DIED = sub {
254 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
255}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
256 347
257############################################################################# 348#############################################################################
258 349
259=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
260 351
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 373 $d
283 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
284} 375}
285 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
286=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
287 430
288Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
289 432
290=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 440
298sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
300 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
475=item cf::post_init { BLOCK }
476
477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
478but I<before> the server starts ticking again.
479
480The codeblock will have a single boolean argument to indicate whether this
481is a reload or not.
482
483=cut
484
485sub post_init(&) {
486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
504}
505
301=item cf::lock_wait $string 506=item cf::lock_wait $string
302 507
303Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
304 509
305=item my $lock = cf::lock_acquire $string 510=item my $lock = cf::lock_acquire $string
306 511
307Wait until the given lock is available and then acquires it and returns 512Wait 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, 513a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 514for example when the coroutine gets canceled), the lock is automatically
310returned. 515returned.
311 516
312Locks are *not* recursive, locking from the same coro twice results in a 517Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 518deadlocked coro.
319 524
320Return true if the lock is currently active, i.e. somebody has locked it. 525Return true if the lock is currently active, i.e. somebody has locked it.
321 526
322=cut 527=cut
323 528
324our %LOCK; 529our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 530
327sub lock_wait($) { 531sub lock_wait($) {
328 my ($key) = @_; 532 $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} 533}
341 534
342sub lock_acquire($) { 535sub lock_acquire($) {
343 my ($key) = @_; 536 $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} 537}
357 538
358sub lock_active($) { 539sub lock_active($) {
359 my ($key) = @_; 540 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 541}
363 542
364sub freeze_mainloop { 543sub freeze_mainloop {
365 tick_inhibit_inc; 544 tick_inhibit_inc;
366 545
367 Coro::guard \&tick_inhibit_dec; 546 &Guard::guard (\&tick_inhibit_dec);
368} 547}
369 548
370=item cf::periodic $interval, $cb 549=item cf::periodic $interval, $cb
371 550
372Like EV::periodic, but randomly selects a starting point so that the actions 551Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 552get spread over time.
374 553
375=cut 554=cut
376 555
377sub periodic($$) { 556sub periodic($$) {
378 my ($interval, $cb) = @_; 557 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
383} 562}
384 563
385=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
386 565
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 567(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. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
390 573
391The optional C<$name> can be used to identify the job to run. It might be 574The 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. 575used for statistical purposes and should identify the same time-class.
393 576
394Useful for short background jobs. 577Useful for short background jobs.
395 578
396=cut 579=cut
397 580
398our @SLOT_QUEUE; 581our @SLOT_QUEUE;
399our $SLOT_QUEUE; 582our $SLOT_QUEUE;
583our $SLOT_DECAY = 0.9;
400 584
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 585$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 586$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 587 $Coro::current->desc ("timeslot manager");
404 588
405 my $signal = new Coro::Signal; 589 my $signal = new Coro::Signal;
590 my $busy;
406 591
407 while () { 592 while () {
408 next_job: 593 next_job:
594
409 my $avail = cf::till_tick; 595 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 596
411 for (0 .. $#SLOT_QUEUE) { 597 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 598 if ($SLOT_QUEUE[$_][0] <= $avail) {
599 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 600 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 601 $job->[2]->send;
415 Coro::cede; 602 Coro::cede;
416 goto next_job; 603 goto next_job;
417 } 604 } else {
605 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 606 }
419 } 607 }
420 608
421 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 612 } else {
613 $busy = 0;
426 Coro::schedule; 614 Coro::schedule;
427 } 615 }
428 } 616 }
429}; 617};
430 618
431sub get_slot($;$$) { 619sub get_slot($;$$) {
432 return if tick_inhibit; 620 return if tick_inhibit || $Coro::current == $Coro::main;
433 621
434 my ($time, $pri, $name) = @_; 622 my ($time, $pri, $name) = @_;
435 623
436 $time = $TICK * .6 if $time > $TICK * .6; 624 $time = clamp $time, 0.01, $TICK * .6;
625
437 my $sig = new Coro::Signal; 626 my $sig = new Coro::Signal;
438 627
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 628 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 629 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 630 $SLOT_QUEUE->ready;
467=cut 656=cut
468 657
469sub sync_job(&) { 658sub sync_job(&) {
470 my ($job) = @_; 659 my ($job) = @_;
471 660
472 if ($Coro::current == $Coro::main) { 661 if (in_main) {
473 my $time = EV::time; 662 my $time = AE::time;
474 663
475 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
477 666
478 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
479 668
480 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
481 670
482 my $busy = 1; 671 my $busy = 1;
483 my @res; 672 my @res;
484 673
485 (async { 674 (async {
486 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 676 @res = eval { $job->() };
488 warn $@ if $@; 677 error $@ if $@;
489 undef $busy; 678 undef $busy;
490 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
491 680
492 while ($busy) { 681 while ($busy) {
493 if (Coro::nready) { 682 if (Coro::nready) {
495 } else { 684 } else {
496 EV::loop EV::LOOP_ONESHOT; 685 EV::loop EV::LOOP_ONESHOT;
497 } 686 }
498 } 687 }
499 688
500 my $time = EV::time - $time; 689 my $time = AE::time - $time;
501 690
502 $TICK_START += $time; # do not account sync jobs to server load 691 $TICK_START += $time; # do not account sync jobs to server load
503 692
504 wantarray ? @res : $res[0] 693 wantarray ? @res : $res[0]
505 } else { 694 } else {
527 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
528 717
529 $coro 718 $coro
530} 719}
531 720
532=item fork_call { }, $args 721=item fork_call { }, @args
533 722
534Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 726never block itself or use any form of event handling.
538 727
539=cut 728=cut
540 729
730sub post_fork {
731 reset_signals;
732}
733
541sub fork_call(&@) { 734sub fork_call(&@) {
542 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
543 736
544 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
547 740
548 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
549 reset_signals; 742 cf::post_fork;
550 &$cb 743 &$cb
551 }, @args; 744 } @args;
552 745
553 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
747}
748
749sub objinfo {
750 (
751 "counter value" => cf::object::object_count,
752 "objects created" => cf::object::create_count,
753 "objects destroyed" => cf::object::destroy_count,
754 "freelist size" => cf::object::free_count,
755 "allocated objects" => cf::object::objects_size,
756 "active objects" => cf::object::actives_size,
757 )
554} 758}
555 759
556=item $coin = coin_from_name $name 760=item $coin = coin_from_name $name
557 761
558=cut 762=cut
595within each server. 799within each server.
596 800
597=cut 801=cut
598 802
599sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
600 my ($name) = @_; 807 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
602 809
603 eval { 810 eval {
604 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
614} 821}
615 822
616our $DB; 823our $DB;
617 824
618sub db_init { 825sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
621 };
622} 827}
623 828
624sub db_get($$) { 829sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
626 831
627 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
628 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
629 836
630 $! ? () 837 $! ? ()
631 : $data 838 : $data
632 }
633} 839}
634 840
635sub db_put($$$) { 841sub db_put($$$) {
636 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 871
666 my @data; 872 my @data;
667 my $md5; 873 my $md5;
668 874
669 for (0 .. $#$src) { 875 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 877 }
673 878
674 # if processing is expensive, check 879 # if processing is expensive, check
675 # checksum first 880 # checksum first
676 if (1) { 881 if (1) {
693 898
694 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 900 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
697 902
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 904
700 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
703 908
713 918
714=cut 919=cut
715 920
716sub datalog($@) { 921sub datalog($@) {
717 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 924}
720 925
721=back 926=back
722 927
723=cut 928=cut
724 929
725############################################################################# 930#############################################################################
726 931
727=head2 ATTACHABLE OBJECTS 932=head2 ATTACHABLE OBJECTS
728 933
729Many objects in crossfire are so-called attachable objects. That means you can 934Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 935attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 936to it. All such attachable objects support the following methods.
732 937
733In the following description, CLASS can be any of C<global>, C<object> 938In 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 939C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 989=item cf::CLASS::attachment $name, ...
785 990
786Register an attachment by C<$name> through which attachable objects of the 991Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 992given CLASS can refer to this attachment.
788 993
789Some classes such as crossfire maps and objects can specify attachments 994Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 995that are attached at load/instantiate time, thus the need for a name.
791 996
792These calls expect any number of the following handler/hook descriptions: 997These calls expect any number of the following handler/hook descriptions:
793 998
794=over 4 999=over 4
918 1123
919 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1126
922 } elsif (ref $type) { 1127 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
924 1129
925 } else { 1130 } else {
926 shift @arg; 1131 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
928 } 1133 }
929 } 1134 }
930} 1135}
931 1136
932sub _object_attach { 1137sub _object_attach {
942 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
943 } 1148 }
944 1149
945 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
946 } else { 1151 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1153 }
949 1154
950 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
951} 1156}
952 1157
1011 1216
1012 for (@$callbacks) { 1217 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
1014 1219
1015 if ($@) { 1220 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1222 override;
1019 } 1223 }
1020 1224
1021 return 1 if $override; 1225 return 1 if $override;
1022 } 1226 }
1085 1289
1086sub reattach { 1290sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1291 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1292 my ($obj) = @_;
1089 1293
1294 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1295 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1296
1092 my $registry = $obj->registry; 1297 my $registry = $obj->registry;
1093 1298
1094 @$registry = (); 1299 @$registry = ();
1095 1300
1100 for (@$attach) { 1305 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1103 } 1308 }
1104 } else { 1309 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1311 }
1107 } 1312 }
1108} 1313}
1109 1314
1110cf::attachable->attach ( 1315cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1138 1343
1139 sync_job { 1344 sync_job {
1140 if (length $$rdata) { 1345 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1144 1350
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1352 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1354 if ($cf::USE_FSYNC) {
1355 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;
1356 aio_fsync $fh;
1357 }
1149 close $fh; 1358 aio_close $fh;
1150 1359
1151 if (@$objs) { 1360 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1361 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1362 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1363 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1364 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1365 if ($cf::USE_FSYNC) {
1366 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;
1367 aio_fsync $fh;
1368 }
1157 close $fh; 1369 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1370 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1371 }
1160 } else { 1372 } else {
1161 aio_unlink "$filename.pst"; 1373 aio_unlink "$filename.pst";
1162 } 1374 }
1163 1375
1164 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1377
1378 $filename =~ s%/[^/]+$%%;
1379 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1380 } else {
1166 warn "FATAL: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1167 } 1382 }
1168 } else { 1383 } else {
1169 aio_unlink $filename; 1384 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1171 } 1386 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1411 $av = $st->{objs};
1197 } 1412 }
1198 1413
1199 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1202 1418
1203 ($data, $av) 1419 ($data, $av)
1204} 1420}
1205 1421
1206=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1478 my ($name, $cb) = @_;
1263 1479
1264 $EXTICMD{$name} = $cb; 1480 $EXTICMD{$name} = $cb;
1265} 1481}
1266 1482
1483use File::Glob ();
1484
1267cf::player->attach ( 1485cf::player->attach (
1268 on_command => sub { 1486 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1487 my ($pl, $name, $params) = @_;
1270 1488
1271 my $cb = $COMMAND{$name} 1489 my $cb = $COMMAND{$name}
1272 or return; 1490 or return;
1273 1491
1281 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1282 1500
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1502
1285 if (ref $msg) { 1503 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1504 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 1505
1291 my @reply; 1506 my @reply;
1292 1507
1293 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1294 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
1296 1511
1297 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1513 if $reply;
1299 1514
1300 } else { 1515 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1517 }
1303 1518
1304 cf::override; 1519 cf::override;
1305 }, 1520 },
1306); 1521);
1307 1522
1523# "readahead" all extensions
1524sub cache_extensions {
1525 my $grp = IO::AIO::aio_group;
1526
1527 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1528 for (grep /\.ext$/, @{$_[0]}) {
1529 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1530 }
1531 };
1532
1533 $grp
1534}
1535
1308sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1309 cf::sync_job { 1539 cf::sync_job {
1310 my %todo; 1540 my %todo;
1311 1541
1312 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1543 next unless -r $path;
1331 1561
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1564
1335 $ext{source} = 1565 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1338 . $source 1568 . $source
1339 . "\n};\n1"; 1569 . "\n};\n1";
1340 1570
1341 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
1342 } 1572 }
1343 1573
1574 my $pass = 0;
1344 my %done; 1575 my %done;
1345 while (%todo) { 1576 while (%todo) {
1346 my $progress; 1577 my $progress;
1347 1578
1579 ++$pass;
1580
1581 ext:
1348 while (my ($k, $v) = each %todo) { 1582 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1584 next ext
1351 unless exists $done{$_}; 1585 unless exists $done{$_};
1352 } 1586 }
1353 1587
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1589
1356 unless (eval $v->{source}) { 1590 my $active = eval $v->{source};
1591
1592 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1593 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1594
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1596 if exists $v->{meta}{mandatory};
1364 1597
1365 warn $msg; 1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1599 delete $todo{$k};
1600 } else {
1601 $done{$k} = delete $todo{$k};
1602 push @EXTS, $v->{pkg};
1603 $progress = 1;
1604
1605 info "$v->{base}: extension inactive.\n"
1606 unless $active;
1366 } 1607 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1608 }
1372 1609
1373 skip: 1610 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1611 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1612
1613 while (my ($k, $v) = each %todo) {
1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1615 if exists $v->{meta}{mandatory};
1616 }
1617
1618 last;
1619 }
1376 } 1620 }
1377 }; 1621 };
1378} 1622}
1379 1623
1380############################################################################# 1624#############################################################################
1381 1625
1382=back 1626=back
1383 1627
1384=head2 CORE EXTENSIONS 1628=head2 CORE EXTENSIONS
1385 1629
1386Functions and methods that extend core crossfire objects. 1630Functions and methods that extend core deliantra objects.
1387 1631
1388=cut 1632=cut
1389 1633
1390package cf::player; 1634package cf::player;
1391 1635
1434 1678
1435sub exists($) { 1679sub exists($) {
1436 my ($login) = @_; 1680 my ($login) = @_;
1437 1681
1438 $cf::PLAYER{$login} 1682 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1683 or !aio_stat path $login
1440} 1684}
1441 1685
1442sub find($) { 1686sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1687 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1688 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1700 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1701 or return;
1458 1702
1459 my $pl = cf::player::load_pl $f 1703 my $pl = cf::player::load_pl $f
1460 or return; 1704 or return;
1705
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1706 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1707 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1708 $cf::PLAYER{$login} = $pl
1464 } 1709 }
1465 } 1710 }
1466} 1711}
1467 1712
1713cf::player->attach (
1714 on_load => sub {
1715 my ($pl, $path) = @_;
1716
1717 # restore slots saved in save, below
1718 my $slots = delete $pl->{_slots};
1719
1720 $pl->ob->current_weapon ($slots->[0]);
1721 $pl->combat_ob ($slots->[1]);
1722 $pl->ranged_ob ($slots->[2]);
1723 },
1724);
1725
1468sub save($) { 1726sub save($) {
1469 my ($pl) = @_; 1727 my ($pl) = @_;
1470 1728
1471 return if $pl->{deny_save}; 1729 return if $pl->{deny_save};
1472 1730
1477 1735
1478 aio_mkdir playerdir $pl, 0770; 1736 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1737 $pl->{last_save} = $cf::RUNTIME;
1480 1738
1481 cf::get_slot 0.01; 1739 cf::get_slot 0.01;
1740
1741 # save slots, to be restored later
1742 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1743
1483 $pl->save_pl ($path); 1744 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1745 cf::cede_to_tick;
1485} 1746}
1486 1747
1518 my ($pl) = @_; 1779 my ($pl) = @_;
1519 1780
1520 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1521 1782
1522 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1785
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1787 $pl->deactivate;
1788
1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1528 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1529 1794
1530 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
1570 1835
1571 for my $login (@$dirs) { 1836 for my $login (@$dirs) {
1572 my $path = path $login; 1837 my $path = path $login;
1573 1838
1574 # a .pst is a dead give-away for a valid player 1839 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1840 # if no pst file found, open and chekc for blocked users
1841 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1842 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1843 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1844 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1845 }
1580 1846
1584 1850
1585 \@logins 1851 \@logins
1586} 1852}
1587 1853
1588=item $player->maps 1854=item $player->maps
1855
1856=item cf::player::maps $login
1589 1857
1590Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1591player. May block. 1859player. May block.
1592 1860
1593=cut 1861=cut
1611 } 1879 }
1612 1880
1613 \@paths 1881 \@paths
1614} 1882}
1615 1883
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1884=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1885
1618Expand crossfire pod fragments into protocol xml. 1886Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1887
1709=item $player->ext_reply ($msgid, @msg) 1888=item $player->ext_reply ($msgid, @msg)
1710 1889
1711Sends an ext reply to the player. 1890Sends an ext reply to the player.
1712 1891
1744 1923
1745=cut 1924=cut
1746 1925
1747sub find_by_path($) { 1926sub find_by_path($) {
1748 my ($path) = @_; 1927 my ($path) = @_;
1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1749 1930
1750 my ($match, $specificity); 1931 my ($match, $specificity);
1751 1932
1752 for my $region (list) { 1933 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1782sub generate_random_map { 1963sub generate_random_map {
1783 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1784 1965
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1967
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1969}
1802 1970
1803=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1804 1972
1805Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
1810 1978
1811sub register { 1979sub register {
1812 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1981 my $pkg = caller;
1814 1982
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1984
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1986}
1820 1987
1821# also paths starting with '/' 1988# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1990
1824sub thawer_merge { 1991sub thawer_merge {
1825 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1826 1993
1827 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
1832} 1999}
1833 2000
1834sub normalise { 2001sub normalise {
1835 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1836 2003
1837 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1838 2005
1839 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1840 2007
1841 # map plan: 2008 # map plan:
1842 # 2009 #
1857 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2025 $path = "$base/$path";
1859 } 2026 }
1860 2027
1861 for ($path) { 2028 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1865 } 2031 }
1866 2032
1867 $path 2033 $path
1881 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1882 return $self; 2048 return $self;
1883 } 2049 }
1884 } 2050 }
1885 2051
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2053 ()
1888} 2054}
1889 2055
2056# may re-bless or do other evil things
1890sub init { 2057sub init {
1891 my ($self) = @_; 2058 my ($self) = @_;
1892 2059
1893 $self 2060 $self
1894} 2061}
1925 2092
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2093 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2094 "$UNIQUEDIR/$path"
1928} 2095}
1929 2096
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 2097sub decay_objects {
1940 my ($self) = @_; 2098 my ($self) = @_;
1941 2099
1942 return if $self->{deny_reset}; 2100 return if $self->{deny_reset};
1943 2101
1968 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1969 2127
1970 1 2128 1
1971} 2129}
1972 2130
2131# used to laod the header of an original map
1973sub load_header_orig { 2132sub load_header_orig {
1974 my ($self) = @_; 2133 my ($self) = @_;
1975 2134
1976 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1977} 2136}
1978 2137
2138# used to laod the header of an instantiated map
1979sub load_header_temp { 2139sub load_header_temp {
1980 my ($self) = @_; 2140 my ($self) = @_;
1981 2141
1982 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1983} 2143}
1984 2144
2145# called after loading the header from an instantiated map
1985sub prepare_temp { 2146sub prepare_temp {
1986 my ($self) = @_; 2147 my ($self) = @_;
1987 2148
1988 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1989 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1990 # safety 2151 # safety
1991 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1992 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1993} 2154}
1994 2155
2156# called after loading the header from an original map
1995sub prepare_orig { 2157sub prepare_orig {
1996 my ($self) = @_; 2158 my ($self) = @_;
1997 2159
1998 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1999 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
2023 2185
2024sub find; 2186sub find;
2025sub find { 2187sub find {
2026 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2027 2189
2190 cf::cede_to_tick;
2191
2028 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2029 2193
2030 cf::lock_wait "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2196
2033 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2198 my $map = new_from_path cf::map $path
2038 or return; 2199 or return;
2039 2200
2040 $map->{last_save} = $cf::RUNTIME; 2201 $map->{last_save} = $cf::RUNTIME;
2041 2202
2043 or return; 2204 or return;
2044 2205
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2206 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2207 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2208 #$cf::WAIT_FOR_TICK->wait;
2209 undef $guard2;
2048 undef $guard1; 2210 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2211 $map->reset;
2051 return find $path; 2212 return find $path;
2052 } 2213 }
2053 2214
2054 $cf::MAP{$path} = $map 2215 $cf::MAP{$path} = $map
2055 } 2216 }
2056} 2217}
2057 2218
2058sub pre_load { } 2219sub pre_load { }
2059sub post_load { } 2220#sub post_load { } # XS
2060 2221
2061sub load { 2222sub load {
2062 my ($self) = @_; 2223 my ($self) = @_;
2063 2224
2064 local $self->{deny_reset} = 1; # loading can take a long time 2225 local $self->{deny_reset} = 1; # loading can take a long time
2067 2228
2068 { 2229 {
2069 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2070 2231
2071 return unless $self->valid; 2232 return unless $self->valid;
2072 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2073
2074 $self->in_memory (cf::MAP_LOADING);
2075 2234
2076 $self->alloc; 2235 $self->alloc;
2077 2236
2078 $self->pre_load; 2237 $self->pre_load;
2079 cf::cede_to_tick; 2238 cf::cede_to_tick;
2080 2239
2240 if (exists $self->{load_path}) {
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2242 $f->skip_block;
2083 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2084 or return; 2244 or return;
2085 2245
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2246 $self->post_load_original
2087 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2088 2248
2089 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2250 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2093 $self->clear_unique_items; 2253 $self->clear_unique_items;
2094 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2096 } 2257 }
2097 } 2258 }
2098 }
2099 2259
2100 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2101 2267
2102 cf::cede_to_tick; 2268 cf::cede_to_tick;
2103 # now do the right thing for maps 2269 # now do the right thing for maps
2104 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2105 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
2109 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2276 $self->decay_objects;
2111 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2112 $self->update_buttons; 2278 $self->update_buttons;
2113 cf::cede_to_tick; 2279 cf::cede_to_tick;
2114 $self->set_darkness_map; 2280 #$self->activate; # no longer activate maps automatically
2115 cf::cede_to_tick;
2116 $self->activate;
2117 } 2281 }
2118 2282
2119 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2285 }
2124 2286
2125 $self->post_load; 2287 $self->post_load;
2126}
2127 2288
2289 1
2290}
2291
2292# customize the map for a given player, i.e.
2293# return the _real_ map. used by e.g. per-player
2294# maps to change the path to ~playername/mappath
2128sub customise_for { 2295sub customise_for {
2129 my ($self, $ob) = @_; 2296 my ($self, $ob) = @_;
2130 2297
2131 return find "~" . $ob->name . "/" . $self->{path} 2298 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2299 if $self->per_player;
2135# if $self->per_party; 2302# if $self->per_party;
2136 2303
2137 $self 2304 $self
2138} 2305}
2139 2306
2140# find and load all maps in the 3x3 area around a map
2141sub load_neighbours {
2142 my ($map) = @_;
2143
2144 my @neigh; # diagonal neighbours
2145
2146 for (0 .. 3) {
2147 my $neigh = $map->tile_path ($_)
2148 or next;
2149 $neigh = find $neigh, $map
2150 or next;
2151 $neigh->load;
2152
2153 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 }
2157
2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
2160 my $neigh = find $path, $origin
2161 or next;
2162 $neigh->load;
2163 }
2164}
2165
2166sub find_sync { 2307sub find_sync {
2167 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2168 2309
2169 cf::sync_job { find $path, $origin } 2310 # it's a bug to call this from the main context
2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2312 if $Coro::current == $Coro::main;
2313
2314 find $path, $origin
2170} 2315}
2171 2316
2172sub do_load_sync { 2317sub do_load_sync {
2173 my ($map) = @_; 2318 my ($map) = @_;
2174 2319
2320 # it's a bug to call this from the main context
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2177 2323
2178 cf::sync_job { $map->load }; 2324 $map->load;
2179} 2325}
2180 2326
2181our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2183 2329
2184sub find_async { 2330sub find_async {
2185 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2186 2332
2187 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2188 2334
2189 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2191 } 2337 }
2192 2338
2193 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2194 2340
2195 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
2209 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
2210 2356
2211 () 2357 ()
2212} 2358}
2213 2359
2360# common code, used by both ->save and ->swapout
2214sub save { 2361sub _save {
2215 my ($self) = @_; 2362 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2363
2219 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
2220 2365
2221 return unless $self->dirty; 2366 return unless $self->dirty;
2222 2367
2242 } else { 2387 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2388 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2389 }
2245} 2390}
2246 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
2247sub swap_out { 2400sub swap_out {
2248 my ($self) = @_; 2401 my ($self) = @_;
2249 2402
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
2255 return if $self->players; 2407 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2408
2409 # first deactivate the map and "unlink" it from the core
2410 $self->deactivate;
2411 $_->clear_links_to ($self) for values %cf::MAP;
2412 $self->state (cf::MAP_SWAPPED);
2413
2414 # then atomically save
2415 $self->_save;
2416
2417 # then free the map
2418 $self->clear;
2419}
2420
2421sub reset_at {
2422 my ($self) = @_;
2423
2424 # TODO: safety, remove and allow resettable per-player maps
2257 return if $self->{deny_save}; 2425 return 1e99 if $self->{deny_reset};
2258 2426
2427 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2428 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2429
2430 $time + $to
2431}
2432
2433sub should_reset {
2434 my ($self) = @_;
2435
2436 $self->reset_at <= $cf::RUNTIME
2437}
2438
2439sub reset {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 return if $self->players;
2445
2446 cf::trace "resetting map ", $self->path, "\n";
2447
2259 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2449
2450 # need to save uniques path
2451 unless ($self->{deny_save}) {
2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2453
2454 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2455 if $uniq;
2456 }
2457
2458 delete $cf::MAP{$self->path};
2260 2459
2261 $self->deactivate; 2460 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2461 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2462 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2463
2309 $self->unlink_save; 2464 $self->unlink_save;
2310 $self->destroy; 2465 $self->destroy;
2311} 2466}
2312 2467
2320 2475
2321 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
2322 2477
2323 $self->unlink_save; 2478 $self->unlink_save;
2324 2479
2325 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2485
2387 : normalise $_ 2542 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2543 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2544 ]
2390} 2545}
2391 2546
2547=item cf::map::static_maps
2548
2549Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2550file in the shared directory excluding F</styles> and F</editor>). May
2551block.
2552
2553=cut
2554
2555sub static_maps() {
2556 my @dirs = "";
2557 my @maps;
2558
2559 while (@dirs) {
2560 my $dir = shift @dirs;
2561
2562 next if $dir eq "/styles" || $dir eq "/editor";
2563
2564 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2565 or return;
2566
2567 for (@$files) {
2568 s/\.map$// or next;
2569 utf8::decode $_;
2570 push @maps, "$dir/$_";
2571 }
2572
2573 push @dirs, map "$dir/$_", @$dirs;
2574 }
2575
2576 \@maps
2577}
2578
2392=back 2579=back
2393 2580
2394=head3 cf::object 2581=head3 cf::object
2395 2582
2396=cut 2583=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2644can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2645dialogue with the given NPC character.
2459 2646
2460=cut 2647=cut
2461 2648
2649our $SAY_CHANNEL = {
2650 id => "say",
2651 title => "Map",
2652 reply => "say ",
2653 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2654};
2655
2656our $CHAT_CHANNEL = {
2657 id => "chat",
2658 title => "Chat",
2659 reply => "chat ",
2660 tooltip => "Player chat and shouts, global to the server.",
2661};
2662
2462# rough implementation of a future "reply" method that works 2663# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2664# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2665#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2666sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2667 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2678 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2679 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2680
2480 } else { 2681 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2682 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2683 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2684 }
2484 } 2685 }
2485} 2686}
2486 2687
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2688=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2713
2513=item $player_object->enter_link 2714=item $player_object->enter_link
2514 2715
2515Freezes the player and moves him/her to a special map (C<{link}>). 2716Freezes the player and moves him/her to a special map (C<{link}>).
2516 2717
2517The player should be reasonably safe there for short amounts of time. You 2718The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2719for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2720though, as the player cannot control the character while it is on the link
2721map.
2519 2722
2520Will never block. 2723Will never block.
2521 2724
2522=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
2523 2726
2543sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2544 my ($self) = @_; 2747 my ($self) = @_;
2545 2748
2546 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2547 2750
2751 ++$self->{_link_recursion};
2752
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2754
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2552 2757
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2759}
2555 2760
2556sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2558 2763
2575 ($x, $y) = (-1, -1) 2780 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2781 unless (defined $x) && (defined $y);
2577 2782
2578 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2581 2786
2582 $map->load; 2787 $map->load;
2583 $map->load_neighbours;
2584 2788
2585 return unless $self->contr->active; 2789 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2790
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2590} 2793 # entering was successful
2794 delete $self->{_link_recursion};
2795 # only activate afterwards, to support waiting in hooks
2796 $self->activate_recursive;
2797 }
2591 2798
2799}
2800
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2802
2594Moves the player to the given map-path and coordinates by first freezing 2803Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2805that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2806the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2807be called at the end of this process.
2599 2808
2809Note that $check will be called with a potentially non-loaded map, so if
2810it needs a loaded map it has to call C<< ->load >>.
2811
2600=cut 2812=cut
2601 2813
2602our $GOTOGEN; 2814our $GOTOGEN;
2603 2815
2604sub cf::object::player::goto { 2816sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
2818
2819 if ($self->{_link_recursion} >= $MAX_LINKS) {
2820 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2821 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2822 ($path, $x, $y) = @$EMERGENCY_POSITION;
2823 }
2606 2824
2607 # do generation counting so two concurrent goto's will be executed in-order 2825 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2827
2610 $self->enter_link; 2828 $self->enter_link;
2630 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2631 } 2849 }
2632 } 2850 }
2633 2851
2634 my $map = eval { 2852 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2636 2854
2637 if ($map) { 2855 if ($map) {
2638 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2858 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2859 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2860 }
2643 2861
2644 $map 2862 $map
2652 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2655 } 2873 }
2656 2874
2657 $done->() if $done; 2875 $done->($self) if $done;
2658 })->prio (1); 2876 })->prio (1);
2659} 2877}
2660 2878
2661=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2662 2880
2682} 2900}
2683 2901
2684sub prepare_random_map { 2902sub prepare_random_map {
2685 my ($exit) = @_; 2903 my ($exit) = @_;
2686 2904
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2905 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2906 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2907 # that depends on the exit object
2692 2908
2693 my $rmp = parse_random_map_params $exit->msg; 2909 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2911 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2912 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2913 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2914 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2915 $rmp->{origin_y} = $exit->y;
2916
2917 $exit->map->touch;
2700 } 2918 }
2701 2919
2702 $rmp->{random_seed} ||= $exit->random_seed; 2920 $rmp->{random_seed} ||= $exit->random_seed;
2703 2921
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2922 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2927 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2928 undef $fh;
2711 aio_rename "$meta~", $meta; 2929 aio_rename "$meta~", $meta;
2712 2930
2931 my $slaying = "?random/$md5";
2932
2933 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2934 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2935 $exit->msg (undef);
2936 }
2715 } 2937 }
2716} 2938}
2717 2939
2718sub cf::object::player::enter_exit { 2940sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2941 my ($self, $exit) = @_;
2720 2942
2721 return unless $self->type == cf::PLAYER; 2943 return unless $self->type == cf::PLAYER;
2722 2944
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2945 $self->enter_link;
2735 2946
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2947 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2948 $Coro::current->{desc} = "enter_exit";
2742 2949
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2950 unless (eval {
2951 $self->deactivate_recursive; # just to be sure
2952
2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2954 my $x = $exit->stats->hp;
2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2979
2745 $self->goto ($slaying, $hp, $sp); 2980 $self->goto ($map, $x, $y);
2746 2981
2982 # if exit is damned, update players death & WoR home-position
2983 $self->contr->savebed ($map, $x, $y)
2984 if $exit->flag (cf::FLAG_DAMNED);
2985
2747 1; 2986 1
2748 }) { 2987 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2989 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2992
2754 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2994 $self->leave_link;
2756 } 2995 }
2757 })->prio (1); 2996 })->prio (1);
2758} 2997}
2759 2998
2771sub cf::client::send_drawinfo { 3010sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 3011 my ($self, $text, $flags) = @_;
2773 3012
2774 utf8::encode $text; 3013 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3014 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3015}
3016
3017=item $client->send_big_packet ($pkt)
3018
3019Like C<send_packet>, but tries to compress large packets, and fragments
3020them as required.
3021
3022=cut
3023
3024our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3025
3026sub cf::client::send_big_packet {
3027 my ($self, $pkt) = @_;
3028
3029 # try lzf for large packets
3030 $pkt = "lzf " . Compress::LZF::compress $pkt
3031 if 1024 <= length $pkt and $self->{can_lzf};
3032
3033 # split very large packets
3034 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3035 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3036 $pkt = "frag";
3037 }
3038
3039 $self->send_packet ($pkt);
2776} 3040}
2777 3041
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 3042=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 3043
2780Send a drawinfo or msg packet to the client, formatting the msg for the 3044Send a drawinfo or msg packet to the client, formatting the msg for the
2784 3048
2785=cut 3049=cut
2786 3050
2787# non-persistent channels (usually the info channel) 3051# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 3052our %CHANNEL = (
3053 "c/motd" => {
3054 id => "infobox",
3055 title => "MOTD",
3056 reply => undef,
3057 tooltip => "The message of the day",
3058 },
2789 "c/identify" => { 3059 "c/identify" => {
2790 id => "infobox", 3060 id => "infobox",
2791 title => "Identify", 3061 title => "Identify",
2792 reply => undef, 3062 reply => undef,
2793 tooltip => "Items recently identified", 3063 tooltip => "Items recently identified",
2795 "c/examine" => { 3065 "c/examine" => {
2796 id => "infobox", 3066 id => "infobox",
2797 title => "Examine", 3067 title => "Examine",
2798 reply => undef, 3068 reply => undef,
2799 tooltip => "Signs and other items you examined", 3069 tooltip => "Signs and other items you examined",
3070 },
3071 "c/shopinfo" => {
3072 id => "infobox",
3073 title => "Shop Info",
3074 reply => undef,
3075 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 3076 },
2801 "c/book" => { 3077 "c/book" => {
2802 id => "infobox", 3078 id => "infobox",
2803 title => "Book", 3079 title => "Book",
2804 reply => undef, 3080 reply => undef,
2820 id => "infobox", 3096 id => "infobox",
2821 title => "Body Parts", 3097 title => "Body Parts",
2822 reply => undef, 3098 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3099 tooltip => "Shows which body parts you posess and are available",
2824 }, 3100 },
3101 "c/statistics" => {
3102 id => "infobox",
3103 title => "Statistics",
3104 reply => undef,
3105 tooltip => "Shows your primary statistics",
3106 },
3107 "c/skills" => {
3108 id => "infobox",
3109 title => "Skills",
3110 reply => undef,
3111 tooltip => "Shows your experience per skill and item power",
3112 },
3113 "c/shopitems" => {
3114 id => "infobox",
3115 title => "Shop Items",
3116 reply => undef,
3117 tooltip => "Shows the items currently for sale in this shop",
3118 },
3119 "c/resistances" => {
3120 id => "infobox",
3121 title => "Resistances",
3122 reply => undef,
3123 tooltip => "Shows your resistances",
3124 },
3125 "c/pets" => {
3126 id => "infobox",
3127 title => "Pets",
3128 reply => undef,
3129 tooltip => "Shows information abotu your pets/a specific pet",
3130 },
3131 "c/perceiveself" => {
3132 id => "infobox",
3133 title => "Perceive Self",
3134 reply => undef,
3135 tooltip => "You gained detailed knowledge about yourself",
3136 },
2825 "c/uptime" => { 3137 "c/uptime" => {
2826 id => "infobox", 3138 id => "infobox",
2827 title => "Uptime", 3139 title => "Uptime",
2828 reply => undef, 3140 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3141 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3144 id => "infobox",
2833 title => "Map Info", 3145 title => "Map Info",
2834 reply => undef, 3146 reply => undef,
2835 tooltip => "Information related to the maps", 3147 tooltip => "Information related to the maps",
2836 }, 3148 },
3149 "c/party" => {
3150 id => "party",
3151 title => "Party",
3152 reply => "gsay ",
3153 tooltip => "Messages and chat related to your party",
3154 },
3155 "c/death" => {
3156 id => "death",
3157 title => "Death",
3158 reply => undef,
3159 tooltip => "Reason for and more info about your most recent death",
3160 },
3161 "c/say" => $SAY_CHANNEL,
3162 "c/chat" => $CHAT_CHANNEL,
2837); 3163);
2838 3164
2839sub cf::client::send_msg { 3165sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3166 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3167
2842 $msg = $self->pl->expand_cfpod ($msg); 3168 $msg = $self->pl->expand_cfpod ($msg)
3169 unless $color & cf::NDI_VERBATIM;
2843 3170
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3171 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3172
2846 # check predefined channels, for the benefit of C 3173 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3174 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3175 $channel = $CHANNEL{$channel};
2849 3176
2850 $self->ext_msg (channel_info => $channel) 3177 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3178 $channel = $channel->{id};
2854 3179
2855 } elsif (ref $channel) { 3180 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3181 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3182 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3183 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3184 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3185 }
2862 3186
2863 $channel = $channel->{id}; 3187 $channel = $channel->{id};
2864 } 3188 }
2865 3189
2866 return unless @extra || length $msg; 3190 return unless @extra || length $msg;
2867 3191
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3192 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3193 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3194 if $color & cf::NDI_DEF;
2872 3195
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3196 my $pkt = "msg "
3197 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3198 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3199 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3200
2887 $color &= cf::NDI_COLOR_MASK; 3201 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3202}
2901 3203
2902=item $client->ext_msg ($type, @msg) 3204=item $client->ext_msg ($type, @msg)
2903 3205
2904Sends an ext event to the client. 3206Sends an ext event to the client.
2907 3209
2908sub cf::client::ext_msg($$@) { 3210sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3211 my ($self, $type, @msg) = @_;
2910 3212
2911 if ($self->extcmd == 2) { 3213 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3214 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3215 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3216 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3217 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3218 }
2917} 3219}
2918 3220
2919=item $client->ext_reply ($msgid, @msg) 3221=item $client->ext_reply ($msgid, @msg)
2920 3222
2923=cut 3225=cut
2924 3226
2925sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
2927 3229
2928 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3233}
2936 3234
2937=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2938 3236
2939Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
2994 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
2995 3293
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3295
2998 if (ref $msg) { 3296 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3298
3004 my @reply; 3299 my @reply;
3005 3300
3006 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
3009 3304
3010 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3306 if $reply;
3012 3307
3013 } else { 3308 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3310 }
3016 3311
3017 cf::override; 3312 cf::override;
3018 }, 3313 },
3019); 3314);
3039 3334
3040 $coro 3335 $coro
3041} 3336}
3042 3337
3043cf::client->attach ( 3338cf::client->attach (
3044 on_destroy => sub { 3339 on_client_destroy => sub {
3045 my ($ns) = @_; 3340 my ($ns) = @_;
3046 3341
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3343 },
3049); 3344);
3065our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3066 3361
3067$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3068 3363
3069$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3072 sort time 3367 sort time
3073)); 3368));
3074 3369
3075# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3078 3373
3079The following functions and methods are available within a safe environment: 3374The following functions and methods are available within a safe environment:
3080 3375
3081 cf::object 3376 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3377 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3378 insert remove name archname title slaying race decrease split
3379 value
3084 3380
3085 cf::object::player 3381 cf::object::player
3086 player 3382 player
3087 3383
3088 cf::player 3384 cf::player
3093 3389
3094=cut 3390=cut
3095 3391
3096for ( 3392for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3393 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3394 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3397 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3103) { 3399) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3402 for @funs;
3108} 3403}
3109 3404
3124 3419
3125 my $qcode = $code; 3420 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3128 3423
3424 %vars = (_dummy => 0) unless %vars;
3425
3426 my @res;
3129 local $_; 3427 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3428
3132 my $eval = 3429 my $eval =
3133 "do {\n" 3430 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3433 . $code
3137 . "\n}" 3434 . "\n}"
3138 ; 3435 ;
3139 3436
3437 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3143 3446
3144 if ($@) { 3447 if ($@) {
3145 warn "$@"; 3448 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3148 } 3451 }
3149 3452
3150 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3151} 3454}
3152 3455
3166=cut 3469=cut
3167 3470
3168sub register_script_function { 3471sub register_script_function {
3169 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3170 3473
3171 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3173} 3476}
3174 3477
3175=back 3478=back
3176 3479
3177=cut 3480=cut
3186 # for this (global event?) 3489 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3491
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3493
3191 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3192 3495
3193 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3497
3199 $facedata->{version} == 2 3498 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3500
3202 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3504 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3507 };
3207 cf::cede_to_tick; 3508 cf::cede_to_tick;
3208 3509
3209 { 3510 {
3210 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3515
3215 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3219 3521
3220 cf::cede_to_tick; 3522 cf::cede_to_tick;
3221 } 3523 }
3222 3524
3223 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3228 3530
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3534 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3536 }
3235 3537
3236 cf::cede_to_tick; 3538 cf::cede_to_tick;
3237 } 3539 }
3238 } 3540 }
3247 3549
3248 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3249 } 3551 }
3250 3552
3251 { 3553 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3255 3555
3256 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3560
3261 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3276 } else { 3564 } else {
3277 $RESOURCE{$name} = $info; 3565# $RESOURCE{$name} = $info; # unused
3278 } 3566 }
3279 3567
3280 cf::cede_to_tick; 3568 cf::cede_to_tick;
3281 } 3569 }
3282 } 3570 }
3283 3571
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3573
3286 1 3574 1
3287} 3575}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3576
3309register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3578 my ($ns, $want) = @_;
3311 3579
3312 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3581 $ns->fx_want ($k, $v);
3314 } 3582 }
3315}; 3583};
3584
3585sub load_resource_file($) {
3586 my $guard = lock_acquire "load_resource_file";
3587
3588 my $status = load_resource_file_ $_[0];
3589 get_slot 0.1, 100;
3590 cf::arch::commit_load;
3591
3592 $status
3593}
3316 3594
3317sub reload_regions { 3595sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3596 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3597 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3598 %ext::player_env::MUSIC_FACE_CACHE = ();
3334} 3612}
3335 3613
3336sub reload_archetypes { 3614sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3615 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3616 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3617}
3345 3618
3346sub reload_treasures { 3619sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3349} 3622}
3350 3623
3624sub reload_sound {
3625 trace "loading sound config from $DATADIR/sound\n";
3626
3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3628
3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3630 my $sound = $soundconf->{compat}[$_]
3631 or next;
3632
3633 my $face = cf::face::find "sound/$sound->[1]";
3634 cf::sound::set $sound->[0] => $face;
3635 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3636 }
3637
3638 while (my ($k, $v) = each %{$soundconf->{event}}) {
3639 my $face = cf::face::find "sound/$v";
3640 cf::sound::set $k => $face;
3641 }
3642}
3643
3351sub reload_resources { 3644sub reload_resources {
3352 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3353 3646
3647 reload_exp_table;
3648 reload_materials;
3649 reload_facedata;
3650 reload_sound;
3651 reload_archetypes;
3354 reload_regions; 3652 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3653 reload_treasures;
3359 3654
3360 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3656}
3366 3657
3367sub reload_config { 3658sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3659 trace "reloading config file...\n";
3369 or return;
3370 3660
3371 local $/; 3661 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3373 3664
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3666
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3669
3379 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
3383 }; 3674 };
3384 warn $@ if $@; 3675 warn $@ if $@;
3385 } 3676 }
3386} 3677}
3387 3678
3679sub pidfile() {
3680 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3681 or die "$PIDFILE: $!";
3682 flock $fh, &Fcntl::LOCK_EX
3683 or die "$PIDFILE: flock: $!";
3684 $fh
3685}
3686
3687# make sure only one server instance is running at any one time
3688sub atomic {
3689 my $fh = pidfile;
3690
3691 my $pid = <$fh>;
3692 kill 9, $pid if $pid > 0;
3693
3694 seek $fh, 0, 0;
3695 print $fh $$;
3696}
3697
3698sub main_loop {
3699 trace "EV::loop starting\n";
3700 if (1) {
3701 EV::loop;
3702 }
3703 trace "EV::loop returned\n";
3704 goto &main_loop unless $REALLY_UNLOOP;
3705}
3706
3388sub main { 3707sub main {
3708 cf::init_globals; # initialise logging
3709
3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3714
3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3716
3389 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3719 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3720 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3721 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3722 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3723 })->prio (Coro::PRIO_MAX);
3396 }; 3724 };
3397 3725
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3727
3728 cf::sync_job {
3729 cf::incloader::init ();
3730
3731 cf::init_anim;
3732 cf::init_attackmess;
3733 cf::init_dynamic;
3734
3735 cf::load_settings;
3736
3737 reload_resources;
3738 reload_config;
3739 db_init;
3740
3741 cf::init_uuid;
3742 cf::init_signals;
3743 cf::init_skills;
3744
3745 cf::init_beforeplay;
3746
3747 atomic;
3748
3749 load_extensions;
3750
3751 utime time, time, $RUNTIMEFILE;
3752
3753 # no (long-running) fork's whatsoever before this point(!)
3754 use POSIX ();
3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3756
3757 cf::_post_init 0;
3758 };
3759
3760 cf::object::thawer::errors_are_fatal 0;
3761 info "parse errors in files are no longer fatal from this point on.\n";
3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3767 goto &main_loop;
3405} 3768}
3406 3769
3407############################################################################# 3770#############################################################################
3408# initialisation and cleanup 3771# initialisation and cleanup
3409 3772
3410# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3411BEGIN { 3774BEGIN {
3412 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3413 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3414 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3415 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3416 }; 3779 };
3417 } 3780 }
3418} 3781}
3419 3782
3420sub write_runtime_sync { 3783sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime"; 3784 my $t0 = AE::time;
3422 3785
3423 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3425 3788
3426 IO::AIO::aio_utime $runtime, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3790
3428 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3429 3792
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3794 or return;
3432 3795
3433 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3808 aio_utime $fh, undef, undef;
3446 3809
3447 close $fh 3810 close $fh
3448 or return; 3811 or return;
3449 3812
3450 aio_rename "$runtime~", $runtime 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3814 and return;
3452 3815
3453 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3817
3455 1 3818 1
3456} 3819}
3457 3820
3458our $uuid_lock; 3821our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3830 my $uuid = "$LOCALDIR/uuid";
3468 3831
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3832 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3833 or return;
3471 3834
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3836
3837 unless ($value) {
3838 info "cowardly refusing to write zero uuid value!\n";
3839 return;
3840 }
3841
3842 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3843 $uuid_skip = 0;
3474 3844
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3845 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3846 and return;
3477 3847
3483 or return; 3853 or return;
3484 3854
3485 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3486 and return; 3856 and return;
3487 3857
3488 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3489 3859
3490 1 3860 1
3491 3861
3492} 3862}
3493 3863
3499} 3869}
3500 3870
3501sub emergency_save() { 3871sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3503 3873
3504 warn "enter emergency perl save\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3505 3880
3506 cf::sync_job { 3881 cf::sync_job {
3882 cf::write_runtime_sync; # external watchdog should not bark
3883
3507 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3890 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3892 $pl->save;
3516 } 3893 }
3517 warn "end emergency player save\n"; 3894 info "emergency_perl_save: end player save\n";
3518 3895
3519 warn "begin emergency map save\n"; 3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3901 $map->valid or next;
3523 $map->save; 3902 $map->save;
3524 } 3903 }
3525 warn "end emergency map save\n"; 3904 info "emergency_perl_save: end map save\n";
3526 3905
3527 warn "begin emergency database checkpoint\n"; 3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3908 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3530 3911
3531 warn "begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3913 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3934 };
3535 3935
3536 warn "leave emergency perl save\n"; 3936 info "emergency_perl_save: leave\n";
3537} 3937}
3538 3938
3539sub post_cleanup { 3939sub post_cleanup {
3540 my ($make_core) = @_; 3940 my ($make_core) = @_;
3541 3941
3942 IO::AIO::flush;
3943
3542 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3945 if $make_core;
3946
3947 my $fh = pidfile;
3948 unlink $PIDFILE if <$fh> == $$;
3949}
3950
3951# a safer delete_package, copied from Symbol
3952sub clear_package($) {
3953 my $pkg = shift;
3954
3955 # expand to full symbol table name if needed
3956 unless ($pkg =~ /^main::.*::$/) {
3957 $pkg = "main$pkg" if $pkg =~ /^::/;
3958 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3959 $pkg .= '::' unless $pkg =~ /::$/;
3960 }
3961
3962 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3963 my $stem_symtab = *{$stem}{HASH};
3964
3965 defined $stem_symtab and exists $stem_symtab->{$leaf}
3966 or return;
3967
3968 # clear all symbols
3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3970 for my $name (keys %$leaf_symtab) {
3971 _gv_clear *{"$pkg$name"};
3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3973 }
3544} 3974}
3545 3975
3546sub do_reload_perl() { 3976sub do_reload_perl() {
3547 # can/must only be called in main 3977 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3549 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3550 return; 3980 return;
3551 } 3981 }
3552 3982
3553 warn "reloading..."; 3983 return if $RELOAD++;
3554 3984
3555 warn "entering sync_job"; 3985 my $t1 = AE::time;
3556 3986
3987 while ($RELOAD) {
3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3990
3991 trace "perl_reload: entering sync_job";
3992
3557 cf::sync_job { 3993 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3994 #cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark
3561 3995
3562 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV;
3564
3565 # if anything goes wrong in here, we should simply crash as we already saved
3566
3567 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs;
3573 warn "iterate...";
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = (); 3998 %EXT_CORO = ();
3581 3999
3582 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3583 %COMMAND = (); 4001 %COMMAND = ();
3584 4002
3585 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3586 %EXTCMD = (); 4004 %EXTCMD = ();
3587 %EXTICMD = (); 4005 %EXTICMD = ();
3588 4006
3589 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3590 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3592 4010
3593 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3594 eval { 4012 eval {
3595 $cb->($pkg); 4013 $cb->($pkg);
3596 1 4014 1
3597 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
4016 }
4017
4018 trace "... clearing $pkg";
4019 clear_package $pkg;
3598 } 4020 }
3599 4021
3600 warn "... nuking $pkg";
3601 Symbol::delete_package $pkg;
3602 }
3603
3604 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3605 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 4025
3608 warn "... unloading $k"; 4026 trace "... unloading $k";
3609 delete $INC{$k}; 4027 delete $INC{$k};
3610 4028
3611 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3613 4031
3614 if (my $cb = $k->can ("unload_module")) { 4032 if (my $cb = $k->can ("unload_module")) {
3615 $cb->(); 4033 $cb->();
4034 }
4035
4036 clear_package $k;
3616 } 4037 }
3617 4038
3618 Symbol::delete_package $k;
3619 }
3620
3621 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 4040 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 4042
3625 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 4046
3629 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3630 # and global variables created in xs 4048 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3632 4050
3633 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3634 4052
3635 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3636 require cf; 4054 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3638 4056
3639 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3640 cf::reload_config; 4058 cf::reload_config;
3641 4059
3642 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3643 cf::load_extensions; 4061 cf::load_extensions;
3644 4062
4063 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3648 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
4070 }
3651 4071
3652 warn "leaving sync_job"; 4072 cf::_post_init 1;
3653 4073
4074 trace "perl_reload: leaving sync_job";
4075
3654 1 4076 1
3655 } or do { 4077 } or do {
3656 warn $@; 4078 error $@;
3657 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
4080 };
4081
4082 --$RELOAD;
3658 }; 4083 }
3659 4084
3660 warn "reloaded"; 4085 $t1 = AE::time - $t1;
4086 info "perl_reload: completed in ${t1}s\n";
3661}; 4087};
3662 4088
3663our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3664 4090
3665sub reload_perl() { 4091sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 4092 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3668 4094
4095 $RELOAD_WATCHER ||= cf::async {
4096 Coro::AIO::aio_wait cache_extensions;
4097
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4099 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
4101 };
3672 }; 4102 };
3673} 4103}
3674 4104
3675register_command "reload" => sub { 4105register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4106 my ($who, $arg) = @_;
3682 reload_perl; 4112 reload_perl;
3683 }; 4113 };
3684 } 4114 }
3685}; 4115};
3686 4116
3687unshift @INC, $LIBDIR; 4117#############################################################################
3688 4118
3689my $bug_warning = 0; 4119my $bug_warning = 0;
3690 4120
3691our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN;
3693
3694sub wait_for_tick { 4121sub wait_for_tick() {
3695 return if tick_inhibit; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3696 return if $Coro::current == $Coro::main;
3697 4123
3698 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3699 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait;
3701} 4125}
3702 4126
3703sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3704 return if tick_inhibit; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3705 return if $Coro::current == $Coro::main;
3706 4129
3707 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 4132 $signal->wait;
3710} 4133}
3714 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3715 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3716 return; 4139 return;
3717 } 4140 }
3718 4141
3719 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4143
4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3720 4145
3721 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3723 Coro::async_pool { 4148 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3725 write_runtime_sync 4150 write_runtime_sync
3726 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3727 }; 4152 };
3728 } 4153 }
3729 4154
3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3731 $sig->send; 4156 $sig->send;
3732 } 4157 }
3733 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3734 $sig->send;
3735 }
3736 4159
3737 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3738 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3739 4162
3740 if (0) { 4163 if (0) {
3741 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3742 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3745 } 4168 }
3746 } 4169 }
3747} 4170}
3748 4171
3749{ 4172{
3750 # configure BDB 4173 # configure BDB
3751 4174
3752 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3753 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3755 4178
3756 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4183 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4184 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4185 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 4186
3763 cf::sync_job { 4187 cf::sync_job {
3764 eval { 4188 eval {
3790{ 4214{
3791 # configure IO::AIO 4215 # configure IO::AIO
3792 4216
3793 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 4219 undef $AnyEvent::AIO::WATCHER;
3796} 4220}
3797 4221
3798my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3799 4224
3800sub _log_backtrace { 4225sub _log_backtrace {
3801 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3802 4227
3803 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3804 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3805 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3807 ++$_log_backtrace; 4236 ++$_log_backtrace;
4237 my $perl_bt = Carp::longmess $msg;
3808 async { 4238 async {
3809 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3810 4240
3811 my @bt = fork_call { 4241 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 4242 @addr = map { sprintf "%x", $_ } @addr;
3823 } 4253 }
3824 4254
3825 @funcs 4255 @funcs
3826 }; 4256 };
3827 4257
3828 LOG llevInfo, "[ABT] $msg\n"; 4258 LOG llevInfo, "[ABT] $perl_bt\n";
4259 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 4261 --$_log_backtrace;
3831 }; 4262 };
3832 } else { 4263 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3835 } 4266 }
3836} 4267}
3837 4268
3838# load additional modules 4269# load additional modules
3839use cf::pod; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3840 4272
3841END { cf::emergency_save } 4273END { cf::emergency_save }
3842 4274
38431 42751
3844 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines