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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines