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.421 by root, Tue Apr 15 18:43:11 2008 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 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 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";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
92our %RESOURCE; 113our %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 = 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
286=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
287 392
288Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
289 394
290=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 402
298sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
300 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
301=item cf::lock_wait $string 468=item cf::lock_wait $string
302 469
303Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
304 471
305=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
306 473
307Wait until the given lock is available and then acquires it and returns 474Wait 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, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
310returned. 477returned.
311 478
312Locks are *not* recursive, locking from the same coro twice results in a 479Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 480deadlocked coro.
319 486
320Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
321 488
322=cut 489=cut
323 490
324our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 492
327sub lock_wait($) { 493sub lock_wait($) {
328 my ($key) = @_; 494 $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} 495}
341 496
342sub lock_acquire($) { 497sub lock_acquire($) {
343 my ($key) = @_; 498 $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} 499}
357 500
358sub lock_active($) { 501sub lock_active($) {
359 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 503}
363 504
364sub freeze_mainloop { 505sub freeze_mainloop {
365 tick_inhibit_inc; 506 tick_inhibit_inc;
366 507
367 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
368} 509}
369 510
370=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
371 512
372Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 514get spread over time.
374 515
375=cut 516=cut
376 517
377sub periodic($$) { 518sub periodic($$) {
378 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
383} 524}
384 525
385=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
386 527
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 529(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. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
390 535
391The optional C<$name> can be used to identify the job to run. It might be 536The 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. 537used for statistical purposes and should identify the same time-class.
393 538
394Useful for short background jobs. 539Useful for short background jobs.
395 540
396=cut 541=cut
397 542
398our @SLOT_QUEUE; 543our @SLOT_QUEUE;
399our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
400 546
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
404 550
405 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
406 553
407 while () { 554 while () {
408 next_job: 555 next_job:
556
409 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 558
411 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 563 $job->[2]->send;
415 Coro::cede; 564 Coro::cede;
416 goto next_job; 565 goto next_job;
417 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 568 }
419 } 569 }
420 570
421 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 574 } else {
575 $busy = 0;
426 Coro::schedule; 576 Coro::schedule;
427 } 577 }
428 } 578 }
429}; 579};
430 580
431sub get_slot($;$$) { 581sub get_slot($;$$) {
432 return if tick_inhibit; 582 return if tick_inhibit || $Coro::current == $Coro::main;
433 583
434 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
435 585
436 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
437 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
438 589
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
467=cut 618=cut
468 619
469sub sync_job(&) { 620sub sync_job(&) {
470 my ($job) = @_; 621 my ($job) = @_;
471 622
472 if ($Coro::current == $Coro::main) { 623 if (in_main) {
473 my $time = EV::time; 624 my $time = AE::time;
474 625
475 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
477 628
478 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
479 630
480 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
481 632
482 my $busy = 1; 633 my $busy = 1;
483 my @res; 634 my @res;
484 635
485 (async { 636 (async {
486 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 638 @res = eval { $job->() };
488 warn $@ if $@; 639 error $@ if $@;
489 undef $busy; 640 undef $busy;
490 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
491 642
492 while ($busy) { 643 while ($busy) {
493 if (Coro::nready) { 644 if (Coro::nready) {
495 } else { 646 } else {
496 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
497 } 648 }
498 } 649 }
499 650
500 my $time = EV::time - $time; 651 my $time = AE::time - $time;
501 652
502 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
503 654
504 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
505 } else { 656 } else {
527 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
528 679
529 $coro 680 $coro
530} 681}
531 682
532=item fork_call { }, $args 683=item fork_call { }, @args
533 684
534Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 688never block itself or use any form of event handling.
538 689
539=cut 690=cut
540 691
692sub post_fork {
693 reset_signals;
694}
695
541sub fork_call(&@) { 696sub fork_call(&@) {
542 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
543 698
544 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
547 702
548 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
549 reset_signals; 704 cf::post_fork;
550 &$cb 705 &$cb
551 }, @args; 706 } @args;
552 707
553 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
554} 720}
555 721
556=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
557 723
558=cut 724=cut
595within each server. 761within each server.
596 762
597=cut 763=cut
598 764
599sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
600 my ($name) = @_; 769 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
602 771
603 eval { 772 eval {
604 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
614} 783}
615 784
616our $DB; 785our $DB;
617 786
618sub db_init { 787sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
621 };
622} 789}
623 790
624sub db_get($$) { 791sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
626 793
627 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
628 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
629 798
630 $! ? () 799 $! ? ()
631 : $data 800 : $data
632 }
633} 801}
634 802
635sub db_put($$$) { 803sub db_put($$$) {
636 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 833
666 my @data; 834 my @data;
667 my $md5; 835 my $md5;
668 836
669 for (0 .. $#$src) { 837 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 839 }
673 840
674 # if processing is expensive, check 841 # if processing is expensive, check
675 # checksum first 842 # checksum first
676 if (1) { 843 if (1) {
693 860
694 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 862 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
697 864
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 866
700 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
703 870
713 880
714=cut 881=cut
715 882
716sub datalog($@) { 883sub datalog($@) {
717 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 886}
720 887
721=back 888=back
722 889
723=cut 890=cut
724 891
725############################################################################# 892#############################################################################
726 893
727=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
728 895
729Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
732 899
733In the following description, CLASS can be any of C<global>, C<object> 900In 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 901C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
785 952
786Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
788 955
789Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
791 958
792These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
793 960
794=over 4 961=over 4
918 1085
919 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1088
922 } elsif (ref $type) { 1089 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
924 1091
925 } else { 1092 } else {
926 shift @arg; 1093 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
928 } 1095 }
929 } 1096 }
930} 1097}
931 1098
932sub _object_attach { 1099sub _object_attach {
942 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
943 } 1110 }
944 1111
945 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
946 } else { 1113 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1115 }
949 1116
950 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
951} 1118}
952 1119
1011 1178
1012 for (@$callbacks) { 1179 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1014 1181
1015 if ($@) { 1182 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1184 override;
1019 } 1185 }
1020 1186
1021 return 1 if $override; 1187 return 1 if $override;
1022 } 1188 }
1085 1251
1086sub reattach { 1252sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1254 my ($obj) = @_;
1089 1255
1256 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1258
1092 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1093 1260
1094 @$registry = (); 1261 @$registry = ();
1095 1262
1100 for (@$attach) { 1267 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1103 } 1270 }
1104 } else { 1271 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1273 }
1107 } 1274 }
1108} 1275}
1109 1276
1110cf::attachable->attach ( 1277cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1138 1305
1139 sync_job { 1306 sync_job {
1140 if (length $$rdata) { 1307 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1144 1312
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
1149 close $fh; 1320 aio_close $fh;
1150 1321
1151 if (@$objs) { 1322 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
1157 close $fh; 1331 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1333 }
1160 } else { 1334 } else {
1161 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1162 } 1336 }
1163 1337
1164 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1342 } else {
1166 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1167 } 1344 }
1168 } else { 1345 } else {
1169 aio_unlink $filename; 1346 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1171 } 1348 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1373 $av = $st->{objs};
1197 } 1374 }
1198 1375
1199 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1202 1380
1203 ($data, $av) 1381 ($data, $av)
1204} 1382}
1205 1383
1206=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1263 1441
1264 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1265} 1443}
1266 1444
1445use File::Glob ();
1446
1267cf::player->attach ( 1447cf::player->attach (
1268 on_command => sub { 1448 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1270 1450
1271 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1272 or return; 1452 or return;
1273 1453
1296 1476
1297 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1478 if $reply;
1299 1479
1300 } else { 1480 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1482 }
1303 1483
1304 cf::override; 1484 cf::override;
1305 }, 1485 },
1306); 1486);
1307 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1308sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1309 cf::sync_job { 1504 cf::sync_job {
1310 my %todo; 1505 my %todo;
1311 1506
1312 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1508 next unless -r $path;
1331 1526
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1529
1335 $ext{source} = 1530 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1338 . $source 1533 . $source
1339 . "\n};\n1"; 1534 . "\n};\n1";
1340 1535
1341 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1342 } 1537 }
1343 1538
1539 my $pass = 0;
1344 my %done; 1540 my %done;
1345 while (%todo) { 1541 while (%todo) {
1346 my $progress; 1542 my $progress;
1347 1543
1544 ++$pass;
1545
1546 ext:
1348 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1549 next ext
1351 unless exists $done{$_}; 1550 unless exists $done{$_};
1352 } 1551 }
1353 1552
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1554
1356 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1559
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1561 if exists $v->{meta}{mandatory};
1364 1562
1365 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1366 } 1572 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1573 }
1372 1574
1373 skip: 1575 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1376 } 1585 }
1377 }; 1586 };
1378} 1587}
1379 1588
1380############################################################################# 1589#############################################################################
1381 1590
1382=back 1591=back
1383 1592
1384=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1385 1594
1386Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1387 1596
1388=cut 1597=cut
1389 1598
1390package cf::player; 1599package cf::player;
1391 1600
1434 1643
1435sub exists($) { 1644sub exists($) {
1436 my ($login) = @_; 1645 my ($login) = @_;
1437 1646
1438 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1440} 1649}
1441 1650
1442sub find($) { 1651sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1653 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1665 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1666 or return;
1458 1667
1459 my $pl = cf::player::load_pl $f 1668 my $pl = cf::player::load_pl $f
1460 or return; 1669 or return;
1670
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1671 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1672 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1464 } 1674 }
1465 } 1675 }
1466} 1676}
1467 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1468sub save($) { 1691sub save($) {
1469 my ($pl) = @_; 1692 my ($pl) = @_;
1470 1693
1471 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1472 1695
1477 1700
1478 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1480 1703
1481 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1708
1483 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1710 cf::cede_to_tick;
1485} 1711}
1486 1712
1518 my ($pl) = @_; 1744 my ($pl) = @_;
1519 1745
1520 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1521 1747
1522 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1750
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1528 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1529 1759
1530 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1570 1800
1571 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1572 my $path = path $login; 1802 my $path = path $login;
1573 1803
1574 # a .pst is a dead give-away for a valid player 1804 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1810 }
1580 1811
1584 1815
1585 \@logins 1816 \@logins
1586} 1817}
1587 1818
1588=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1589 1822
1590Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1591player. May block. 1824player. May block.
1592 1825
1593=cut 1826=cut
1611 } 1844 }
1612 1845
1613 \@paths 1846 \@paths
1614} 1847}
1615 1848
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1850
1618Expand crossfire pod fragments into protocol xml. 1851Expand 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 1852
1709=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1710 1854
1711Sends an ext reply to the player. 1855Sends an ext reply to the player.
1712 1856
1744 1888
1745=cut 1889=cut
1746 1890
1747sub find_by_path($) { 1891sub find_by_path($) {
1748 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1749 1895
1750 my ($match, $specificity); 1896 my ($match, $specificity);
1751 1897
1752 for my $region (list) { 1898 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1782sub generate_random_map { 1928sub generate_random_map {
1783 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1784 1930
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1932
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1933 $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} 1934}
1802 1935
1803=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1804 1937
1805Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1810 1943
1811sub register { 1944sub register {
1812 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1946 my $pkg = caller;
1814 1947
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1949
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1951}
1820 1952
1821# also paths starting with '/' 1953# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1955
1824sub thawer_merge { 1956sub thawer_merge {
1825 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1826 1958
1827 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1832} 1964}
1833 1965
1834sub normalise { 1966sub normalise {
1835 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1836 1968
1837 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1838 1970
1839 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1840 1972
1841 # map plan: 1973 # map plan:
1842 # 1974 #
1857 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1990 $path = "$base/$path";
1859 } 1991 }
1860 1992
1861 for ($path) { 1993 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1865 } 1996 }
1866 1997
1867 $path 1998 $path
1881 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1882 return $self; 2013 return $self;
1883 } 2014 }
1884 } 2015 }
1885 2016
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2018 ()
1888} 2019}
1889 2020
2021# may re-bless or do other evil things
1890sub init { 2022sub init {
1891 my ($self) = @_; 2023 my ($self) = @_;
1892 2024
1893 $self 2025 $self
1894} 2026}
1925 2057
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1928} 2060}
1929 2061
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 { 2062sub decay_objects {
1940 my ($self) = @_; 2063 my ($self) = @_;
1941 2064
1942 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1943 2066
1968 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1969 2092
1970 1 2093 1
1971} 2094}
1972 2095
2096# used to laod the header of an original map
1973sub load_header_orig { 2097sub load_header_orig {
1974 my ($self) = @_; 2098 my ($self) = @_;
1975 2099
1976 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1977} 2101}
1978 2102
2103# used to laod the header of an instantiated map
1979sub load_header_temp { 2104sub load_header_temp {
1980 my ($self) = @_; 2105 my ($self) = @_;
1981 2106
1982 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1983} 2108}
1984 2109
2110# called after loading the header from an instantiated map
1985sub prepare_temp { 2111sub prepare_temp {
1986 my ($self) = @_; 2112 my ($self) = @_;
1987 2113
1988 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1989 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1990 # safety 2116 # safety
1991 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1992 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1993} 2119}
1994 2120
2121# called after loading the header from an original map
1995sub prepare_orig { 2122sub prepare_orig {
1996 my ($self) = @_; 2123 my ($self) = @_;
1997 2124
1998 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1999 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
2023 2150
2024sub find; 2151sub find;
2025sub find { 2152sub find {
2026 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2027 2154
2155 cf::cede_to_tick;
2156
2028 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2029 2158
2030 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2161
2033 $cf::MAP{$path} || do { 2162 $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 2163 my $map = new_from_path cf::map $path
2038 or return; 2164 or return;
2039 2165
2040 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
2041 2167
2043 or return; 2169 or return;
2044 2170
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2048 undef $guard1; 2175 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2176 $map->reset;
2051 return find $path; 2177 return find $path;
2052 } 2178 }
2053 2179
2054 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2055 } 2181 }
2056} 2182}
2057 2183
2058sub pre_load { } 2184sub pre_load { }
2059sub post_load { } 2185#sub post_load { } # XS
2060 2186
2061sub load { 2187sub load {
2062 my ($self) = @_; 2188 my ($self) = @_;
2063 2189
2064 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2067 2193
2068 { 2194 {
2069 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2070 2196
2071 return unless $self->valid; 2197 return unless $self->valid;
2072 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2073
2074 $self->in_memory (cf::MAP_LOADING);
2075 2199
2076 $self->alloc; 2200 $self->alloc;
2077 2201
2078 $self->pre_load; 2202 $self->pre_load;
2079 cf::cede_to_tick; 2203 cf::cede_to_tick;
2080 2204
2205 if (exists $self->{load_path}) {
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2207 $f->skip_block;
2083 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2084 or return; 2209 or return;
2085 2210
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2087 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2088 2213
2089 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2215 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2093 $self->clear_unique_items; 2218 $self->clear_unique_items;
2094 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2096 } 2222 }
2097 } 2223 }
2098 }
2099 2224
2100 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2101 2232
2102 cf::cede_to_tick; 2233 cf::cede_to_tick;
2103 # now do the right thing for maps 2234 # now do the right thing for maps
2104 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2105 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2108 2239
2109 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2241 $self->decay_objects;
2111 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2112 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2113 cf::cede_to_tick; 2245 cf::cede_to_tick;
2114 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2115 cf::cede_to_tick;
2116 $self->activate;
2117 } 2247 }
2118 2248
2119 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2251 }
2124 2252
2125 $self->post_load; 2253 $self->post_load;
2126}
2127 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2128sub customise_for { 2261sub customise_for {
2129 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2130 2263
2131 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2265 if $self->per_player;
2148 or next; 2281 or next;
2149 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2150 or next; 2283 or next;
2151 $neigh->load; 2284 $neigh->load;
2152 2285
2286 # now find the diagonal neighbours
2153 push @neigh, 2287 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2290 }
2157 2291
2164} 2298}
2165 2299
2166sub find_sync { 2300sub find_sync {
2167 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2168 2302
2169 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2170} 2308}
2171 2309
2172sub do_load_sync { 2310sub do_load_sync {
2173 my ($map) = @_; 2311 my ($map) = @_;
2174 2312
2313 # it's a bug to call this from the main context
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2177 2316
2178 cf::sync_job { $map->load }; 2317 $map->load;
2179} 2318}
2180 2319
2181our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2183 2322
2184sub find_async { 2323sub find_async {
2185 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2186 2325
2187 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2188 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2189 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2191 } 2332 }
2192 2333
2193 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2194 2335
2195 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2209 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2210 2351
2211 () 2352 ()
2212} 2353}
2213 2354
2355# common code, used by both ->save and ->swapout
2214sub save { 2356sub _save {
2215 my ($self) = @_; 2357 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2358
2219 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2220 2360
2221 return unless $self->dirty; 2361 return unless $self->dirty;
2222 2362
2242 } else { 2382 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2384 }
2245} 2385}
2246 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2247sub swap_out { 2395sub swap_out {
2248 my ($self) = @_; 2396 my ($self) = @_;
2249 2397
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2255 return if $self->players; 2402 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2257 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2258 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2259 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2260 2454
2261 $self->deactivate; 2455 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2457 $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 2458
2309 $self->unlink_save; 2459 $self->unlink_save;
2310 $self->destroy; 2460 $self->destroy;
2311} 2461}
2312 2462
2320 2470
2321 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2322 2472
2323 $self->unlink_save; 2473 $self->unlink_save;
2324 2474
2325 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2480
2387 : normalise $_ 2537 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2539 ]
2390} 2540}
2391 2541
2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2573
2392=back 2574=back
2393 2575
2394=head3 cf::object 2576=head3 cf::object
2395 2577
2396=cut 2578=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2639can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2640dialogue with the given NPC character.
2459 2641
2460=cut 2642=cut
2461 2643
2644our $SAY_CHANNEL = {
2645 id => "say",
2646 title => "Map",
2647 reply => "say ",
2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2649};
2650
2651our $CHAT_CHANNEL = {
2652 id => "chat",
2653 title => "Chat",
2654 reply => "chat ",
2655 tooltip => "Player chat and shouts, global to the server.",
2656};
2657
2462# rough implementation of a future "reply" method that works 2658# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2659# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2660#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2661sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2662 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2673 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2674 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2675
2480 } else { 2676 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2677 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2678 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2679 }
2484 } 2680 }
2485} 2681}
2486 2682
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2683=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2708
2513=item $player_object->enter_link 2709=item $player_object->enter_link
2514 2710
2515Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2516 2712
2517The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2519 2717
2520Will never block. 2718Will never block.
2521 2719
2522=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2523 2721
2543sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2544 my ($self) = @_; 2742 my ($self) = @_;
2545 2743
2546 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2547 2745
2746 ++$self->{_link_recursion};
2747
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2749
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2552 2752
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2754}
2555 2755
2556sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2558 2758
2575 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2577 2777
2578 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2581 2781
2582 $map->load; 2782 $map->load;
2583 $map->load_neighbours; 2783 $map->load_neighbours;
2584 2784
2585 return unless $self->contr->active; 2785 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2786
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2590} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2591 2794
2795}
2796
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2798
2594Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2801that 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 2802the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2803be called at the end of this process.
2599 2804
2805Note that $check will be called with a potentially non-loaded map, so if
2806it needs a loaded map it has to call C<< ->load >>.
2807
2600=cut 2808=cut
2601 2809
2602our $GOTOGEN; 2810our $GOTOGEN;
2603 2811
2604sub cf::object::player::goto { 2812sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2606 2820
2607 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2823
2610 $self->enter_link; 2824 $self->enter_link;
2630 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2631 } 2845 }
2632 } 2846 }
2633 2847
2634 my $map = eval { 2848 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2636 2850
2637 if ($map) { 2851 if ($map) {
2638 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2854 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2856 }
2643 2857
2644 $map 2858 $map
2652 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2655 } 2869 }
2656 2870
2657 $done->() if $done; 2871 $done->($self) if $done;
2658 })->prio (1); 2872 })->prio (1);
2659} 2873}
2660 2874
2661=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2662 2876
2682} 2896}
2683 2897
2684sub prepare_random_map { 2898sub prepare_random_map {
2685 my ($exit) = @_; 2899 my ($exit) = @_;
2686 2900
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2901 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2902 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2903 # that depends on the exit object
2692 2904
2693 my $rmp = parse_random_map_params $exit->msg; 2905 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2907 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2908 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2909 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2910 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2911 $rmp->{origin_y} = $exit->y;
2912
2913 $exit->map->touch;
2700 } 2914 }
2701 2915
2702 $rmp->{random_seed} ||= $exit->random_seed; 2916 $rmp->{random_seed} ||= $exit->random_seed;
2703 2917
2704 my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp); 2918 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2919 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2920 my $meta = "$RANDOMDIR/$md5.meta";
2707 2921
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2922 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2923 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2924 undef $fh;
2711 aio_rename "$meta~", $meta; 2925 aio_rename "$meta~", $meta;
2712 2926
2927 my $slaying = "?random/$md5";
2928
2929 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2930 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2931 $exit->msg (undef);
2932 }
2715 } 2933 }
2716} 2934}
2717 2935
2718sub cf::object::player::enter_exit { 2936sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2937 my ($self, $exit) = @_;
2720 2938
2721 return unless $self->type == cf::PLAYER; 2939 return unless $self->type == cf::PLAYER;
2722 2940
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; 2941 $self->enter_link;
2735 2942
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 { 2943 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2944 $Coro::current->{desc} = "enter_exit";
2742 2945
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2946 unless (eval {
2947 $self->deactivate_recursive; # just to be sure
2948
2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2950 my $x = $exit->stats->hp;
2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2975
2745 $self->goto ($slaying, $hp, $sp); 2976 $self->goto ($map, $x, $y);
2746 2977
2978 # if exit is damned, update players death & WoR home-position
2979 $self->contr->savebed ($map, $x, $y)
2980 if $exit->flag (cf::FLAG_DAMNED);
2981
2747 1; 2982 1
2748 }) { 2983 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2988
2754 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2990 $self->leave_link;
2756 } 2991 }
2757 })->prio (1); 2992 })->prio (1);
2758} 2993}
2759 2994
2771sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2773 3008
2774 utf8::encode $text; 3009 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2776} 3036}
2777 3037
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 3039
2780Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2784 3044
2785=cut 3045=cut
2786 3046
2787# non-persistent channels (usually the info channel) 3047# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2789 "c/identify" => { 3055 "c/identify" => {
2790 id => "infobox", 3056 id => "infobox",
2791 title => "Identify", 3057 title => "Identify",
2792 reply => undef, 3058 reply => undef,
2793 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2795 "c/examine" => { 3061 "c/examine" => {
2796 id => "infobox", 3062 id => "infobox",
2797 title => "Examine", 3063 title => "Examine",
2798 reply => undef, 3064 reply => undef,
2799 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 3072 },
2801 "c/book" => { 3073 "c/book" => {
2802 id => "infobox", 3074 id => "infobox",
2803 title => "Book", 3075 title => "Book",
2804 reply => undef, 3076 reply => undef,
2820 id => "infobox", 3092 id => "infobox",
2821 title => "Body Parts", 3093 title => "Body Parts",
2822 reply => undef, 3094 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3095 tooltip => "Shows which body parts you posess and are available",
2824 }, 3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
2825 "c/uptime" => { 3133 "c/uptime" => {
2826 id => "infobox", 3134 id => "infobox",
2827 title => "Uptime", 3135 title => "Uptime",
2828 reply => undef, 3136 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3137 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3140 id => "infobox",
2833 title => "Map Info", 3141 title => "Map Info",
2834 reply => undef, 3142 reply => undef,
2835 tooltip => "Information related to the maps", 3143 tooltip => "Information related to the maps",
2836 }, 3144 },
3145 "c/party" => {
3146 id => "party",
3147 title => "Party",
3148 reply => "gsay ",
3149 tooltip => "Messages and chat related to your party",
3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2837); 3159);
2838 3160
2839sub cf::client::send_msg { 3161sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3163
2842 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2843 3166
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3168
2846 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2849 3172
2850 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2854 3175
2855 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3181 }
2862 3182
2863 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2864 } 3184 }
2865 3185
2866 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2867 3187
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3188 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2872 3191
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3192 my $pkt = "msg "
3193 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3195 );
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 3196
2887 $color &= cf::NDI_COLOR_MASK; 3197 $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} 3198}
2901 3199
2902=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2903 3201
2904Sends an ext event to the client. 3202Sends an ext event to the client.
2907 3205
2908sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2910 3208
2911 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3214 }
2917} 3215}
2918 3216
2919=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2920 3218
2924 3222
2925sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2927 3225
2928 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3229 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3232 }
2935} 3233}
2936 3234
2937=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2938 3236
3009 3307
3010 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3309 if $reply;
3012 3310
3013 } else { 3311 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3313 }
3016 3314
3017 cf::override; 3315 cf::override;
3018 }, 3316 },
3019); 3317);
3039 3337
3040 $coro 3338 $coro
3041} 3339}
3042 3340
3043cf::client->attach ( 3341cf::client->attach (
3044 on_destroy => sub { 3342 on_client_destroy => sub {
3045 my ($ns) = @_; 3343 my ($ns) = @_;
3046 3344
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3346 },
3049); 3347);
3065our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
3066 3364
3067$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
3068 3366
3069$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
3072 sort time 3370 sort time
3073)); 3371));
3074 3372
3075# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
3078 3376
3079The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
3080 3378
3081 cf::object 3379 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3380 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3381 insert remove name archname title slaying race decrease split
3382 value
3084 3383
3085 cf::object::player 3384 cf::object::player
3086 player 3385 player
3087 3386
3088 cf::player 3387 cf::player
3093 3392
3094=cut 3393=cut
3095 3394
3096for ( 3395for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3103) { 3402) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3405 for @funs;
3108} 3406}
3109 3407
3124 3422
3125 my $qcode = $code; 3423 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
3128 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
3129 local $_; 3430 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3431
3132 my $eval = 3432 my $eval =
3133 "do {\n" 3433 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3436 . $code
3137 . "\n}" 3437 . "\n}"
3138 ; 3438 ;
3139 3439
3440 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
3143 3449
3144 if ($@) { 3450 if ($@) {
3145 warn "$@"; 3451 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3148 } 3454 }
3149 3455
3150 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3151} 3457}
3152 3458
3166=cut 3472=cut
3167 3473
3168sub register_script_function { 3474sub register_script_function {
3169 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3170 3476
3171 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3173} 3479}
3174 3480
3175=back 3481=back
3176 3482
3177=cut 3483=cut
3186 # for this (global event?) 3492 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3494
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3496
3191 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3192 3498
3193 my $facedata; 3499 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 3500
3199 $facedata->{version} == 2 3501 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3503
3202 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3507 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3510 };
3207 cf::cede_to_tick; 3511 cf::cede_to_tick;
3208 3512
3209 { 3513 {
3210 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3518
3215 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3219 3524
3220 cf::cede_to_tick; 3525 cf::cede_to_tick;
3221 } 3526 }
3222 3527
3223 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3228 3533
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3537 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3539 }
3235 3540
3236 cf::cede_to_tick; 3541 cf::cede_to_tick;
3237 } 3542 }
3238 } 3543 }
3247 3552
3248 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3249 } 3554 }
3250 3555
3251 { 3556 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3255 3558
3256 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3560 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3562
3261 if ($info->{type} & 1) { 3563 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}; 3564 cf::face::set_type $idx, $info->{type};
3276 } else { 3565 } else {
3277 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3278 } 3567 }
3279 3568
3280 cf::cede_to_tick; 3569 cf::cede_to_tick;
3281 } 3570 }
3282 } 3571 }
3283 3572
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3574
3286 1 3575 1
3287} 3576}
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 3577
3309register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3311 3580
3312 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3582 $ns->fx_want ($k, $v);
3314 } 3583 }
3315}; 3584};
3585
3586sub load_resource_file($) {
3587 my $guard = lock_acquire "load_resource_file";
3588
3589 my $status = load_resource_file_ $_[0];
3590 get_slot 0.1, 100;
3591 cf::arch::commit_load;
3592
3593 $status
3594}
3316 3595
3317sub reload_regions { 3596sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3597 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3598 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3599 %ext::player_env::MUSIC_FACE_CACHE = ();
3334} 3613}
3335 3614
3336sub reload_archetypes { 3615sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3616 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3617 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} 3618}
3345 3619
3346sub reload_treasures { 3620sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3349} 3623}
3350 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3351sub reload_resources { 3645sub reload_resources {
3352 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3353 3647
3648 reload_exp_table;
3649 reload_materials;
3650 reload_facedata;
3651 reload_sound;
3652 reload_archetypes;
3354 reload_regions; 3653 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3654 reload_treasures;
3359 3655
3360 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3657}
3366 3658
3367sub reload_config { 3659sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3369 or return;
3370 3661
3371 local $/; 3662 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3373 3665
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3667
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $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}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3670
3379 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3383 }; 3675 };
3384 warn $@ if $@; 3676 warn $@ if $@;
3385 } 3677 }
3386} 3678}
3387 3679
3680sub pidfile() {
3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3682 or die "$PIDFILE: $!";
3683 flock $fh, &Fcntl::LOCK_EX
3684 or die "$PIDFILE: flock: $!";
3685 $fh
3686}
3687
3688# make sure only one server instance is running at any one time
3689sub atomic {
3690 my $fh = pidfile;
3691
3692 my $pid = <$fh>;
3693 kill 9, $pid if $pid > 0;
3694
3695 seek $fh, 0, 0;
3696 print $fh $$;
3697}
3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3388sub main { 3708sub main {
3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3717
3389 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3721 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3723 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3396 }; 3725 };
3397 3726
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; 3727 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3739 reload_config;
3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3750 load_extensions;
3751
3752 utime time, time, $RUNTIMEFILE;
3753
3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3757
3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3405} 3770}
3406 3771
3407############################################################################# 3772#############################################################################
3408# initialisation and cleanup 3773# initialisation and cleanup
3409 3774
3410# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3411BEGIN { 3776BEGIN {
3412 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3413 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3414 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3415 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3416 }; 3781 };
3417 } 3782 }
3418} 3783}
3419 3784
3420sub write_runtime_sync { 3785sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
3422 3787
3423 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3425 3790
3426 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3792
3428 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3429 3794
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3796 or return;
3432 3797
3433 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
3446 3811
3447 close $fh 3812 close $fh
3448 or return; 3813 or return;
3449 3814
3450 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3816 and return;
3452 3817
3453 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3819
3455 1 3820 1
3456} 3821}
3457 3822
3458our $uuid_lock; 3823our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3832 my $uuid = "$LOCALDIR/uuid";
3468 3833
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3835 or return;
3471 3836
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3845 $uuid_skip = 0;
3474 3846
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3848 and return;
3477 3849
3483 or return; 3855 or return;
3484 3856
3485 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3486 and return; 3858 and return;
3487 3859
3488 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3489 3861
3490 1 3862 1
3491 3863
3492} 3864}
3493 3865
3499} 3871}
3500 3872
3501sub emergency_save() { 3873sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3503 3875
3504 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3505 3882
3506 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3507 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3892 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3894 $pl->save;
3516 } 3895 }
3517 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3518 3897
3519 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3903 $map->valid or next;
3523 $map->save; 3904 $map->save;
3524 } 3905 }
3525 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3526 3907
3527 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3530 3913
3531 warn "begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3915 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3936 };
3535 3937
3536 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3537} 3939}
3538 3940
3539sub post_cleanup { 3941sub post_cleanup {
3540 my ($make_core) = @_; 3942 my ($make_core) = @_;
3541 3943
3944 IO::AIO::flush;
3945
3542 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3951}
3952
3953# a safer delete_package, copied from Symbol
3954sub clear_package($) {
3955 my $pkg = shift;
3956
3957 # expand to full symbol table name if needed
3958 unless ($pkg =~ /^main::.*::$/) {
3959 $pkg = "main$pkg" if $pkg =~ /^::/;
3960 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3961 $pkg .= '::' unless $pkg =~ /::$/;
3962 }
3963
3964 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3965 my $stem_symtab = *{$stem}{HASH};
3966
3967 defined $stem_symtab and exists $stem_symtab->{$leaf}
3968 or return;
3969
3970 # clear all symbols
3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3972 for my $name (keys %$leaf_symtab) {
3973 _gv_clear *{"$pkg$name"};
3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3975 }
3544} 3976}
3545 3977
3546sub do_reload_perl() { 3978sub do_reload_perl() {
3547 # can/must only be called in main 3979 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3549 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3550 return; 3982 return;
3551 } 3983 }
3552 3984
3553 warn "reloading..."; 3985 return if $RELOAD++;
3554 3986
3555 warn "entering sync_job"; 3987 my $t1 = AE::time;
3556 3988
3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3992
3993 trace "perl_reload: entering sync_job";
3994
3557 cf::sync_job { 3995 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3996 #cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark
3561 3997
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"; 3998 trace "perl_reload: cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = (); 4000 %EXT_CORO = ();
3581 4001
3582 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3583 %COMMAND = (); 4003 %COMMAND = ();
3584 4004
3585 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3586 %EXTCMD = (); 4006 %EXTCMD = ();
3587 %EXTICMD = (); 4007 %EXTICMD = ();
3588 4008
3589 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3590 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3592 4012
3593 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3594 eval { 4014 eval {
3595 $cb->($pkg); 4015 $cb->($pkg);
3596 1 4016 1
3597 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
4018 }
4019
4020 trace "... clearing $pkg";
4021 clear_package $pkg;
3598 } 4022 }
3599 4023
3600 warn "... nuking $pkg";
3601 Symbol::delete_package $pkg;
3602 }
3603
3604 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3605 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 4027
3608 warn "... unloading $k"; 4028 trace "... unloading $k";
3609 delete $INC{$k}; 4029 delete $INC{$k};
3610 4030
3611 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3613 4033
3614 if (my $cb = $k->can ("unload_module")) { 4034 if (my $cb = $k->can ("unload_module")) {
3615 $cb->(); 4035 $cb->();
4036 }
4037
4038 clear_package $k;
3616 } 4039 }
3617 4040
3618 Symbol::delete_package $k;
3619 }
3620
3621 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 4042 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 4044
3625 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 4048
3629 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3630 # and global variables created in xs 4050 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3632 4052
3633 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3634 4054
3635 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3636 require cf; 4056 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3638 4058
3639 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3640 cf::reload_config; 4060 cf::reload_config;
3641 4061
3642 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3643 cf::load_extensions; 4063 cf::load_extensions;
3644 4064
4065 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3648 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3651 4073
3652 warn "leaving sync_job"; 4074 cf::_post_init 1;
3653 4075
4076 trace "perl_reload: leaving sync_job";
4077
3654 1 4078 1
3655 } or do { 4079 } or do {
3656 warn $@; 4080 error $@;
3657 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
4082 };
4083
4084 --$RELOAD;
3658 }; 4085 }
3659 4086
3660 warn "reloaded"; 4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3661}; 4089};
3662 4090
3663our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3664 4092
3665sub reload_perl() { 4093sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3668 4096
4097 $RELOAD_WATCHER ||= cf::async {
4098 Coro::AIO::aio_wait cache_extensions;
4099
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4101 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
4103 };
3672 }; 4104 };
3673} 4105}
3674 4106
3675register_command "reload" => sub { 4107register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3682 reload_perl; 4114 reload_perl;
3683 }; 4115 };
3684 } 4116 }
3685}; 4117};
3686 4118
3687unshift @INC, $LIBDIR; 4119#############################################################################
3688 4120
3689my $bug_warning = 0; 4121my $bug_warning = 0;
3690 4122
3691our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN;
3693
3694sub wait_for_tick { 4123sub wait_for_tick() {
3695 return if tick_inhibit; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3696 return if $Coro::current == $Coro::main;
3697 4125
3698 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3699 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait;
3701} 4127}
3702 4128
3703sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3704 return if tick_inhibit; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3705 return if $Coro::current == $Coro::main;
3706 4131
3707 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 4134 $signal->wait;
3710} 4135}
3714 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3715 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3716 return; 4141 return;
3717 } 4142 }
3718 4143
3719 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4145
4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3720 4147
3721 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3723 Coro::async_pool { 4150 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3725 write_runtime_sync 4152 write_runtime_sync
3726 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3727 }; 4154 };
3728 } 4155 }
3729 4156
3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3731 $sig->send; 4158 $sig->send;
3732 } 4159 }
3733 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3734 $sig->send;
3735 }
3736 4161
3737 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3738 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3739 4164
3740 if (0) { 4165 if (0) {
3741 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3742 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3745 } 4170 }
3746 } 4171 }
3747} 4172}
3748 4173
3749{ 4174{
3750 # configure BDB 4175 # configure BDB
3751 4176
3752 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3753 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3755 4180
3756 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4183 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 4184 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4185 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4186 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4187 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 4188
3763 cf::sync_job { 4189 cf::sync_job {
3764 eval { 4190 eval {
3790{ 4216{
3791 # configure IO::AIO 4217 # configure IO::AIO
3792 4218
3793 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 4221 undef $AnyEvent::AIO::WATCHER;
3796} 4222}
3797 4223
3798my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3799 4226
3800sub _log_backtrace { 4227sub _log_backtrace {
3801 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3802 4229
3803 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3804 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3805 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3807 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3808 async { 4240 async {
3809 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3810 4242
3811 my @bt = fork_call { 4243 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3823 } 4255 }
3824 4256
3825 @funcs 4257 @funcs
3826 }; 4258 };
3827 4259
3828 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 4263 --$_log_backtrace;
3831 }; 4264 };
3832 } else { 4265 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3835 } 4268 }
3836} 4269}
3837 4270
3838# load additional modules 4271# load additional modules
3839use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3840 4274
3841END { cf::emergency_save } 4275END { cf::emergency_save }
3842 4276
38431 42771
3844 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines