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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines