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.416 by root, Fri Apr 11 13:59:06 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($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
432 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
433 585
434 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
435 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
436 589
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
465=cut 618=cut
466 619
467sub sync_job(&) { 620sub sync_job(&) {
468 my ($job) = @_; 621 my ($job) = @_;
469 622
470 if ($Coro::current == $Coro::main) { 623 if (in_main) {
471 my $time = EV::time; 624 my $time = AE::time;
472 625
473 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
475 628
476 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
477 630
478 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
479 632
480 my $busy = 1; 633 my $busy = 1;
481 my @res; 634 my @res;
482 635
483 (async { 636 (async {
484 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 638 @res = eval { $job->() };
486 warn $@ if $@; 639 error $@ if $@;
487 undef $busy; 640 undef $busy;
488 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
489 642
490 while ($busy) { 643 while ($busy) {
491 if (Coro::nready) { 644 if (Coro::nready) {
493 } else { 646 } else {
494 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
495 } 648 }
496 } 649 }
497 650
498 my $time = EV::time - $time; 651 my $time = AE::time - $time;
499 652
500 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
501 654
502 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
503 } else { 656 } else {
525 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
526 679
527 $coro 680 $coro
528} 681}
529 682
530=item fork_call { }, $args 683=item fork_call { }, @args
531 684
532Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 688never block itself or use any form of event handling.
536 689
537=cut 690=cut
538 691
692sub post_fork {
693 reset_signals;
694}
695
539sub fork_call(&@) { 696sub fork_call(&@) {
540 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
541 698
542 # 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,
543 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
545 702
546 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
547 reset_signals; 704 cf::post_fork;
548 &$cb 705 &$cb
549 }, @args; 706 } @args;
550 707
551 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 )
552} 720}
553 721
554=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
555 723
556=cut 724=cut
593within each server. 761within each server.
594 762
595=cut 763=cut
596 764
597sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
598 my ($name) = @_; 769 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
600 771
601 eval { 772 eval {
602 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
612} 783}
613 784
614our $DB; 785our $DB;
615 786
616sub db_init { 787sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
619 };
620} 789}
621 790
622sub db_get($$) { 791sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
624 793
625 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
626 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
627 798
628 $! ? () 799 $! ? ()
629 : $data 800 : $data
630 }
631} 801}
632 802
633sub db_put($$$) { 803sub db_put($$$) {
634 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
663 833
664 my @data; 834 my @data;
665 my $md5; 835 my $md5;
666 836
667 for (0 .. $#$src) { 837 for (0 .. $#$src) {
668 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
669 or Carp::croak "$src->[$_]: $!";
670 } 839 }
671 840
672 # if processing is expensive, check 841 # if processing is expensive, check
673 # checksum first 842 # checksum first
674 if (1) { 843 if (1) {
691 860
692 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 862 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
695 864
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 866
698 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
701 870
711 880
712=cut 881=cut
713 882
714sub datalog($@) { 883sub datalog($@) {
715 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 886}
718 887
719=back 888=back
720 889
721=cut 890=cut
722 891
723############################################################################# 892#############################################################################
724 893
725=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
726 895
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
730 899
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
783 952
784Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
786 955
787Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 958
790These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
791 960
792=over 4 961=over 4
916 1085
917 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1088
920 } elsif (ref $type) { 1089 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
922 1091
923 } else { 1092 } else {
924 shift @arg; 1093 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
926 } 1095 }
927 } 1096 }
928} 1097}
929 1098
930sub _object_attach { 1099sub _object_attach {
940 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
941 } 1110 }
942 1111
943 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
944 } else { 1113 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1115 }
947 1116
948 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
949} 1118}
950 1119
1009 1178
1010 for (@$callbacks) { 1179 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1012 1181
1013 if ($@) { 1182 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1184 override;
1017 } 1185 }
1018 1186
1019 return 1 if $override; 1187 return 1 if $override;
1020 } 1188 }
1083 1251
1084sub reattach { 1252sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1254 my ($obj) = @_;
1087 1255
1256 # no longer needed after getting rid of delete_package?
1088 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
1089 1258
1090 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1091 1260
1092 @$registry = (); 1261 @$registry = ();
1093 1262
1098 for (@$attach) { 1267 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1101 } 1270 }
1102 } else { 1271 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1273 }
1105 } 1274 }
1106} 1275}
1107 1276
1108cf::attachable->attach ( 1277cf::attachable->attach (
1135 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1136 1305
1137 sync_job { 1306 sync_job {
1138 if (length $$rdata) { 1307 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1142 1312
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1320 aio_close $fh;
1148 1321
1149 if (@$objs) { 1322 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1331 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1333 }
1158 } else { 1334 } else {
1159 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1160 } 1336 }
1161 1337
1162 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1342 } else {
1164 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1165 } 1344 }
1166 } else { 1345 } else {
1167 aio_unlink $filename; 1346 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1169 } 1348 }
1193 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1373 $av = $st->{objs};
1195 } 1374 }
1196 1375
1197 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1200 1380
1201 ($data, $av) 1381 ($data, $av)
1202} 1382}
1203 1383
1204=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1260 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1261 1441
1262 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1263} 1443}
1264 1444
1445use File::Glob ();
1446
1265cf::player->attach ( 1447cf::player->attach (
1266 on_command => sub { 1448 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1268 1450
1269 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1270 or return; 1452 or return;
1271 1453
1294 1476
1295 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1478 if $reply;
1297 1479
1298 } else { 1480 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1482 }
1301 1483
1302 cf::override; 1484 cf::override;
1303 }, 1485 },
1304); 1486);
1305 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
1306sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1307 cf::sync_job { 1504 cf::sync_job {
1308 my %todo; 1505 my %todo;
1309 1506
1310 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1508 next unless -r $path;
1329 1526
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1529
1333 $ext{source} = 1530 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1336 . $source 1533 . $source
1337 . "\n};\n1"; 1534 . "\n};\n1";
1338 1535
1339 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1340 } 1537 }
1341 1538
1539 my $pass = 0;
1342 my %done; 1540 my %done;
1343 while (%todo) { 1541 while (%todo) {
1344 my $progress; 1542 my $progress;
1345 1543
1544 ++$pass;
1545
1546 ext:
1346 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1549 next ext
1349 unless exists $done{$_}; 1550 unless exists $done{$_};
1350 } 1551 }
1351 1552
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1554
1354 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1559
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1561 if exists $v->{meta}{mandatory};
1362 1562
1363 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;
1364 } 1572 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1573 }
1370 1574
1371 skip: 1575 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1585 }
1375 }; 1586 };
1376} 1587}
1377 1588
1378############################################################################# 1589#############################################################################
1379 1590
1380=back 1591=back
1381 1592
1382=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1383 1594
1384Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1385 1596
1386=cut 1597=cut
1387 1598
1388package cf::player; 1599package cf::player;
1389 1600
1432 1643
1433sub exists($) { 1644sub exists($) {
1434 my ($login) = @_; 1645 my ($login) = @_;
1435 1646
1436 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1438} 1649}
1439 1650
1440sub find($) { 1651sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1653 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1665 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1666 or return;
1456 1667
1457 my $pl = cf::player::load_pl $f 1668 my $pl = cf::player::load_pl $f
1458 or return; 1669 or return;
1670
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1671 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1672 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1462 } 1674 }
1463 } 1675 }
1464} 1676}
1465 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
1466sub save($) { 1691sub save($) {
1467 my ($pl) = @_; 1692 my ($pl) = @_;
1468 1693
1469 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1470 1695
1473 1698
1474 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1475 1700
1476 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1703
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];
1478 1708
1479 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1710 cf::cede_to_tick;
1481} 1711}
1482 1712
1514 my ($pl) = @_; 1744 my ($pl) = @_;
1515 1745
1516 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1517 1747
1518 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1519 $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
1520 1750
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1524 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1525 1759
1526 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1566 1800
1567 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1568 my $path = path $login; 1802 my $path = path $login;
1569 1803
1570 # a .pst is a dead give-away for a valid player 1804 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1810 }
1576 1811
1580 1815
1581 \@logins 1816 \@logins
1582} 1817}
1583 1818
1584=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1585 1822
1586Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1587player. May block. 1824player. May block.
1588 1825
1589=cut 1826=cut
1607 } 1844 }
1608 1845
1609 \@paths 1846 \@paths
1610} 1847}
1611 1848
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1850
1614Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1852
1705=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1706 1854
1707Sends an ext reply to the player. 1855Sends an ext reply to the player.
1708 1856
1740 1888
1741=cut 1889=cut
1742 1890
1743sub find_by_path($) { 1891sub find_by_path($) {
1744 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1745 1895
1746 my ($match, $specificity); 1896 my ($match, $specificity);
1747 1897
1748 for my $region (list) { 1898 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1775our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1777 1927
1778sub generate_random_map { 1928sub generate_random_map {
1779 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1780 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1781 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1789 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1790 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1791 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1792 (cf::region::find $rmp->{region}), $rmp->{custom}
1793 )
1794} 1934}
1795 1935
1796=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1797 1937
1798Register 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
1803 1943
1804sub register { 1944sub register {
1805 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 1946 my $pkg = caller;
1807 1947
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 1949
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1951}
1813 1952
1814# also paths starting with '/' 1953# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1955
1817sub thawer_merge { 1956sub thawer_merge {
1818 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1819 1958
1820 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1825} 1964}
1826 1965
1827sub normalise { 1966sub normalise {
1828 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1829 1968
1830 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1831 1970
1832 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1833 1972
1834 # map plan: 1973 # map plan:
1835 # 1974 #
1850 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1851 $path = "$base/$path"; 1990 $path = "$base/$path";
1852 } 1991 }
1853 1992
1854 for ($path) { 1993 for ($path) {
1855 redo if s{//}{/};
1856 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1857 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1858 } 1996 }
1859 1997
1860 $path 1998 $path
1874 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1875 return $self; 2013 return $self;
1876 } 2014 }
1877 } 2015 }
1878 2016
1879 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1880 () 2018 ()
1881} 2019}
1882 2020
2021# may re-bless or do other evil things
1883sub init { 2022sub init {
1884 my ($self) = @_; 2023 my ($self) = @_;
1885 2024
1886 $self 2025 $self
1887} 2026}
1906 2045
1907# the temporary/swap location 2046# the temporary/swap location
1908sub save_path { 2047sub save_path {
1909 my ($self) = @_; 2048 my ($self) = @_;
1910 2049
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1913} 2052}
1914 2053
1915# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1916sub uniq_path { 2055sub uniq_path {
1917 my ($self) = @_; 2056 my ($self) = @_;
1918 2057
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 2060}
1931 2061
1932sub decay_objects { 2062sub decay_objects {
1933 my ($self) = @_; 2063 my ($self) = @_;
1934 2064
1961 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1962 2092
1963 1 2093 1
1964} 2094}
1965 2095
2096# used to laod the header of an original map
1966sub load_header_orig { 2097sub load_header_orig {
1967 my ($self) = @_; 2098 my ($self) = @_;
1968 2099
1969 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1970} 2101}
1971 2102
2103# used to laod the header of an instantiated map
1972sub load_header_temp { 2104sub load_header_temp {
1973 my ($self) = @_; 2105 my ($self) = @_;
1974 2106
1975 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1976} 2108}
1977 2109
2110# called after loading the header from an instantiated map
1978sub prepare_temp { 2111sub prepare_temp {
1979 my ($self) = @_; 2112 my ($self) = @_;
1980 2113
1981 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1982 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1983 # safety 2116 # safety
1984 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1985 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1986} 2119}
1987 2120
2121# called after loading the header from an original map
1988sub prepare_orig { 2122sub prepare_orig {
1989 my ($self) = @_; 2123 my ($self) = @_;
1990 2124
1991 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1992 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
2016 2150
2017sub find; 2151sub find;
2018sub find { 2152sub find {
2019 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2020 2154
2155 cf::cede_to_tick;
2156
2021 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2022 2158
2023 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2161
2026 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
2031 or return; 2164 or return;
2032 2165
2033 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
2034 2167
2036 or return; 2169 or return;
2037 2170
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2041 undef $guard1; 2175 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2176 $map->reset;
2044 return find $path; 2177 return find $path;
2045 } 2178 }
2046 2179
2047 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2048 } 2181 }
2049} 2182}
2050 2183
2051sub pre_load { } 2184sub pre_load { }
2052sub post_load { } 2185#sub post_load { } # XS
2053 2186
2054sub load { 2187sub load {
2055 my ($self) = @_; 2188 my ($self) = @_;
2056 2189
2057 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2060 2193
2061 { 2194 {
2062 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2063 2196
2064 return unless $self->valid; 2197 return unless $self->valid;
2065 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2066
2067 $self->in_memory (cf::MAP_LOADING);
2068 2199
2069 $self->alloc; 2200 $self->alloc;
2070 2201
2071 $self->pre_load; 2202 $self->pre_load;
2072 cf::cede_to_tick; 2203 cf::cede_to_tick;
2073 2204
2205 if (exists $self->{load_path}) {
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2207 $f->skip_block;
2076 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2077 or return; 2209 or return;
2078 2210
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2080 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2081 2213
2082 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2215 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2085 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2086 $self->clear_unique_items; 2218 $self->clear_unique_items;
2087 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2088 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2089 } 2222 }
2090 } 2223 }
2091 }
2092 2224
2093 $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);
2094 2232
2095 cf::cede_to_tick; 2233 cf::cede_to_tick;
2096 # now do the right thing for maps 2234 # now do the right thing for maps
2097 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2098 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2101 2239
2102 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2241 $self->decay_objects;
2104 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2105 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2106 cf::cede_to_tick; 2245 cf::cede_to_tick;
2107 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2108 cf::cede_to_tick;
2109 $self->activate;
2110 } 2247 }
2111 2248
2112 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2114
2115 $self->in_memory (cf::MAP_IN_MEMORY);
2116 } 2251 }
2117 2252
2118 $self->post_load; 2253 $self->post_load;
2119}
2120 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
2121sub customise_for { 2261sub customise_for {
2122 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2123 2263
2124 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2265 if $self->per_player;
2141 or next; 2281 or next;
2142 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2143 or next; 2283 or next;
2144 $neigh->load; 2284 $neigh->load;
2145 2285
2286 # now find the diagonal neighbours
2146 push @neigh, 2287 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2290 }
2150 2291
2157} 2298}
2158 2299
2159sub find_sync { 2300sub find_sync {
2160 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2161 2302
2162 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
2163} 2308}
2164 2309
2165sub do_load_sync { 2310sub do_load_sync {
2166 my ($map) = @_; 2311 my ($map) = @_;
2167 2312
2313 # it's a bug to call this from the main context
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2170 2316
2171 cf::sync_job { $map->load }; 2317 $map->load;
2172} 2318}
2173 2319
2174our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2176 2322
2177sub find_async { 2323sub find_async {
2178 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2179 2325
2180 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2181 2327
2182 if (my $map = $cf::MAP{$path}) { 2328 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2329 return $map if !$load || $map->linkable;
2184 } 2330 }
2185 2331
2186 $MAP_PREFETCH{$path} |= $load; 2332 $MAP_PREFETCH{$path} |= $load;
2187 2333
2188 $MAP_PREFETCHER ||= cf::async { 2334 $MAP_PREFETCHER ||= cf::async {
2202 $MAP_PREFETCHER->prio (6); 2348 $MAP_PREFETCHER->prio (6);
2203 2349
2204 () 2350 ()
2205} 2351}
2206 2352
2353# common code, used by both ->save and ->swapout
2207sub save { 2354sub _save {
2208 my ($self) = @_; 2355 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2356
2212 $self->{last_save} = $cf::RUNTIME; 2357 $self->{last_save} = $cf::RUNTIME;
2213 2358
2214 return unless $self->dirty; 2359 return unless $self->dirty;
2215 2360
2224 2369
2225 cf::async { 2370 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2371 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2372 $_->contr->save for $self->players;
2228 }; 2373 };
2374
2375 cf::get_slot 0.02;
2229 2376
2230 if ($uniq) { 2377 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2378 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2379 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2380 } else {
2234 $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);
2235 } 2382 }
2236} 2383}
2237 2384
2385sub save {
2386 my ($self) = @_;
2387
2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
2389
2390 $self->_save;
2391}
2392
2238sub swap_out { 2393sub swap_out {
2239 my ($self) = @_; 2394 my ($self) = @_;
2240 2395
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2396 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2397
2398 return if !$self->linkable;
2399 return if $self->{deny_save};
2246 return if $self->players; 2400 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 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
2248 return if $self->{deny_save}; 2418 return 1e99 if $self->{deny_reset};
2249 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
2250 $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};
2251 2452
2252 $self->deactivate; 2453 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2454 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2455 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2456
2300 $self->unlink_save; 2457 $self->unlink_save;
2301 $self->destroy; 2458 $self->destroy;
2302} 2459}
2303 2460
2311 2468
2312 delete $cf::MAP{$self->path}; 2469 delete $cf::MAP{$self->path};
2313 2470
2314 $self->unlink_save; 2471 $self->unlink_save;
2315 2472
2316 bless $self, "cf::map"; 2473 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2474 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2475 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2476 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2477 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2478
2370 2527
2371sub unique_maps() { 2528sub unique_maps() {
2372 [ 2529 [
2373 map { 2530 map {
2374 utf8::decode $_; 2531 utf8::decode $_;
2375 /\.map$/ 2532 s/\.map$//; # TODO future compatibility hack
2533 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2534 ? ()
2376 ? normalise $_ 2535 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2536 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2537 ]
2380} 2538}
2381 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
2382=back 2572=back
2383 2573
2384=head3 cf::object 2574=head3 cf::object
2385 2575
2386=cut 2576=cut
2389 2579
2390=over 4 2580=over 4
2391 2581
2392=item $ob->inv_recursive 2582=item $ob->inv_recursive
2393 2583
2394Returns the inventory of the object _and_ their inventories, recursively. 2584Returns the inventory of the object I<and> their inventories, recursively,
2585but I<not> the object itself.
2395 2586
2396=cut 2587=cut
2397 2588
2398sub inv_recursive_; 2589sub inv_recursive_;
2399sub inv_recursive_ { 2590sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2595 inv_recursive_ inv $_[0]
2405} 2596}
2406 2597
2407=item $ref = $ob->ref 2598=item $ref = $ob->ref
2408 2599
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2600Creates and returns a persistent reference to an object that can be stored as a string.
2410 2601
2411=item $ob = cf::object::deref ($refstring) 2602=item $ob = cf::object::deref ($refstring)
2412 2603
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2604returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2605even if the object actually exists. May block.
2446can 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
2447dialogue with the given NPC character. 2638dialogue with the given NPC character.
2448 2639
2449=cut 2640=cut
2450 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
2451# rough implementation of a future "reply" method that works 2656# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2657# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2659sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2660 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2671 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2673
2469 } else { 2674 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2675 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2676 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2677 }
2473 } 2678 }
2474} 2679}
2475 2680
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2681=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2706
2502=item $player_object->enter_link 2707=item $player_object->enter_link
2503 2708
2504Freezes 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}>).
2505 2710
2506The 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.
2507I<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.
2508 2715
2509Will never block. 2716Will never block.
2510 2717
2511=item $player_object->leave_link ($map, $x, $y) 2718=item $player_object->leave_link ($map, $x, $y)
2512 2719
2532sub cf::object::player::enter_link { 2739sub cf::object::player::enter_link {
2533 my ($self) = @_; 2740 my ($self) = @_;
2534 2741
2535 $self->deactivate_recursive; 2742 $self->deactivate_recursive;
2536 2743
2744 ++$self->{_link_recursion};
2745
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2746 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2747
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2749 if $self->map && $self->map->{path} ne "{link}";
2541 2750
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2751 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2752}
2544 2753
2545sub cf::object::player::leave_link { 2754sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2755 my ($self, $map, $x, $y) = @_;
2547 2756
2564 ($x, $y) = (-1, -1) 2773 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2774 unless (defined $x) && (defined $y);
2566 2775
2567 # use -1 or undef as default coordinates, not 0, 0 2776 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2777 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2778 if $x <= 0 && $y <= 0;
2570 2779
2571 $map->load; 2780 $map->load;
2572 $map->load_neighbours; 2781 $map->load_neighbours;
2573 2782
2574 return unless $self->contr->active; 2783 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2784
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2785 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2786 if ($self->enter_map ($map, $x, $y)) {
2579} 2787 # entering was successful
2788 delete $self->{_link_recursion};
2789 # only activate afterwards, to support waiting in hooks
2790 $self->activate_recursive;
2791 }
2580 2792
2793}
2794
2581=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)]])
2582 2796
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2798her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be called at the end of this process. 2801be called at the end of this process.
2588 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
2589=cut 2806=cut
2590 2807
2591our $GOTOGEN; 2808our $GOTOGEN;
2592 2809
2593sub cf::object::player::goto { 2810sub cf::object::player::goto {
2594 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 }
2595 2818
2596 # 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
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2820 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2821
2599 $self->enter_link; 2822 $self->enter_link;
2619 ($path, $x, $y) = (undef, undef, undef); 2842 ($path, $x, $y) = (undef, undef, undef);
2620 } 2843 }
2621 } 2844 }
2622 2845
2623 my $map = eval { 2846 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2847 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2625 2848
2626 if ($map) { 2849 if ($map) {
2627 $map = $map->customise_for ($self); 2850 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2851 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2852 } else {
2630 $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);
2631 } 2854 }
2632 2855
2633 $map 2856 $map
2641 if ($gen == $self->{_goto_generation}) { 2864 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2865 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2866 $self->leave_link ($map, $x, $y);
2644 } 2867 }
2645 2868
2646 $done->() if $done; 2869 $done->($self) if $done;
2647 })->prio (1); 2870 })->prio (1);
2648} 2871}
2649 2872
2650=item $player_object->enter_exit ($exit_object) 2873=item $player_object->enter_exit ($exit_object)
2651 2874
2671} 2894}
2672 2895
2673sub prepare_random_map { 2896sub prepare_random_map {
2674 my ($exit) = @_; 2897 my ($exit) = @_;
2675 2898
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2899 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2900 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2901 # that depends on the exit object
2681 2902
2682 my $rmp = parse_random_map_params $exit->msg; 2903 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2905 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2906 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2907 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2908 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2909 $rmp->{origin_y} = $exit->y;
2910
2911 $exit->map->touch;
2689 } 2912 }
2690 2913
2691 $rmp->{random_seed} ||= $exit->random_seed; 2914 $rmp->{random_seed} ||= $exit->random_seed;
2692 2915
2693 my $data = cf::encode_json $rmp; 2916 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2917 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2918 my $meta = "$RANDOMDIR/$md5.meta";
2696 2919
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2920 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2921 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2922 undef $fh;
2700 aio_rename "$meta~", $meta; 2923 aio_rename "$meta~", $meta;
2701 2924
2925 my $slaying = "?random/$md5";
2926
2927 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2928 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2929 $exit->msg (undef);
2930 }
2704 } 2931 }
2705} 2932}
2706 2933
2707sub cf::object::player::enter_exit { 2934sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2935 my ($self, $exit) = @_;
2709 2936
2710 return unless $self->type == cf::PLAYER; 2937 return unless $self->type == cf::PLAYER;
2711 2938
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2939 $self->enter_link;
2724 2940
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2941 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2942 $Coro::current->{desc} = "enter_exit";
2731 2943
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2974 $self->goto ($map, $x, $y);
2735 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
2736 1; 2980 1
2737 }) { 2981 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2982 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2984 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2985 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2986
2743 warn "ERROR in enter_exit: $@"; 2987 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2988 $self->leave_link;
2745 } 2989 }
2746 })->prio (1); 2990 })->prio (1);
2747} 2991}
2748 2992
2760sub cf::client::send_drawinfo { 3004sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 3005 my ($self, $text, $flags) = @_;
2762 3006
2763 utf8::encode $text; 3007 utf8::encode $text;
2764 $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);
2765} 3034}
2766 3035
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 3036=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 3037
2769Send 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
2773 3042
2774=cut 3043=cut
2775 3044
2776# non-persistent channels (usually the info channel) 3045# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 3046our %CHANNEL = (
3047 "c/motd" => {
3048 id => "infobox",
3049 title => "MOTD",
3050 reply => undef,
3051 tooltip => "The message of the day",
3052 },
2778 "c/identify" => { 3053 "c/identify" => {
2779 id => "infobox", 3054 id => "infobox",
2780 title => "Identify", 3055 title => "Identify",
2781 reply => undef, 3056 reply => undef,
2782 tooltip => "Items recently identified", 3057 tooltip => "Items recently identified",
2784 "c/examine" => { 3059 "c/examine" => {
2785 id => "infobox", 3060 id => "infobox",
2786 title => "Examine", 3061 title => "Examine",
2787 reply => undef, 3062 reply => undef,
2788 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",
2789 }, 3070 },
2790 "c/book" => { 3071 "c/book" => {
2791 id => "infobox", 3072 id => "infobox",
2792 title => "Book", 3073 title => "Book",
2793 reply => undef, 3074 reply => undef,
2809 id => "infobox", 3090 id => "infobox",
2810 title => "Body Parts", 3091 title => "Body Parts",
2811 reply => undef, 3092 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 3093 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 3131 "c/uptime" => {
2815 id => "infobox", 3132 id => "infobox",
2816 title => "Uptime", 3133 title => "Uptime",
2817 reply => undef, 3134 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3135 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 3138 id => "infobox",
2822 title => "Map Info", 3139 title => "Map Info",
2823 reply => undef, 3140 reply => undef,
2824 tooltip => "Information related to the maps", 3141 tooltip => "Information related to the maps",
2825 }, 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,
2826); 3157);
2827 3158
2828sub cf::client::send_msg { 3159sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3160 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3161
2831 $msg = $self->pl->expand_cfpod ($msg); 3162 $msg = $self->pl->expand_cfpod ($msg)
3163 unless $color & cf::NDI_VERBATIM;
2832 3164
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3165 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3166
2835 # check predefined channels, for the benefit of C 3167 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3168 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3169 $channel = $CHANNEL{$channel};
2838 3170
2839 $self->ext_msg (channel_info => $channel) 3171 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3172 $channel = $channel->{id};
2843 3173
2844 } elsif (ref $channel) { 3174 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3175 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3176 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3177 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3178 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3179 }
2851 3180
2852 $channel = $channel->{id}; 3181 $channel = $channel->{id};
2853 } 3182 }
2854 3183
2855 return unless @extra || length $msg; 3184 return unless @extra || length $msg;
2856 3185
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3186 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3187 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3188 if $color & cf::NDI_DEF;
2861 3189
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3190 my $pkt = "msg "
3191 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3192 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3193 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3194
2876 $color &= cf::NDI_COLOR_MASK; 3195 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3196}
2890 3197
2891=item $client->ext_msg ($type, @msg) 3198=item $client->ext_msg ($type, @msg)
2892 3199
2893Sends an ext event to the client. 3200Sends an ext event to the client.
2896 3203
2897sub cf::client::ext_msg($$@) { 3204sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3205 my ($self, $type, @msg) = @_;
2899 3206
2900 if ($self->extcmd == 2) { 3207 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3208 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3209 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3210 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3211 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3212 }
2906} 3213}
2907 3214
2908=item $client->ext_reply ($msgid, @msg) 3215=item $client->ext_reply ($msgid, @msg)
2909 3216
2913 3220
2914sub cf::client::ext_reply($$@) { 3221sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3222 my ($self, $id, @msg) = @_;
2916 3223
2917 if ($self->extcmd == 2) { 3224 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3225 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3226 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3227 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3228 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3229 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3230 }
2924} 3231}
2925 3232
2926=item $success = $client->query ($flags, "text", \&cb) 3233=item $success = $client->query ($flags, "text", \&cb)
2927 3234
2998 3305
2999 $ns->ext_reply ($reply, @reply) 3306 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3307 if $reply;
3001 3308
3002 } else { 3309 } else {
3003 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";
3004 } 3311 }
3005 3312
3006 cf::override; 3313 cf::override;
3007 }, 3314 },
3008); 3315);
3028 3335
3029 $coro 3336 $coro
3030} 3337}
3031 3338
3032cf::client->attach ( 3339cf::client->attach (
3033 on_destroy => sub { 3340 on_client_destroy => sub {
3034 my ($ns) = @_; 3341 my ($ns) = @_;
3035 3342
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3343 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3344 },
3038); 3345);
3054our $safe_hole = new Safe::Hole; 3361our $safe_hole = new Safe::Hole;
3055 3362
3056$SIG{FPE} = 'IGNORE'; 3363$SIG{FPE} = 'IGNORE';
3057 3364
3058$safe->permit_only (Opcode::opset qw( 3365$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3366 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3367 grepstart grepwhile mapstart mapwhile
3061 sort time 3368 sort time
3062)); 3369));
3063 3370
3064# here we export the classes and methods available to script code 3371# here we export the classes and methods available to script code
3067 3374
3068The following functions and methods are available within a safe environment: 3375The following functions and methods are available within a safe environment:
3069 3376
3070 cf::object 3377 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3379 insert remove name archname title slaying race decrease split
3380 value
3073 3381
3074 cf::object::player 3382 cf::object::player
3075 player 3383 player
3076 3384
3077 cf::player 3385 cf::player
3082 3390
3083=cut 3391=cut
3084 3392
3085for ( 3393for (
3086 ["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
3087 insert remove inv name archname title slaying race 3395 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3396 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3397 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3398 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3399 ["cf::map" => qw(trigger)],
3092) { 3400) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3401 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3402 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3403 for @funs;
3097} 3404}
3098 3405
3113 3420
3114 my $qcode = $code; 3421 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3422 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3423 $qcode =~ s/\n/\\n/g;
3117 3424
3425 %vars = (_dummy => 0) unless %vars;
3426
3427 my @res;
3118 local $_; 3428 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3429
3121 my $eval = 3430 my $eval =
3122 "do {\n" 3431 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3432 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3433 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3434 . $code
3126 . "\n}" 3435 . "\n}"
3127 ; 3436 ;
3128 3437
3438 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3439 sub_generation_inc;
3440 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3441 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 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 }
3132 3447
3133 if ($@) { 3448 if ($@) {
3134 warn "$@"; 3449 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3450 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3451 "with arguments " . (join " ", %vars) . "\n";
3137 } 3452 }
3138 3453
3139 wantarray ? @res : $res[0] 3454 wantarray ? @res : $res[0]
3140} 3455}
3141 3456
3155=cut 3470=cut
3156 3471
3157sub register_script_function { 3472sub register_script_function {
3158 my ($fun, $cb) = @_; 3473 my ($fun, $cb) = @_;
3159 3474
3160 no strict 'refs'; 3475 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3476 *$fun = $safe_hole->wrap ($cb);
3162} 3477}
3163 3478
3164=back 3479=back
3165 3480
3166=cut 3481=cut
3175 # for this (global event?) 3490 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = (); 3491 %ext::player_env::MUSIC_FACE_CACHE = ();
3177 3492
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3493 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3494
3180 warn "loading facedata from $path\n"; 3495 trace "loading facedata from $path\n";
3181 3496
3182 my $facedata; 3497 my $facedata = decode_storable load_file $path;
3183 0 < aio_load $path, $facedata
3184 or die "$path: $!";
3185
3186 $facedata = Coro::Storable::thaw $facedata;
3187 3498
3188 $facedata->{version} == 2 3499 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3500 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3501
3191 # 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]);
3192 $facedata->{resource}{"res/exp_table"} = { 3504 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3505 type => FT_RSRC,
3194 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),
3195 }; 3508 };
3196 cf::cede_to_tick; 3509 cf::cede_to_tick;
3197 3510
3198 { 3511 {
3199 my $faces = $facedata->{faceinfo}; 3512 my $faces = $facedata->{faceinfo};
3201 while (my ($face, $info) = each %$faces) { 3514 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3515 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3516
3204 cf::face::set_visibility $idx, $info->{visibility}; 3517 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3518 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3519 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 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} ;
3208 3522
3209 cf::cede_to_tick; 3523 cf::cede_to_tick;
3210 } 3524 }
3211 3525
3212 while (my ($face, $info) = each %$faces) { 3526 while (my ($face, $info) = each %$faces) {
3217 3531
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3532 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3533 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3534 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3535 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3536 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3537 }
3224 3538
3225 cf::cede_to_tick; 3539 cf::cede_to_tick;
3226 } 3540 }
3227 } 3541 }
3236 3550
3237 cf::anim::invalidate_all; # d'oh 3551 cf::anim::invalidate_all; # d'oh
3238 } 3552 }
3239 3553
3240 { 3554 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3555 my $res = $facedata->{resource};
3244 3556
3245 while (my ($name, $info) = each %$res) { 3557 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3558 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3560
3250 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $info->{type};
3265 } else { 3563 } else {
3266 $RESOURCE{$name} = $info; 3564 $RESOURCE{$name} = $info; # unused
3267 } 3565 }
3268 3566
3269 cf::cede_to_tick; 3567 cf::cede_to_tick;
3270 } 3568 }
3271 } 3569 }
3272 3570
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3571 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3572
3275 1 3573 1
3276} 3574}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3575
3298register_exticmd fx_want => sub { 3576register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3577 my ($ns, $want) = @_;
3300 3578
3301 while (my ($k, $v) = each %$want) { 3579 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3580 $ns->fx_want ($k, $v);
3303 } 3581 }
3304}; 3582};
3583
3584sub load_resource_file($) {
3585 my $guard = lock_acquire "load_resource_file";
3586
3587 my $status = load_resource_file_ $_[0];
3588 get_slot 0.1, 100;
3589 cf::arch::commit_load;
3590
3591 $status
3592}
3305 3593
3306sub reload_regions { 3594sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3595 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3596 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3597 %ext::player_env::MUSIC_FACE_CACHE = ();
3323} 3611}
3324 3612
3325sub reload_archetypes { 3613sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3614 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3615 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3616}
3334 3617
3335sub reload_treasures { 3618sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3619 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3620 or die "unable to load treasurelists\n";
3338} 3621}
3339 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
3340sub reload_resources { 3643sub reload_resources {
3341 warn "reloading resource files...\n"; 3644 trace "reloading resource files...\n";
3342 3645
3646 reload_exp_table;
3647 reload_materials;
3648 reload_facedata;
3649 reload_sound;
3650 reload_archetypes;
3343 reload_regions; 3651 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3652 reload_treasures;
3348 3653
3349 warn "finished reloading resource files\n"; 3654 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3655}
3355 3656
3356sub reload_config { 3657sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3658 trace "reloading config file...\n";
3358 or return;
3359 3659
3360 local $/; 3660 my $config = load_file "$CONFDIR/config";
3361 *CFG = YAML::Load <$fh>; 3661 utf8::decode $config;
3662 *CFG = decode_yaml $config;
3362 3663
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3664 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3665
3365 $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};
3366 $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};
3367 3668
3368 if (exists $CFG{mlockall}) { 3669 if (exists $CFG{mlockall}) {
3372 }; 3673 };
3373 warn $@ if $@; 3674 warn $@ if $@;
3374 } 3675 }
3375} 3676}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3716 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3717 local $Coro::idle = sub {
3380 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#
3381 (async { 3719 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3720 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3721 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3722 })->prio (Coro::PRIO_MAX);
3385 }; 3723 };
3386 3724
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3725 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 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;
3737 reload_config;
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
3748 load_extensions;
3749
3750 utime time, time, $RUNTIMEFILE;
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;
3757 };
3758
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;
3394} 3768}
3395 3769
3396############################################################################# 3770#############################################################################
3397# initialisation and cleanup 3771# initialisation and cleanup
3398 3772
3399# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3400BEGIN { 3774BEGIN {
3401 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3405 }; 3779 };
3406 } 3780 }
3407} 3781}
3408 3782
3409sub write_runtime { 3783sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3784 my $t0 = AE::time;
3411 3785
3412 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3414 3788
3415 IO::AIO::aio_utime $runtime, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3790
3417 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3418 3792
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3794 or return;
3421 3795
3422 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3808 aio_utime $fh, undef, undef;
3435 3809
3436 close $fh 3810 close $fh
3437 or return; 3811 or return;
3438 3812
3439 aio_rename "$runtime~", $runtime 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3814 and return;
3441 3815
3442 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3817
3444 1 3818 1
3445} 3819}
3446 3820
3447our $uuid_lock; 3821our $uuid_lock;
3456 my $uuid = "$LOCALDIR/uuid"; 3830 my $uuid = "$LOCALDIR/uuid";
3457 3831
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3832 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3833 or return;
3460 3834
3461 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;
3462 $uuid_skip = 0; 3843 $uuid_skip = 0;
3463 3844
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3845 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3846 and return;
3466 3847
3472 or return; 3853 or return;
3473 3854
3474 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3475 and return; 3856 and return;
3476 3857
3477 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3478 3859
3479 1 3860 1
3480 3861
3481} 3862}
3482 3863
3488} 3869}
3489 3870
3490sub emergency_save() { 3871sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3492 3873
3493 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;
3494 3880
3495 cf::sync_job { 3881 cf::sync_job {
3882 cf::write_runtime_sync; # external watchdog should not bark
3883
3496 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3890 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3892 $pl->save;
3505 } 3893 }
3506 warn "end emergency player save\n"; 3894 info "emergency_perl_save: end player save\n";
3507 3895
3508 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";
3509 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3901 $map->valid or next;
3512 $map->save; 3902 $map->save;
3513 } 3903 }
3514 warn "end emergency map save\n"; 3904 info "emergency_perl_save: end map save\n";
3515 3905
3516 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";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3519 3911
3520 warn "begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3913 write_uuid_sync 1;
3522 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
3523 }; 3934 };
3524 3935
3525 warn "leave emergency perl save\n"; 3936 info "emergency_perl_save: leave\n";
3526} 3937}
3527 3938
3528sub post_cleanup { 3939sub post_cleanup {
3529 my ($make_core) = @_; 3940 my ($make_core) = @_;
3530 3941
3942 IO::AIO::flush;
3943
3531 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3532 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 }
3533} 3974}
3534 3975
3535sub do_reload_perl() { 3976sub do_reload_perl() {
3536 # can/must only be called in main 3977 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3538 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3539 return; 3980 return;
3540 } 3981 }
3541 3982
3542 warn "reloading..."; 3983 return if $RELOAD++;
3543 3984
3544 warn "entering sync_job"; 3985 my $t1 = AE::time;
3545 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
3546 cf::sync_job { 3993 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark
3548 cf::emergency_save; 3994 #cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark
3550 3995
3551 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV;
3553
3554 # if anything goes wrong in here, we should simply crash as we already saved
3555
3556 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs;
3562 warn "iterate...";
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = (); 3998 %EXT_CORO = ();
3570 3999
3571 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3572 %COMMAND = (); 4001 %COMMAND = ();
3573 4002
3574 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3575 %EXTCMD = (); 4004 %EXTCMD = ();
3576 %EXTICMD = (); 4005 %EXTICMD = ();
3577 4006
3578 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3579 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3581 4010
3582 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3583 eval { 4012 eval {
3584 $cb->($pkg); 4013 $cb->($pkg);
3585 1 4014 1
3586 } 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;
3587 } 4020 }
3588 4021
3589 warn "... nuking $pkg";
3590 Symbol::delete_package $pkg;
3591 }
3592
3593 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3594 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 4025
3597 warn "... unloading $k"; 4026 trace "... unloading $k";
3598 delete $INC{$k}; 4027 delete $INC{$k};
3599 4028
3600 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3602 4031
3603 if (my $cb = $k->can ("unload_module")) { 4032 if (my $cb = $k->can ("unload_module")) {
3604 $cb->(); 4033 $cb->();
4034 }
4035
4036 clear_package $k;
3605 } 4037 }
3606 4038
3607 Symbol::delete_package $k;
3608 }
3609
3610 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 4040 clear_package "safe::$_"
3612 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);
3613 4042
3614 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 4046
3618 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3619 # and global variables created in xs 4048 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3621 4050
3622 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3623 4052
3624 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3625 require cf; 4054 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3627 4056
3628 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3629 cf::reload_config; 4058 cf::reload_config;
3630 4059
3631 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3632 cf::load_extensions; 4061 cf::load_extensions;
3633 4062
4063 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3637 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
4070 }
3640 4071
3641 warn "leaving sync_job"; 4072 cf::_post_init 1;
3642 4073
4074 trace "perl_reload: leaving sync_job";
4075
3643 1 4076 1
3644 } or do { 4077 } or do {
3645 warn $@; 4078 error $@;
3646 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
4080 };
4081
4082 --$RELOAD;
3647 }; 4083 }
3648 4084
3649 warn "reloaded"; 4085 $t1 = AE::time - $t1;
4086 info "perl_reload: completed in ${t1}s\n";
3650}; 4087};
3651 4088
3652our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3653 4090
3654sub reload_perl() { 4091sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 4092 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3657 4094
4095 $RELOAD_WATCHER ||= cf::async {
4096 Coro::AIO::aio_wait cache_extensions;
4097
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 4099 do_reload_perl;
3660 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
4101 };
3661 }; 4102 };
3662} 4103}
3663 4104
3664register_command "reload" => sub { 4105register_command "reload" => sub {
3665 my ($who, $arg) = @_; 4106 my ($who, $arg) = @_;
3671 reload_perl; 4112 reload_perl;
3672 }; 4113 };
3673 } 4114 }
3674}; 4115};
3675 4116
3676unshift @INC, $LIBDIR; 4117#############################################################################
3677 4118
3678my $bug_warning = 0; 4119my $bug_warning = 0;
3679 4120
3680our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN;
3682
3683sub wait_for_tick { 4121sub wait_for_tick() {
3684 return if tick_inhibit; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3685 return if $Coro::current == $Coro::main;
3686 4123
3687 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3688 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait;
3690} 4125}
3691 4126
3692sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3693 return if tick_inhibit; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3694 return if $Coro::current == $Coro::main;
3695 4129
3696 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 4132 $signal->wait;
3699} 4133}
3703 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"
3704 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3705 return; 4139 return;
3706 } 4140 }
3707 4141
3708 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#
3709 4145
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $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.;
3712 Coro::async_pool { 4148 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 4150 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3716 }; 4152 };
3717 } 4153 }
3718 4154
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3720 $sig->send; 4156 $sig->send;
3721 } 4157 }
3722 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3723 $sig->send;
3724 }
3725 4159
3726 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3727 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3728 4162
3729 if (0) { 4163 if (0) {
3730 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3731 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3732 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3733 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3734 } 4168 }
3735 } 4169 }
3736} 4170}
3737 4171
3738{ 4172{
3739 # configure BDB 4173 # configure BDB
3740 4174
3741 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4177 $AnyEvent::BDB::WATCHER->priority (1);
3744 4178
3745 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | 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;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4184 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4185 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4186
3752 cf::sync_job { 4187 cf::sync_job {
3753 eval { 4188 eval {
3779{ 4214{
3780 # configure IO::AIO 4215 # configure IO::AIO
3781 4216
3782 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4219 undef $AnyEvent::AIO::WATCHER;
3785} 4220}
3786 4221
3787my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3788 4224
3789sub _log_backtrace { 4225sub _log_backtrace {
3790 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3791 4227
3792 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3793 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3794 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3796 ++$_log_backtrace; 4236 ++$_log_backtrace;
4237 my $perl_bt = Carp::longmess $msg;
3797 async { 4238 async {
3798 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3799 4240
3800 my @bt = fork_call { 4241 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4242 @addr = map { sprintf "%x", $_ } @addr;
3812 } 4253 }
3813 4254
3814 @funcs 4255 @funcs
3815 }; 4256 };
3816 4257
3817 LOG llevInfo, "[ABT] $msg\n"; 4258 LOG llevInfo, "[ABT] $perl_bt\n";
4259 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4261 --$_log_backtrace;
3820 }; 4262 };
3821 } else { 4263 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3824 } 4266 }
3825} 4267}
3826 4268
3827# load additional modules 4269# load additional modules
3828use cf::pod; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3829 4272
3830END { cf::emergency_save } 4273END { cf::emergency_save }
3831 4274
38321 42751
3833 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines