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.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines