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.424 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.571 by root, Wed May 4 19:04:45 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines