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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 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 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
51use Data::Dumper; 55use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 56use Fcntl;
54use YAML (); 57use YAML::XS ();
55use IO::AIO (); 58use IO::AIO ();
56use Time::HiRes; 59use Time::HiRes;
57use Compress::LZF; 60use Compress::LZF;
58use Digest::MD5 (); 61use Digest::MD5 ();
59 62
60AnyEvent::detect; 63AnyEvent::detect;
61 64
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 75
70$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" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
87our $DATADIR = datadir; 99our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
91our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
97our %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;
98 120
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 123our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
103 125
104our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 129our $DB_ENV;
108 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
109our %CFG; 133our %CFG;
110 134
111our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
113our $NOW; 138our $NOW;
114 139
115our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
116our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
117our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 149our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
126 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
127binmode STDOUT; 160binmode STDOUT;
128binmode STDERR; 161binmode STDERR;
129 162
130# read virtual server time, if available 163# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
135} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
136 171
137mkdir $_ 172mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 174
140our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
141 176
142sub cf::map::normalise; 177sub cf::map::normalise;
143 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
144############################################################################# 183#############################################################################
145 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
146=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
147 197
148=over 4 198=over 4
149 199
150=item $cf::UPTIME 200=item $cf::UPTIME
151 201
152The 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.
153 218
154=item $cf::RUNTIME 219=item $cf::RUNTIME
155 220
156The 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
157every server tick. 222every server tick.
163Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
164directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
165unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
166database environment. 231database environment.
167 232
168=item $cf::NOW
169
170The time of the last (current) server tick.
171
172=item $cf::TICK
173
174The interval between server ticks, in seconds.
175
176=item $cf::LOADAVG 233=item $cf::LOADAVG
177 234
178The 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
179(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
180objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
189from wherever your confdir points to. 246from wherever your confdir points to.
190 247
191=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
192 249
193These 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
194returns 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
195per 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.
196 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
197=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
198 272
199This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 275that call.
202 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
203=back 283=back
204 284
205=cut 285=cut
206 286
207BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
208 *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 {
209 my $msg = join "", @_; 294 my $msg = join "", @_;
210 295
211 $msg .= "\n" 296 $msg .= "\n"
212 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
213 298
214 $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;
215 300
216 LOG llevError, $msg; 301 LOG llevWarn, $msg;
217 }; 302};
218}
219 303
220$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
222 306
223 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 311 return;#d#
226 }#d# 312 }#d#
227 313
228 # kill coroutine otherwise 314 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 315 Coro::terminate
231}; 316};
232
233$SIG{__DIE__} = sub { }; #d#?
234 317
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
245for my $pkg (qw( 328for my $pkg (qw(
246 cf::global cf::attachable 329 cf::global cf::attachable
247 cf::object cf::object::player 330 cf::object cf::object::player
248 cf::client cf::player 331 cf::client cf::player
249 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
250 cf::map cf::party cf::region 334 cf::party cf::region
251)) { 335)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 337}
255 338
256$EV::DIED = sub { 339$EV::DIED = sub {
257 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
258}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
259 347
260############################################################################# 348#############################################################################
261 349
262=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
263 351
284 $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;
285 $d 373 $d
286 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
287} 375}
288 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
289=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
290 392
291Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
292 394
293=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
299our $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
300 402
301sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 468=item cf::lock_wait $string
305 469
306Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
307 471
308=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
309 473
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
313returned. 477returned.
314 478
315Locks 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
316deadlocked coro. 480deadlocked coro.
322 486
323Return 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.
324 488
325=cut 489=cut
326 490
327our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 492
330sub lock_wait($) { 493sub lock_wait($) {
331 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 495}
344 496
345sub lock_acquire($) { 497sub lock_acquire($) {
346 my ($key) = @_; 498 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 499}
360 500
361sub lock_active($) { 501sub lock_active($) {
362 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 503}
366 504
367sub freeze_mainloop { 505sub freeze_mainloop {
368 tick_inhibit_inc; 506 tick_inhibit_inc;
369 507
370 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
371} 509}
372 510
373=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
374 512
375Like 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
376get spread over timer. 514get spread over time.
377 515
378=cut 516=cut
379 517
380sub periodic($$) { 518sub periodic($$) {
381 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
386} 524}
387 525
388=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
389 527
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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.
393 535
394The 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
395used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
396 538
397Useful for short background jobs. 539Useful for short background jobs.
398 540
399=cut 541=cut
400 542
401our @SLOT_QUEUE; 543our @SLOT_QUEUE;
402our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
403 546
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
407 550
408 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
409 553
410 while () { 554 while () {
411 next_job: 555 next_job:
556
412 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 558
414 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 563 $job->[2]->send;
418 Coro::cede; 564 Coro::cede;
419 goto next_job; 565 goto next_job;
420 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 568 }
422 } 569 }
423 570
424 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 574 } else {
575 $busy = 0;
429 Coro::schedule; 576 Coro::schedule;
430 } 577 }
431 } 578 }
432}; 579};
433 580
434sub get_slot($;$$) { 581sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
436 583
437 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
438 585
439 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
440 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
441 589
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
470=cut 618=cut
471 619
472sub sync_job(&) { 620sub sync_job(&) {
473 my ($job) = @_; 621 my ($job) = @_;
474 622
475 if ($Coro::current == $Coro::main) { 623 if (in_main) {
476 my $time = EV::time; 624 my $time = AE::time;
477 625
478 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
480 628
481 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
482 630
483 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
484 632
485 my $busy = 1; 633 my $busy = 1;
486 my @res; 634 my @res;
487 635
488 (async { 636 (async {
489 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 638 @res = eval { $job->() };
491 warn $@ if $@; 639 error $@ if $@;
492 undef $busy; 640 undef $busy;
493 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
494 642
495 while ($busy) { 643 while ($busy) {
496 if (Coro::nready) { 644 if (Coro::nready) {
498 } else { 646 } else {
499 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
500 } 648 }
501 } 649 }
502 650
503 my $time = EV::time - $time; 651 my $time = AE::time - $time;
504 652
505 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
506 654
507 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
508 } else { 656 } else {
530 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
531 679
532 $coro 680 $coro
533} 681}
534 682
535=item fork_call { }, $args 683=item fork_call { }, @args
536 684
537Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 688never block itself or use any form of event handling.
541 689
542=cut 690=cut
543 691
692sub post_fork {
693 reset_signals;
694}
695
544sub fork_call(&@) { 696sub fork_call(&@) {
545 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
546 698
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
550 702
551 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
552 reset_signals; 704 cf::post_fork;
553 &$cb 705 &$cb
554 }, @args; 706 } @args;
555 707
556 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 )
557} 720}
558 721
559=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
560 723
561=cut 724=cut
598within each server. 761within each server.
599 762
600=cut 763=cut
601 764
602sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
603 my ($name) = @_; 769 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
605 771
606 eval { 772 eval {
607 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
617} 783}
618 784
619our $DB; 785our $DB;
620 786
621sub db_init { 787sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
624 };
625} 789}
626 790
627sub db_get($$) { 791sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
629 793
630 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
631 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
632 798
633 $! ? () 799 $! ? ()
634 : $data 800 : $data
635 }
636} 801}
637 802
638sub db_put($$$) { 803sub db_put($$$) {
639 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 833
669 my @data; 834 my @data;
670 my $md5; 835 my $md5;
671 836
672 for (0 .. $#$src) { 837 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 839 }
676 840
677 # if processing is expensive, check 841 # if processing is expensive, check
678 # checksum first 842 # checksum first
679 if (1) { 843 if (1) {
696 860
697 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 862 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
700 864
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 866
703 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
706 870
716 880
717=cut 881=cut
718 882
719sub datalog($@) { 883sub datalog($@) {
720 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 886}
723 887
724=back 888=back
725 889
726=cut 890=cut
727 891
728############################################################################# 892#############################################################################
729 893
730=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
731 895
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
735 899
736In 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>
737C<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
787=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
788 952
789Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
791 955
792Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 958
795These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
796 960
797=over 4 961=over 4
921 1085
922 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1088
925 } elsif (ref $type) { 1089 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
927 1091
928 } else { 1092 } else {
929 shift @arg; 1093 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
931 } 1095 }
932 } 1096 }
933} 1097}
934 1098
935sub _object_attach { 1099sub _object_attach {
945 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
946 } 1110 }
947 1111
948 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
949 } else { 1113 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1115 }
952 1116
953 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
954} 1118}
955 1119
1014 1178
1015 for (@$callbacks) { 1179 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1017 1181
1018 if ($@) { 1182 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1184 override;
1022 } 1185 }
1023 1186
1024 return 1 if $override; 1187 return 1 if $override;
1025 } 1188 }
1088 1251
1089sub reattach { 1252sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1254 my ($obj) = @_;
1092 1255
1256 # no longer needed after getting rid of delete_package?
1093 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
1094 1258
1095 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1096 1260
1097 @$registry = (); 1261 @$registry = ();
1098 1262
1103 for (@$attach) { 1267 for (@$attach) {
1104 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1105 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1106 } 1270 }
1107 } else { 1271 } else {
1108 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1109 } 1273 }
1110 } 1274 }
1111} 1275}
1112 1276
1113cf::attachable->attach ( 1277cf::attachable->attach (
1140 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1141 1305
1142 sync_job { 1306 sync_job {
1143 if (length $$rdata) { 1307 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1145 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1146 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1147 1312
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 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 }
1152 aio_close $fh; 1320 aio_close $fh;
1153 1321
1154 if (@$objs) { 1322 if (@$objs) {
1155 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) {
1156 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1159 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 }
1160 aio_close $fh; 1331 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1333 }
1163 } else { 1334 } else {
1164 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1165 } 1336 }
1166 1337
1167 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1342 } else {
1169 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1170 } 1344 }
1171 } else { 1345 } else {
1172 aio_unlink $filename; 1346 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1174 } 1348 }
1198 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs}; 1373 $av = $st->{objs};
1200 } 1374 }
1201 1375
1202 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1203 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1204 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1205 1380
1206 ($data, $av) 1381 ($data, $av)
1207} 1382}
1208 1383
1209=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1265 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1266 1441
1267 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1268} 1443}
1269 1444
1445use File::Glob ();
1446
1270cf::player->attach ( 1447cf::player->attach (
1271 on_command => sub { 1448 on_unknown_command => sub {
1272 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1273 1450
1274 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1275 or return; 1452 or return;
1276 1453
1284 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1285 1462
1286 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1287 1464
1288 if (ref $msg) { 1465 if (ref $msg) {
1289 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1290 "ARRAY" eq ref $msg
1291 ? @$msg
1292 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1293 1467
1294 my @reply; 1468 my @reply;
1295 1469
1296 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1297 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1299 1473
1300 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1301 if $reply; 1475 if $reply;
1302 1476
1303 } else { 1477 } else {
1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1305 } 1479 }
1306 1480
1307 cf::override; 1481 cf::override;
1308 }, 1482 },
1309); 1483);
1310 1484
1485# "readahead" all extensions
1486sub cache_extensions {
1487 my $grp = IO::AIO::aio_group;
1488
1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1490 for (grep /\.ext$/, @{$_[0]}) {
1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1492 }
1493 };
1494
1495 $grp
1496}
1497
1311sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1312 cf::sync_job { 1501 cf::sync_job {
1313 my %todo; 1502 my %todo;
1314 1503
1315 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1316 next unless -r $path; 1505 next unless -r $path;
1334 1523
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1526
1338 $ext{source} = 1527 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1340 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1341 . $source 1530 . $source
1342 . "\n};\n1"; 1531 . "\n};\n1";
1343 1532
1344 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1345 } 1534 }
1346 1535
1536 my $pass = 0;
1347 my %done; 1537 my %done;
1348 while (%todo) { 1538 while (%todo) {
1349 my $progress; 1539 my $progress;
1350 1540
1541 ++$pass;
1542
1543 ext:
1351 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1352 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1353 goto skip 1546 next ext
1354 unless exists $done{$_}; 1547 unless exists $done{$_};
1355 } 1548 }
1356 1549
1357 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1358 1551
1359 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1360 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1361 : "$v->{base}: extension inactive.\n";
1362 1556
1363 if (exists $v->{meta}{mandatory}) {
1364 warn $msg;
1365 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1366 } 1558 if exists $v->{meta}{mandatory};
1367 1559
1368 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1369 } 1569 }
1370
1371 $done{$k} = delete $todo{$k};
1372 push @EXTS, $v->{pkg};
1373 $progress = 1;
1374 } 1570 }
1375 1571
1376 skip: 1572 unless ($progress) {
1377 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1378 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1379 } 1582 }
1380 }; 1583 };
1381} 1584}
1382 1585
1383############################################################################# 1586#############################################################################
1384 1587
1385=back 1588=back
1386 1589
1387=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1388 1591
1389Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1390 1593
1391=cut 1594=cut
1392 1595
1393package cf::player; 1596package cf::player;
1394 1597
1437 1640
1438sub exists($) { 1641sub exists($) {
1439 my ($login) = @_; 1642 my ($login) = @_;
1440 1643
1441 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1443} 1646}
1444 1647
1445sub find($) { 1648sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1650 my $login = $_[0];
1467 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1468 } 1671 }
1469 } 1672 }
1470} 1673}
1471 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1472sub save($) { 1688sub save($) {
1473 my ($pl) = @_; 1689 my ($pl) = @_;
1474 1690
1475 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1476 1692
1481 1697
1482 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1483 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1484 1700
1485 cf::get_slot 0.01; 1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1486 1705
1487 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1488 cf::cede_to_tick; 1707 cf::cede_to_tick;
1489} 1708}
1490 1709
1522 my ($pl) = @_; 1741 my ($pl) = @_;
1523 1742
1524 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1525 1744
1526 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1527 $pl->password ("*"); # this should lock out the player until we nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1528 1747
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1530 $pl->deactivate; 1749 $pl->deactivate;
1750
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1533 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1534 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1535 1756
1536 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1537 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1538 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1592 \@logins 1813 \@logins
1593} 1814}
1594 1815
1595=item $player->maps 1816=item $player->maps
1596 1817
1818=item cf::player::maps $login
1819
1597Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1598player. May block. 1821player. May block.
1599 1822
1600=cut 1823=cut
1601 1824
1618 } 1841 }
1619 1842
1620 \@paths 1843 \@paths
1621} 1844}
1622 1845
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1847
1625Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1849
1716=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1717 1851
1718Sends an ext reply to the player. 1852Sends an ext reply to the player.
1719 1853
1751 1885
1752=cut 1886=cut
1753 1887
1754sub find_by_path($) { 1888sub find_by_path($) {
1755 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1756 1892
1757 my ($match, $specificity); 1893 my ($match, $specificity);
1758 1894
1759 for my $region (list) { 1895 for my $region (list) {
1760 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1789sub generate_random_map { 1925sub generate_random_map {
1790 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1791 1927
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793 1929
1794 # mit "rum" bekleckern, nicht
1795 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 $rmp->{exit_on_final_map},
1800 $rmp->{xsize}, $rmp->{ysize},
1801 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1802 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1803 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1804 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1805 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1806 (cf::region::find $rmp->{region}), $rmp->{custom}
1807 )
1808} 1931}
1809 1932
1810=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1811 1934
1812Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1817 1940
1818sub register { 1941sub register {
1819 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1820 my $pkg = caller; 1943 my $pkg = caller;
1821 1944
1822 no strict;
1823 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1824 1946
1825 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1826} 1948}
1827 1949
1828# also paths starting with '/' 1950# also paths starting with '/'
1829$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1830 1952
1831sub thawer_merge { 1953sub thawer_merge {
1832 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1833 1955
1834 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1839} 1961}
1840 1962
1841sub normalise { 1963sub normalise {
1842 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1843 1965
1844 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1845 1967
1846 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1847 1969
1848 # map plan: 1970 # map plan:
1849 # 1971 #
1864 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1865 $path = "$base/$path"; 1987 $path = "$base/$path";
1866 } 1988 }
1867 1989
1868 for ($path) { 1990 for ($path) {
1869 redo if s{//}{/};
1870 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1871 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1872 } 1993 }
1873 1994
1874 $path 1995 $path
1888 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1889 return $self; 2010 return $self;
1890 } 2011 }
1891 } 2012 }
1892 2013
1893 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1894 () 2015 ()
1895} 2016}
1896 2017
2018# may re-bless or do other evil things
1897sub init { 2019sub init {
1898 my ($self) = @_; 2020 my ($self) = @_;
1899 2021
1900 $self 2022 $self
1901} 2023}
1932 2054
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1935} 2057}
1936 2058
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 2059sub decay_objects {
1947 my ($self) = @_; 2060 my ($self) = @_;
1948 2061
1949 return if $self->{deny_reset}; 2062 return if $self->{deny_reset};
1950 2063
1975 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1976 2089
1977 1 2090 1
1978} 2091}
1979 2092
2093# used to laod the header of an original map
1980sub load_header_orig { 2094sub load_header_orig {
1981 my ($self) = @_; 2095 my ($self) = @_;
1982 2096
1983 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1984} 2098}
1985 2099
2100# used to laod the header of an instantiated map
1986sub load_header_temp { 2101sub load_header_temp {
1987 my ($self) = @_; 2102 my ($self) = @_;
1988 2103
1989 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1990} 2105}
1991 2106
2107# called after loading the header from an instantiated map
1992sub prepare_temp { 2108sub prepare_temp {
1993 my ($self) = @_; 2109 my ($self) = @_;
1994 2110
1995 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1996 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1997 # safety 2113 # safety
1998 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1999 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
2000} 2116}
2001 2117
2118# called after loading the header from an original map
2002sub prepare_orig { 2119sub prepare_orig {
2003 my ($self) = @_; 2120 my ($self) = @_;
2004 2121
2005 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
2006 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
2030 2147
2031sub find; 2148sub find;
2032sub find { 2149sub find {
2033 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
2034 2151
2152 cf::cede_to_tick;
2153
2035 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
2036 2155
2037 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
2039 2158
2040 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
2045 or return; 2161 or return;
2046 2162
2047 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
2048 2164
2060 2176
2061 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
2062 } 2178 }
2063} 2179}
2064 2180
2065sub pre_load { } 2181sub pre_load { }
2066sub post_load { } 2182#sub post_load { } # XS
2067 2183
2068sub load { 2184sub load {
2069 my ($self) = @_; 2185 my ($self) = @_;
2070 2186
2071 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2074 2190
2075 { 2191 {
2076 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2077 2193
2078 return unless $self->valid; 2194 return unless $self->valid;
2079 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2080
2081 $self->in_memory (cf::MAP_LOADING);
2082 2196
2083 $self->alloc; 2197 $self->alloc;
2084 2198
2085 $self->pre_load; 2199 $self->pre_load;
2086 cf::cede_to_tick; 2200 cf::cede_to_tick;
2087 2201
2202 if (exists $self->{load_path}) {
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2204 $f->skip_block;
2090 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2091 or return; 2206 or return;
2092 2207
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
2094 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2095 2210
2096 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2212 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2099 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2100 $self->clear_unique_items; 2215 $self->clear_unique_items;
2101 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2102 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2103 } 2219 }
2104 } 2220 }
2105 }
2106 2221
2107 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2108 2229
2109 cf::cede_to_tick; 2230 cf::cede_to_tick;
2110 # now do the right thing for maps 2231 # now do the right thing for maps
2111 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2112 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2116 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2238 $self->decay_objects;
2118 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2119 $self->update_buttons; 2240 $self->update_buttons;
2120 cf::cede_to_tick; 2241 cf::cede_to_tick;
2121 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
2122 cf::cede_to_tick;
2123 $self->activate;
2124 } 2243 }
2125 2244
2126 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2128
2129 $self->in_memory (cf::MAP_ACTIVE);
2130 } 2247 }
2131 2248
2132 $self->post_load; 2249 $self->post_load;
2133}
2134 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2135sub customise_for { 2257sub customise_for {
2136 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2137 2259
2138 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2139 if $self->per_player; 2261 if $self->per_player;
2142# if $self->per_party; 2264# if $self->per_party;
2143 2265
2144 $self 2266 $self
2145} 2267}
2146 2268
2147# find and load all maps in the 3x3 area around a map
2148sub load_neighbours {
2149 my ($map) = @_;
2150
2151 my @neigh; # diagonal neighbours
2152
2153 for (0 .. 3) {
2154 my $neigh = $map->tile_path ($_)
2155 or next;
2156 $neigh = find $neigh, $map
2157 or next;
2158 $neigh->load;
2159
2160 push @neigh,
2161 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2162 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2163 }
2164
2165 for (grep defined $_->[0], @neigh) {
2166 my ($path, $origin) = @$_;
2167 my $neigh = find $path, $origin
2168 or next;
2169 $neigh->load;
2170 }
2171}
2172
2173sub find_sync { 2269sub find_sync {
2174 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2175 2271
2176 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2177} 2277}
2178 2278
2179sub do_load_sync { 2279sub do_load_sync {
2180 my ($map) = @_; 2280 my ($map) = @_;
2181 2281
2282 # it's a bug to call this from the main context
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2184 2285
2185 cf::sync_job { $map->load }; 2286 $map->load;
2186} 2287}
2187 2288
2188our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2189our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2190 2291
2191sub find_async { 2292sub find_async {
2192 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2193 2294
2194 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2195 2296
2196 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2198 } 2299 }
2199 2300
2200 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2201 2302
2202 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2216 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2217 2318
2218 () 2319 ()
2219} 2320}
2220 2321
2322# common code, used by both ->save and ->swapout
2221sub save { 2323sub _save {
2222 my ($self) = @_; 2324 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2325
2226 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2227 2327
2228 return unless $self->dirty; 2328 return unless $self->dirty;
2229 2329
2249 } else { 2349 } else {
2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2251 } 2351 }
2252} 2352}
2253 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2254sub swap_out { 2362sub swap_out {
2255 my ($self) = @_; 2363 my ($self) = @_;
2256 2364
2257 # save first because save cedes
2258 $self->save;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2262 return if $self->players; 2369 return if $self->players;
2263 return if $self->in_memory != cf::MAP_ACTIVE; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2264 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2265 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2266 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2267 2421
2268 $self->deactivate; 2422 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2270 $self->clear; 2424 $self->clear;
2271}
2272
2273sub reset_at {
2274 my ($self) = @_;
2275
2276 # TODO: safety, remove and allow resettable per-player maps
2277 return 1e99 if $self->{deny_reset};
2278
2279 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2280 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2281
2282 $time + $to
2283}
2284
2285sub should_reset {
2286 my ($self) = @_;
2287
2288 $self->reset_at <= $cf::RUNTIME
2289}
2290
2291sub reset {
2292 my ($self) = @_;
2293
2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295
2296 return if $self->players;
2297
2298 warn "resetting map ", $self->path;
2299
2300 $self->in_memory (cf::MAP_SWAPPED);
2301
2302 # need to save uniques path
2303 unless ($self->{deny_save}) {
2304 my $uniq = $self->uniq_path; utf8::encode $uniq;
2305
2306 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2307 if $uniq;
2308 }
2309
2310 delete $cf::MAP{$self->path};
2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
2314 $self->clear;
2315 2425
2316 $self->unlink_save; 2426 $self->unlink_save;
2317 $self->destroy; 2427 $self->destroy;
2318} 2428}
2319 2429
2327 2437
2328 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2329 2439
2330 $self->unlink_save; 2440 $self->unlink_save;
2331 2441
2332 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2333 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2334 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2335 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2337 2447
2394 : normalise $_ 2504 : normalise $_
2395 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2396 ] 2506 ]
2397} 2507}
2398 2508
2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2540
2399=back 2541=back
2400 2542
2401=head3 cf::object 2543=head3 cf::object
2402 2544
2403=cut 2545=cut
2468 2610
2469our $SAY_CHANNEL = { 2611our $SAY_CHANNEL = {
2470 id => "say", 2612 id => "say",
2471 title => "Map", 2613 title => "Map",
2472 reply => "say ", 2614 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2474}; 2616};
2475 2617
2476our $CHAT_CHANNEL = { 2618our $CHAT_CHANNEL = {
2477 id => "chat", 2619 id => "chat",
2478 title => "Chat", 2620 title => "Chat",
2533 2675
2534=item $player_object->enter_link 2676=item $player_object->enter_link
2535 2677
2536Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2537 2679
2538The player should be reasonably safe there for short amounts of time. You 2680The player should be reasonably safe there for short amounts of time (e.g.
2539I<MUST> call C<leave_link> as soon as possible, though. 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link
2683map.
2540 2684
2541Will never block. 2685Will never block.
2542 2686
2543=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2544 2688
2564sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2565 my ($self) = @_; 2709 my ($self) = @_;
2566 2710
2567 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2568 2712
2713 ++$self->{_link_recursion};
2714
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2716
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2573 2719
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2721}
2576 2722
2577sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2579 2725
2596 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2597 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2598 2744
2599 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2602 2748
2603 $map->load; 2749 $map->load;
2604 $map->load_neighbours;
2605 2750
2606 return unless $self->contr->active; 2751 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2752
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2611} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2612 2760
2761}
2762
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2614 2764
2615Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2616her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2617that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2618the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process. 2769be called at the end of this process.
2620 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2621=cut 2774=cut
2622 2775
2623our $GOTOGEN; 2776our $GOTOGEN;
2624 2777
2625sub cf::object::player::goto { 2778sub cf::object::player::goto {
2626 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2627 2786
2628 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2630 2789
2631 $self->enter_link; 2790 $self->enter_link;
2651 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2652 } 2811 }
2653 } 2812 }
2654 2813
2655 my $map = eval { 2814 my $map = eval {
2656 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2657 2816
2658 if ($map) { 2817 if ($map) {
2659 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2660 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2661 } else { 2820 } else {
2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2663 } 2822 }
2664 2823
2665 $map 2824 $map
2673 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2674 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2675 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2676 } 2835 }
2677 2836
2678 $done->() if $done; 2837 $done->($self) if $done;
2679 })->prio (1); 2838 })->prio (1);
2680} 2839}
2681 2840
2682=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2683 2842
2751 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2752 2911
2753 unless (eval { 2912 unless (eval {
2754 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2755 2914
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2765 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2767 2941
2768 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2769 2943
2770 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2946 if $exit->flag (cf::FLAG_DAMNED);
2773 2947
2774 1 2948 1
2775 }) { 2949 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2778 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2954
2781 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2782 $self->leave_link; 2956 $self->leave_link;
2783 } 2957 }
2784 })->prio (1); 2958 })->prio (1);
2785} 2959}
2786 2960
2798sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2800 2974
2801 utf8::encode $text; 2975 utf8::encode $text;
2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2803} 3002}
2804 3003
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 3005
2807Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2811 3010
2812=cut 3011=cut
2813 3012
2814# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2816 "c/identify" => { 3021 "c/identify" => {
2817 id => "infobox", 3022 id => "infobox",
2818 title => "Identify", 3023 title => "Identify",
2819 reply => undef, 3024 reply => undef,
2820 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2822 "c/examine" => { 3027 "c/examine" => {
2823 id => "infobox", 3028 id => "infobox",
2824 title => "Examine", 3029 title => "Examine",
2825 reply => undef, 3030 reply => undef,
2826 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
2827 }, 3038 },
2828 "c/book" => { 3039 "c/book" => {
2829 id => "infobox", 3040 id => "infobox",
2830 title => "Book", 3041 title => "Book",
2831 reply => undef, 3042 reply => undef,
2847 id => "infobox", 3058 id => "infobox",
2848 title => "Body Parts", 3059 title => "Body Parts",
2849 reply => undef, 3060 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2851 }, 3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
3098 },
2852 "c/uptime" => { 3099 "c/uptime" => {
2853 id => "infobox", 3100 id => "infobox",
2854 title => "Uptime", 3101 title => "Uptime",
2855 reply => undef, 3102 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 3103 tooltip => "How long the server has been running since last restart",
2865 id => "party", 3112 id => "party",
2866 title => "Party", 3113 title => "Party",
2867 reply => "gsay ", 3114 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 3115 tooltip => "Messages and chat related to your party",
2869 }, 3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
2870); 3125);
2871 3126
2872sub cf::client::send_msg { 3127sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2874 3129
2875 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2876 3132
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 3134
2879 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2882 3138
2883 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2887 3141
2888 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 3147 }
2895 3148
2896 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2897 } 3150 }
2898 3151
2899 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2900 3153
2901 if ($self->can_msg) {
2902 # default colour, mask it out 3154 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2905 3157
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 3161 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 3162
2920 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2921
2922 utf8::encode $msg;
2923
2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 }
2933} 3164}
2934 3165
2935=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2936 3167
2937Sends an ext event to the client. 3168Sends an ext event to the client.
2940 3171
2941sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2943 3174
2944 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3180 }
2950} 3181}
2951 3182
2952=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2953 3184
2956=cut 3187=cut
2957 3188
2958sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2960 3191
2961 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 }
2968} 3195}
2969 3196
2970=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2971 3198
2972Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
3027 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3028 3255
3029 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3030 3257
3031 if (ref $msg) { 3258 if (ref $msg) {
3032 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3033 "ARRAY" eq ref $msg
3034 ? @$msg
3035 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3036 3260
3037 my @reply; 3261 my @reply;
3038 3262
3039 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3040 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
3042 3266
3043 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3044 if $reply; 3268 if $reply;
3045 3269
3046 } else { 3270 } else {
3047 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3048 } 3272 }
3049 3273
3050 cf::override; 3274 cf::override;
3051 }, 3275 },
3052); 3276);
3072 3296
3073 $coro 3297 $coro
3074} 3298}
3075 3299
3076cf::client->attach ( 3300cf::client->attach (
3077 on_destroy => sub { 3301 on_client_destroy => sub {
3078 my ($ns) = @_; 3302 my ($ns) = @_;
3079 3303
3080 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3081 }, 3305 },
3082); 3306);
3098our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3099 3323
3100$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3101 3325
3102$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3104 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3105 sort time 3329 sort time
3106)); 3330));
3107 3331
3108# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3112The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3113 3337
3114 cf::object 3338 cf::object
3115 contr pay_amount pay_player map x y force_find force_add destroy 3339 contr pay_amount pay_player map x y force_find force_add destroy
3116 insert remove name archname title slaying race decrease split 3340 insert remove name archname title slaying race decrease split
3341 value
3117 3342
3118 cf::object::player 3343 cf::object::player
3119 player 3344 player
3120 3345
3121 cf::player 3346 cf::player
3127=cut 3352=cut
3128 3353
3129for ( 3354for (
3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3131 insert remove inv nrof name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3136) { 3361) {
3137 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3140 for @funs; 3364 for @funs;
3141} 3365}
3142 3366
3157 3381
3158 my $qcode = $code; 3382 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3161 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3162 local $_; 3389 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars;
3164 3390
3165 my $eval = 3391 my $eval =
3166 "do {\n" 3392 "do {\n"
3167 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3168 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3169 . $code 3395 . $code
3170 . "\n}" 3396 . "\n}"
3171 ; 3397 ;
3172 3398
3399 if ($CFG{safe_eval}) {
3173 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3174 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3175 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3176 3408
3177 if ($@) { 3409 if ($@) {
3178 warn "$@"; 3410 warn "$@",
3179 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3180 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3181 } 3413 }
3182 3414
3183 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3184} 3416}
3185 3417
3199=cut 3431=cut
3200 3432
3201sub register_script_function { 3433sub register_script_function {
3202 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3203 3435
3204 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3205 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3206} 3438}
3207 3439
3208=back 3440=back
3209 3441
3210=cut 3442=cut
3219 # for this (global event?) 3451 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3221 3453
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223 3455
3224 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3225 3457
3226 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3227 0 < aio_load $path, $facedata
3228 or die "$path: $!";
3229
3230 $facedata = Coro::Storable::thaw $facedata;
3231 3459
3232 $facedata->{version} == 2 3460 $facedata->{version} == 2
3233 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3234 3462
3235 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3236 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC, 3466 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3239 }; 3469 };
3240 cf::cede_to_tick; 3470 cf::cede_to_tick;
3241 3471
3242 { 3472 {
3243 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3245 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3246 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247 3477
3248 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3252 3483
3253 cf::cede_to_tick; 3484 cf::cede_to_tick;
3254 } 3485 }
3255 3486
3256 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3261 3492
3262 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3263 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3265 } else { 3496 } else {
3266 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3267 } 3498 }
3268 3499
3269 cf::cede_to_tick; 3500 cf::cede_to_tick;
3270 } 3501 }
3271 } 3502 }
3280 3511
3281 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3282 } 3513 }
3283 3514
3284 { 3515 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3288 3517
3289 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) { 3519 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293 3521
3294 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3309 } else { 3524 } else {
3310 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3311 } 3526 }
3312 3527
3313 cf::cede_to_tick; 3528 cf::cede_to_tick;
3314 } 3529 }
3315 } 3530 }
3316 3531
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318 3533
3319 1 3534 1
3320} 3535}
3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3341 3536
3342register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3344 3539
3345 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3384sub reload_treasures { 3579sub reload_treasures {
3385 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3386 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3387} 3582}
3388 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3389sub reload_resources { 3604sub reload_resources {
3390 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3391 3606
3607 reload_exp_table;
3608 reload_materials;
3392 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3393 reload_archetypes; 3611 reload_archetypes;
3394 reload_regions; 3612 reload_regions;
3395 reload_treasures; 3613 reload_treasures;
3396 3614
3397 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3398}
3399
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404} 3616}
3405 3617
3406sub reload_config { 3618sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3408 or return;
3409 3620
3410 local $/; 3621 my $config = load_file "$CONFDIR/config";
3411 *CFG = YAML::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3412 3624
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3626
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3417 3629
3418 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3422 }; 3634 };
3423 warn $@ if $@; 3635 warn $@ if $@;
3424 } 3636 }
3425} 3637}
3426 3638
3639sub pidfile() {
3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3641 or die "$PIDFILE: $!";
3642 flock $fh, &Fcntl::LOCK_EX
3643 or die "$PIDFILE: flock: $!";
3644 $fh
3645}
3646
3647# make sure only one server instance is running at any one time
3648sub atomic {
3649 my $fh = pidfile;
3650
3651 my $pid = <$fh>;
3652 kill 9, $pid if $pid > 0;
3653
3654 seek $fh, 0, 0;
3655 print $fh $$;
3656}
3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
3427sub main { 3667sub main {
3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3674
3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3676
3428 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3679 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3680 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3682 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
3435 }; 3684 };
3436 3685
3437 { 3686 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3687
3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3697 reload_resources;
3439 reload_config; 3698 reload_config;
3440 db_init; 3699 db_init;
3700
3701 cf::init_uuid;
3702 cf::init_signals;
3703 cf::init_skills;
3704
3705 cf::init_beforeplay;
3706
3707 atomic;
3708
3441 load_extensions; 3709 load_extensions;
3442 3710
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3711 utime time, time, $RUNTIMEFILE;
3712
3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3716
3717 cf::_post_init 0;
3444 } 3718 };
3445 3719
3446 EV::loop; 3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
3447} 3728}
3448 3729
3449############################################################################# 3730#############################################################################
3450# initialisation and cleanup 3731# initialisation and cleanup
3451 3732
3452# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3453BEGIN { 3734BEGIN {
3454 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3458 }; 3739 };
3459 } 3740 }
3460} 3741}
3461 3742
3462sub write_runtime_sync { 3743sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3744 my $t0 = AE::time;
3464 3745
3465 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3467 3748
3468 IO::AIO::aio_utime $runtime, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3750
3470 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3471 3752
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3754 or return;
3474 3755
3475 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3768 aio_utime $fh, undef, undef;
3488 3769
3489 close $fh 3770 close $fh
3490 or return; 3771 or return;
3491 3772
3492 aio_rename "$runtime~", $runtime 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3774 and return;
3494 3775
3495 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3777
3497 1 3778 1
3498} 3779}
3499 3780
3500our $uuid_lock; 3781our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3790 my $uuid = "$LOCALDIR/uuid";
3510 3791
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3792 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3793 or return;
3513 3794
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3796
3797 unless ($value) {
3798 info "cowardly refusing to write zero uuid value!\n";
3799 return;
3800 }
3801
3802 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3803 $uuid_skip = 0;
3516 3804
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3805 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3806 and return;
3519 3807
3525 or return; 3813 or return;
3526 3814
3527 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3528 and return; 3816 and return;
3529 3817
3530 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3531 3819
3532 1 3820 1
3533 3821
3534} 3822}
3535 3823
3541} 3829}
3542 3830
3543sub emergency_save() { 3831sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3545 3833
3546 warn "enter emergency perl save\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3547 3840
3548 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3549 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3850 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3852 $pl->save;
3558 } 3853 }
3559 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
3560 3855
3561 warn "begin emergency map save\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3861 $map->valid or next;
3565 $map->save; 3862 $map->save;
3566 } 3863 }
3567 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
3568 3865
3569 warn "begin emergency database checkpoint\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3572 3871
3573 warn "begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3873 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3576 }; 3894 };
3577 3895
3578 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
3579} 3897}
3580 3898
3581sub post_cleanup { 3899sub post_cleanup {
3582 my ($make_core) = @_; 3900 my ($make_core) = @_;
3583 3901
3902 IO::AIO::flush;
3903
3584 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3905 if $make_core;
3906
3907 my $fh = pidfile;
3908 unlink $PIDFILE if <$fh> == $$;
3909}
3910
3911# a safer delete_package, copied from Symbol
3912sub clear_package($) {
3913 my $pkg = shift;
3914
3915 # expand to full symbol table name if needed
3916 unless ($pkg =~ /^main::.*::$/) {
3917 $pkg = "main$pkg" if $pkg =~ /^::/;
3918 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3919 $pkg .= '::' unless $pkg =~ /::$/;
3920 }
3921
3922 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3923 my $stem_symtab = *{$stem}{HASH};
3924
3925 defined $stem_symtab and exists $stem_symtab->{$leaf}
3926 or return;
3927
3928 # clear all symbols
3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3930 for my $name (keys %$leaf_symtab) {
3931 _gv_clear *{"$pkg$name"};
3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3933 }
3586} 3934}
3587 3935
3588sub do_reload_perl() { 3936sub do_reload_perl() {
3589 # can/must only be called in main 3937 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3591 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3592 return; 3940 return;
3593 } 3941 }
3594 3942
3595 warn "reloading..."; 3943 return if $RELOAD++;
3596 3944
3597 warn "entering sync_job"; 3945 my $t1 = AE::time;
3598 3946
3947 while ($RELOAD) {
3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3950
3951 trace "perl_reload: entering sync_job";
3952
3599 cf::sync_job { 3953 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3954 #cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark
3603 3955
3604 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV;
3606
3607 # if anything goes wrong in here, we should simply crash as we already saved
3608
3609 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs;
3615 warn "iterate...";
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = (); 3958 %EXT_CORO = ();
3623 3959
3624 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3625 %COMMAND = (); 3961 %COMMAND = ();
3626 3962
3627 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3628 %EXTCMD = (); 3964 %EXTCMD = ();
3629 %EXTICMD = (); 3965 %EXTICMD = ();
3630 3966
3631 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3632 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3634 3970
3635 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3636 eval { 3972 eval {
3637 $cb->($pkg); 3973 $cb->($pkg);
3638 1 3974 1
3639 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3976 }
3977
3978 trace "... clearing $pkg";
3979 clear_package $pkg;
3640 } 3980 }
3641 3981
3642 warn "... nuking $pkg";
3643 Symbol::delete_package $pkg;
3644 }
3645
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3647 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3985
3650 warn "... unloading $k"; 3986 trace "... unloading $k";
3651 delete $INC{$k}; 3987 delete $INC{$k};
3652 3988
3653 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3655 3991
3656 if (my $cb = $k->can ("unload_module")) { 3992 if (my $cb = $k->can ("unload_module")) {
3657 $cb->(); 3993 $cb->();
3994 }
3995
3996 clear_package $k;
3658 } 3997 }
3659 3998
3660 Symbol::delete_package $k;
3661 }
3662
3663 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 4000 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 4002
3667 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 4006
3671 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3672 # and global variables created in xs 4008 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3674 4010
3675 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3676 4012
3677 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3678 require cf; 4014 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3680 4016
3681 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3682 cf::reload_config; 4018 cf::reload_config;
3683 4019
3684 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3685 cf::load_extensions; 4021 cf::load_extensions;
3686 4022
4023 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3690 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3693 4031
3694 warn "leaving sync_job"; 4032 cf::_post_init 1;
3695 4033
4034 trace "perl_reload: leaving sync_job";
4035
3696 1 4036 1
3697 } or do { 4037 } or do {
3698 warn $@; 4038 error $@;
3699 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
4040 };
4041
4042 --$RELOAD;
3700 }; 4043 }
3701 4044
3702 warn "reloaded"; 4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3703}; 4047};
3704 4048
3705our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3706 4050
3707sub reload_perl() { 4051sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3710 4054
4055 $RELOAD_WATCHER ||= cf::async {
4056 Coro::AIO::aio_wait cache_extensions;
4057
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4059 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
4061 };
3714 }; 4062 };
3715} 4063}
3716 4064
3717register_command "reload" => sub { 4065register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3724 reload_perl; 4072 reload_perl;
3725 }; 4073 };
3726 } 4074 }
3727}; 4075};
3728 4076
3729unshift @INC, $LIBDIR; 4077#############################################################################
3730 4078
3731my $bug_warning = 0; 4079my $bug_warning = 0;
3732 4080
3733our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN;
3735
3736sub wait_for_tick { 4081sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4083
3739 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3740 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait;
3742} 4085}
3743 4086
3744sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3746 4089
3747 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4092 $signal->wait;
3750} 4093}
3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3755 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3756 return; 4099 return;
3757 } 4100 }
3758 4101
3759 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 4105
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4108 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4110 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3767 }; 4112 };
3768 } 4113 }
3769 4114
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4116 $sig->send;
3772 } 4117 }
3773 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3774 $sig->send;
3775 }
3776 4119
3777 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3779 4122
3780 if (0) { 4123 if (0) {
3781 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3785 } 4128 }
3786 } 4129 }
3787} 4130}
3788 4131
3789{ 4132{
3790 # configure BDB 4133 # configure BDB
3791 4134
3792 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3795 4138
3796 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4146
3803 cf::sync_job { 4147 cf::sync_job {
3804 eval { 4148 eval {
3830{ 4174{
3831 # configure IO::AIO 4175 # configure IO::AIO
3832 4176
3833 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3836} 4180}
3837 4181
3838my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3839 4184
3840sub _log_backtrace { 4185sub _log_backtrace {
3841 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3842 4187
3843 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3844 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3845 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3847 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3848 async { 4198 async {
3849 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3850 4200
3851 my @bt = fork_call { 4201 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4213 }
3864 4214
3865 @funcs 4215 @funcs
3866 }; 4216 };
3867 4217
3868 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4221 --$_log_backtrace;
3871 }; 4222 };
3872 } else { 4223 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3875 } 4226 }
3876} 4227}
3877 4228
3878# load additional modules 4229# load additional modules
3879use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3880 4232
3881END { cf::emergency_save } 4233END { cf::emergency_save }
3882 4234
3883evthread_start IO::AIO::poll_fileno;
3884
38851 42351
3886 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines