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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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}) {
1778sub generate_random_map { 1928sub generate_random_map {
1779 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1780 1930
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782 1932
1783 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1792 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1793 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1794 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1795 (cf::region::find $rmp->{region}), $rmp->{custom}
1796 )
1797} 1934}
1798 1935
1799=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1800 1937
1801Register 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
1806 1943
1807sub register { 1944sub register {
1808 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1809 my $pkg = caller; 1946 my $pkg = caller;
1810 1947
1811 no strict;
1812 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1813 1949
1814 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1815} 1951}
1816 1952
1817# also paths starting with '/' 1953# also paths starting with '/'
1818$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1819 1955
1820sub thawer_merge { 1956sub thawer_merge {
1821 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1822 1958
1823 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1828} 1964}
1829 1965
1830sub normalise { 1966sub normalise {
1831 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1832 1968
1833 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1834 1970
1835 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1836 1972
1837 # map plan: 1973 # map plan:
1838 # 1974 #
1853 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1854 $path = "$base/$path"; 1990 $path = "$base/$path";
1855 } 1991 }
1856 1992
1857 for ($path) { 1993 for ($path) {
1858 redo if s{//}{/};
1859 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1860 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1861 } 1996 }
1862 1997
1863 $path 1998 $path
1877 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1878 return $self; 2013 return $self;
1879 } 2014 }
1880 } 2015 }
1881 2016
1882 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1883 () 2018 ()
1884} 2019}
1885 2020
2021# may re-bless or do other evil things
1886sub init { 2022sub init {
1887 my ($self) = @_; 2023 my ($self) = @_;
1888 2024
1889 $self 2025 $self
1890} 2026}
1909 2045
1910# the temporary/swap location 2046# the temporary/swap location
1911sub save_path { 2047sub save_path {
1912 my ($self) = @_; 2048 my ($self) = @_;
1913 2049
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1916} 2052}
1917 2053
1918# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1919sub uniq_path { 2055sub uniq_path {
1920 my ($self) = @_; 2056 my ($self) = @_;
1921 2057
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 2060}
1934 2061
1935sub decay_objects { 2062sub decay_objects {
1936 my ($self) = @_; 2063 my ($self) = @_;
1937 2064
1964 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1965 2092
1966 1 2093 1
1967} 2094}
1968 2095
2096# used to laod the header of an original map
1969sub load_header_orig { 2097sub load_header_orig {
1970 my ($self) = @_; 2098 my ($self) = @_;
1971 2099
1972 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1973} 2101}
1974 2102
2103# used to laod the header of an instantiated map
1975sub load_header_temp { 2104sub load_header_temp {
1976 my ($self) = @_; 2105 my ($self) = @_;
1977 2106
1978 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1979} 2108}
1980 2109
2110# called after loading the header from an instantiated map
1981sub prepare_temp { 2111sub prepare_temp {
1982 my ($self) = @_; 2112 my ($self) = @_;
1983 2113
1984 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1985 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1986 # safety 2116 # safety
1987 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1988 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1989} 2119}
1990 2120
2121# called after loading the header from an original map
1991sub prepare_orig { 2122sub prepare_orig {
1992 my ($self) = @_; 2123 my ($self) = @_;
1993 2124
1994 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1995 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
2019 2150
2020sub find; 2151sub find;
2021sub find { 2152sub find {
2022 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
2023 2154
2155 cf::cede_to_tick;
2156
2024 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
2025 2158
2026 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2161
2029 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
2034 or return; 2164 or return;
2035 2165
2036 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
2037 2167
2039 or return; 2169 or return;
2040 2170
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2044 undef $guard1; 2175 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2176 $map->reset;
2047 return find $path; 2177 return find $path;
2048 } 2178 }
2049 2179
2050 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2051 } 2181 }
2052} 2182}
2053 2183
2054sub pre_load { } 2184sub pre_load { }
2055sub post_load { } 2185#sub post_load { } # XS
2056 2186
2057sub load { 2187sub load {
2058 my ($self) = @_; 2188 my ($self) = @_;
2059 2189
2060 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2063 2193
2064 { 2194 {
2065 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2066 2196
2067 return unless $self->valid; 2197 return unless $self->valid;
2068 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2069
2070 $self->in_memory (cf::MAP_LOADING);
2071 2199
2072 $self->alloc; 2200 $self->alloc;
2073 2201
2074 $self->pre_load; 2202 $self->pre_load;
2075 cf::cede_to_tick; 2203 cf::cede_to_tick;
2076 2204
2205 if (exists $self->{load_path}) {
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2207 $f->skip_block;
2079 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2080 or return; 2209 or return;
2081 2210
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2083 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2084 2213
2085 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2215 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2089 $self->clear_unique_items; 2218 $self->clear_unique_items;
2090 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2092 } 2222 }
2093 } 2223 }
2094 }
2095 2224
2096 $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);
2097 2232
2098 cf::cede_to_tick; 2233 cf::cede_to_tick;
2099 # now do the right thing for maps 2234 # now do the right thing for maps
2100 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2101 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2104 2239
2105 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2241 $self->decay_objects;
2107 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2108 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2109 cf::cede_to_tick; 2245 cf::cede_to_tick;
2110 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2111 cf::cede_to_tick;
2112 $self->activate;
2113 } 2247 }
2114 2248
2115 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2117
2118 $self->in_memory (cf::MAP_IN_MEMORY);
2119 } 2251 }
2120 2252
2121 $self->post_load; 2253 $self->post_load;
2122}
2123 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
2124sub customise_for { 2261sub customise_for {
2125 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2126 2263
2127 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2265 if $self->per_player;
2144 or next; 2281 or next;
2145 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2146 or next; 2283 or next;
2147 $neigh->load; 2284 $neigh->load;
2148 2285
2286 # now find the diagonal neighbours
2149 push @neigh, 2287 push @neigh,
2150 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2151 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2152 } 2290 }
2153 2291
2160} 2298}
2161 2299
2162sub find_sync { 2300sub find_sync {
2163 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2164 2302
2165 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
2166} 2308}
2167 2309
2168sub do_load_sync { 2310sub do_load_sync {
2169 my ($map) = @_; 2311 my ($map) = @_;
2170 2312
2313 # it's a bug to call this from the main context
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2173 2316
2174 cf::sync_job { $map->load }; 2317 $map->load;
2175} 2318}
2176 2319
2177our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2178our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2179 2322
2180sub find_async { 2323sub find_async {
2181 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2182 2325
2183 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2184 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2185 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2331 return $map if !$load || $map->linkable;
2187 } 2332 }
2188 2333
2189 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2190 2335
2191 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2205 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2206 2351
2207 () 2352 ()
2208} 2353}
2209 2354
2355# common code, used by both ->save and ->swapout
2210sub save { 2356sub _save {
2211 my ($self) = @_; 2357 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2358
2215 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2216 2360
2217 return unless $self->dirty; 2361 return unless $self->dirty;
2218 2362
2227 2371
2228 cf::async { 2372 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2373 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2374 $_->contr->save for $self->players;
2231 }; 2375 };
2376
2377 cf::get_slot 0.02;
2232 2378
2233 if ($uniq) { 2379 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2381 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2382 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2238 } 2384 }
2239} 2385}
2240 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2241sub swap_out { 2395sub swap_out {
2242 my ($self) = @_; 2396 my ($self) = @_;
2243 2397
2244 # save first because save cedes
2245 $self->save;
2246
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2249 return if $self->players; 2402 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2251 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2252 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2253 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2254 2454
2255 $self->deactivate; 2455 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear; 2457 $self->clear;
2258}
2259
2260sub reset_at {
2261 my ($self) = @_;
2262
2263 # TODO: safety, remove and allow resettable per-player maps
2264 return 1e99 if $self->{deny_reset};
2265
2266 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2267 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2268
2269 $time + $to
2270}
2271
2272sub should_reset {
2273 my ($self) = @_;
2274
2275 $self->reset_at <= $cf::RUNTIME
2276}
2277
2278sub reset {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 return if $self->players;
2284
2285 warn "resetting map ", $self->path;
2286
2287 $self->in_memory (cf::MAP_SWAPPED);
2288
2289 # need to save uniques path
2290 unless ($self->{deny_save}) {
2291 my $uniq = $self->uniq_path; utf8::encode $uniq;
2292
2293 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2294 if $uniq;
2295 }
2296
2297 delete $cf::MAP{$self->path};
2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2301 $self->clear;
2302 2458
2303 $self->unlink_save; 2459 $self->unlink_save;
2304 $self->destroy; 2460 $self->destroy;
2305} 2461}
2306 2462
2314 2470
2315 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2316 2472
2317 $self->unlink_save; 2473 $self->unlink_save;
2318 2474
2319 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2320 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2321 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2322 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2324 2480
2373 2529
2374sub unique_maps() { 2530sub unique_maps() {
2375 [ 2531 [
2376 map { 2532 map {
2377 utf8::decode $_; 2533 utf8::decode $_;
2378 /\.map$/ 2534 s/\.map$//; # TODO future compatibility hack
2535 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2536 ? ()
2379 ? normalise $_ 2537 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2539 ]
2383} 2540}
2384 2541
2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2573
2385=back 2574=back
2386 2575
2387=head3 cf::object 2576=head3 cf::object
2388 2577
2389=cut 2578=cut
2392 2581
2393=over 4 2582=over 4
2394 2583
2395=item $ob->inv_recursive 2584=item $ob->inv_recursive
2396 2585
2397Returns the inventory of the object _and_ their inventories, recursively. 2586Returns the inventory of the object I<and> their inventories, recursively,
2587but I<not> the object itself.
2398 2588
2399=cut 2589=cut
2400 2590
2401sub inv_recursive_; 2591sub inv_recursive_;
2402sub inv_recursive_ { 2592sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2597 inv_recursive_ inv $_[0]
2408} 2598}
2409 2599
2410=item $ref = $ob->ref 2600=item $ref = $ob->ref
2411 2601
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2602Creates and returns a persistent reference to an object that can be stored as a string.
2413 2603
2414=item $ob = cf::object::deref ($refstring) 2604=item $ob = cf::object::deref ($refstring)
2415 2605
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2606returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2607even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2639can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2640dialogue with the given NPC character.
2451 2641
2452=cut 2642=cut
2453 2643
2644our $SAY_CHANNEL = {
2645 id => "say",
2646 title => "Map",
2647 reply => "say ",
2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2649};
2650
2651our $CHAT_CHANNEL = {
2652 id => "chat",
2653 title => "Chat",
2654 reply => "chat ",
2655 tooltip => "Player chat and shouts, global to the server.",
2656};
2657
2454# rough implementation of a future "reply" method that works 2658# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2659# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2660#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2661sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2662 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2673 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2674 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2675
2472 } else { 2676 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2677 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2678 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2679 }
2476 } 2680 }
2477} 2681}
2478 2682
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2683=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2708
2505=item $player_object->enter_link 2709=item $player_object->enter_link
2506 2710
2507Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2508 2712
2509The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2511 2717
2512Will never block. 2718Will never block.
2513 2719
2514=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2515 2721
2535sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2536 my ($self) = @_; 2742 my ($self) = @_;
2537 2743
2538 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2539 2745
2746 ++$self->{_link_recursion};
2747
2540 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2541 2749
2542 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2543 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2544 2752
2545 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2546} 2754}
2547 2755
2548sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2549 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2550 2758
2567 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2569 2777
2570 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2573 2781
2574 $map->load; 2782 $map->load;
2575 $map->load_neighbours; 2783 $map->load_neighbours;
2576 2784
2577 return unless $self->contr->active; 2785 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2786
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2582} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2583 2794
2795}
2796
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2585 2798
2586Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2803be called at the end of this process.
2591 2804
2805Note that $check will be called with a potentially non-loaded map, so if
2806it needs a loaded map it has to call C<< ->load >>.
2807
2592=cut 2808=cut
2593 2809
2594our $GOTOGEN; 2810our $GOTOGEN;
2595 2811
2596sub cf::object::player::goto { 2812sub cf::object::player::goto {
2597 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2598 2820
2599 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2601 2823
2602 $self->enter_link; 2824 $self->enter_link;
2622 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2623 } 2845 }
2624 } 2846 }
2625 2847
2626 my $map = eval { 2848 my $map = eval {
2627 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2628 2850
2629 if ($map) { 2851 if ($map) {
2630 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2631 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2632 } else { 2854 } else {
2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2634 } 2856 }
2635 2857
2636 $map 2858 $map
2644 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2645 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2646 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2647 } 2869 }
2648 2870
2649 $done->() if $done; 2871 $done->($self) if $done;
2650 })->prio (1); 2872 })->prio (1);
2651} 2873}
2652 2874
2653=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2654 2876
2674} 2896}
2675 2897
2676sub prepare_random_map { 2898sub prepare_random_map {
2677 my ($exit) = @_; 2899 my ($exit) = @_;
2678 2900
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2901 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2902 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2903 # that depends on the exit object
2684 2904
2685 my $rmp = parse_random_map_params $exit->msg; 2905 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2907 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2908 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2909 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2910 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2911 $rmp->{origin_y} = $exit->y;
2912
2913 $exit->map->touch;
2692 } 2914 }
2693 2915
2694 $rmp->{random_seed} ||= $exit->random_seed; 2916 $rmp->{random_seed} ||= $exit->random_seed;
2695 2917
2696 my $data = cf::encode_json $rmp; 2918 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2919 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2920 my $meta = "$RANDOMDIR/$md5.meta";
2699 2921
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2922 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2923 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2924 undef $fh;
2703 aio_rename "$meta~", $meta; 2925 aio_rename "$meta~", $meta;
2704 2926
2927 my $slaying = "?random/$md5";
2928
2929 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2930 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2931 $exit->msg (undef);
2932 }
2707 } 2933 }
2708} 2934}
2709 2935
2710sub cf::object::player::enter_exit { 2936sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2937 my ($self, $exit) = @_;
2712 2938
2713 return unless $self->type == cf::PLAYER; 2939 return unless $self->type == cf::PLAYER;
2714 2940
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2941 $self->enter_link;
2727 2942
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2943 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2944 $Coro::current->{desc} = "enter_exit";
2734 2945
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2946 unless (eval {
2947 $self->deactivate_recursive; # just to be sure
2948
2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2950 my $x = $exit->stats->hp;
2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2975
2737 $self->goto ($slaying, $hp, $sp); 2976 $self->goto ($map, $x, $y);
2738 2977
2978 # if exit is damned, update players death & WoR home-position
2979 $self->contr->savebed ($map, $x, $y)
2980 if $exit->flag (cf::FLAG_DAMNED);
2981
2739 1; 2982 1
2740 }) { 2983 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2988
2746 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2747 $self->leave_link; 2990 $self->leave_link;
2748 } 2991 }
2749 })->prio (1); 2992 })->prio (1);
2750} 2993}
2751 2994
2763sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2765 3008
2766 utf8::encode $text; 3009 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2768} 3036}
2769 3037
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 3039
2772Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2776 3044
2777=cut 3045=cut
2778 3046
2779# non-persistent channels (usually the info channel) 3047# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2781 "c/identify" => { 3055 "c/identify" => {
2782 id => "infobox", 3056 id => "infobox",
2783 title => "Identify", 3057 title => "Identify",
2784 reply => undef, 3058 reply => undef,
2785 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2787 "c/examine" => { 3061 "c/examine" => {
2788 id => "infobox", 3062 id => "infobox",
2789 title => "Examine", 3063 title => "Examine",
2790 reply => undef, 3064 reply => undef,
2791 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 3072 },
2793 "c/book" => { 3073 "c/book" => {
2794 id => "infobox", 3074 id => "infobox",
2795 title => "Book", 3075 title => "Book",
2796 reply => undef, 3076 reply => undef,
2812 id => "infobox", 3092 id => "infobox",
2813 title => "Body Parts", 3093 title => "Body Parts",
2814 reply => undef, 3094 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 3095 tooltip => "Shows which body parts you posess and are available",
2816 }, 3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
2817 "c/uptime" => { 3133 "c/uptime" => {
2818 id => "infobox", 3134 id => "infobox",
2819 title => "Uptime", 3135 title => "Uptime",
2820 reply => undef, 3136 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 3137 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 3140 id => "infobox",
2825 title => "Map Info", 3141 title => "Map Info",
2826 reply => undef, 3142 reply => undef,
2827 tooltip => "Information related to the maps", 3143 tooltip => "Information related to the maps",
2828 }, 3144 },
3145 "c/party" => {
3146 id => "party",
3147 title => "Party",
3148 reply => "gsay ",
3149 tooltip => "Messages and chat related to your party",
3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2829); 3159);
2830 3160
2831sub cf::client::send_msg { 3161sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2833 3163
2834 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2835 3166
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 3168
2838 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2841 3172
2842 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2846 3175
2847 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 3181 }
2854 3182
2855 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2856 } 3184 }
2857 3185
2858 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2859 3187
2860 if ($self->can_msg) {
2861 # default colour, mask it out 3188 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2864 3191
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3192 my $pkt = "msg "
3193 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 3195 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 3196
2879 $color &= cf::NDI_COLOR_MASK; 3197 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 3198}
2893 3199
2894=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2895 3201
2896Sends an ext event to the client. 3202Sends an ext event to the client.
2899 3205
2900sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2902 3208
2903 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 3214 }
2909} 3215}
2910 3216
2911=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2912 3218
2916 3222
2917sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2919 3225
2920 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3229 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3232 }
2927} 3233}
2928 3234
2929=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2930 3236
3001 3307
3002 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
3003 if $reply; 3309 if $reply;
3004 3310
3005 } else { 3311 } else {
3006 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3007 } 3313 }
3008 3314
3009 cf::override; 3315 cf::override;
3010 }, 3316 },
3011); 3317);
3031 3337
3032 $coro 3338 $coro
3033} 3339}
3034 3340
3035cf::client->attach ( 3341cf::client->attach (
3036 on_destroy => sub { 3342 on_client_destroy => sub {
3037 my ($ns) = @_; 3343 my ($ns) = @_;
3038 3344
3039 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3040 }, 3346 },
3041); 3347);
3057our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
3058 3364
3059$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
3060 3366
3061$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
3063 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
3064 sort time 3370 sort time
3065)); 3371));
3066 3372
3067# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
3070 3376
3071The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
3072 3378
3073 cf::object 3379 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3380 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3381 insert remove name archname title slaying race decrease split
3382 value
3076 3383
3077 cf::object::player 3384 cf::object::player
3078 player 3385 player
3079 3386
3080 cf::player 3387 cf::player
3085 3392
3086=cut 3393=cut
3087 3394
3088for ( 3395for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3095) { 3402) {
3096 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3099 for @funs; 3405 for @funs;
3100} 3406}
3101 3407
3116 3422
3117 my $qcode = $code; 3423 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
3120 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
3121 local $_; 3430 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3431
3124 my $eval = 3432 my $eval =
3125 "do {\n" 3433 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3436 . $code
3129 . "\n}" 3437 . "\n}"
3130 ; 3438 ;
3131 3439
3440 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
3135 3449
3136 if ($@) { 3450 if ($@) {
3137 warn "$@"; 3451 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3140 } 3454 }
3141 3455
3142 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3143} 3457}
3144 3458
3158=cut 3472=cut
3159 3473
3160sub register_script_function { 3474sub register_script_function {
3161 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3162 3476
3163 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3165} 3479}
3166 3480
3167=back 3481=back
3168 3482
3169=cut 3483=cut
3178 # for this (global event?) 3492 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3494
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3496
3183 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3184 3498
3185 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3186 0 < aio_load $path, $facedata
3187 or die "$path: $!";
3188
3189 $facedata = Coro::Storable::thaw $facedata;
3190 3500
3191 $facedata->{version} == 2 3501 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3503
3194 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3507 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3510 };
3199 cf::cede_to_tick; 3511 cf::cede_to_tick;
3200 3512
3201 { 3513 {
3202 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3518
3207 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3211 3524
3212 cf::cede_to_tick; 3525 cf::cede_to_tick;
3213 } 3526 }
3214 3527
3215 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3220 3533
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3537 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3539 }
3227 3540
3228 cf::cede_to_tick; 3541 cf::cede_to_tick;
3229 } 3542 }
3230 } 3543 }
3239 3552
3240 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3241 } 3554 }
3242 3555
3243 { 3556 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3247 3558
3248 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3560 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3562
3253 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3268 } else { 3565 } else {
3269 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3270 } 3567 }
3271 3568
3272 cf::cede_to_tick; 3569 cf::cede_to_tick;
3273 } 3570 }
3274 } 3571 }
3275 3572
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3574
3278 1 3575 1
3279} 3576}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300 3577
3301register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3303 3580
3304 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3582 $ns->fx_want ($k, $v);
3306 } 3583 }
3307}; 3584};
3585
3586sub load_resource_file($) {
3587 my $guard = lock_acquire "load_resource_file";
3588
3589 my $status = load_resource_file_ $_[0];
3590 get_slot 0.1, 100;
3591 cf::arch::commit_load;
3592
3593 $status
3594}
3308 3595
3309sub reload_regions { 3596sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3597 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3598 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3599 %ext::player_env::MUSIC_FACE_CACHE = ();
3326} 3613}
3327 3614
3328sub reload_archetypes { 3615sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3616 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3617 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3618}
3337 3619
3338sub reload_treasures { 3620sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3341} 3623}
3342 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3343sub reload_resources { 3645sub reload_resources {
3344 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3345 3647
3648 reload_exp_table;
3649 reload_materials;
3650 reload_facedata;
3651 reload_sound;
3652 reload_archetypes;
3346 reload_regions; 3653 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3654 reload_treasures;
3351 3655
3352 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3353}
3354
3355sub init {
3356 reload_resources;
3357} 3657}
3358 3658
3359sub reload_config { 3659sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3361 or return;
3362 3661
3363 local $/; 3662 my $config = load_file "$CONFDIR/config";
3364 *CFG = YAML::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3365 3665
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3667
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3670
3371 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3375 }; 3675 };
3376 warn $@ if $@; 3676 warn $@ if $@;
3377 } 3677 }
3378} 3678}
3379 3679
3680sub pidfile() {
3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3682 or die "$PIDFILE: $!";
3683 flock $fh, &Fcntl::LOCK_EX
3684 or die "$PIDFILE: flock: $!";
3685 $fh
3686}
3687
3688# make sure only one server instance is running at any one time
3689sub atomic {
3690 my $fh = pidfile;
3691
3692 my $pid = <$fh>;
3693 kill 9, $pid if $pid > 0;
3694
3695 seek $fh, 0, 0;
3696 print $fh $$;
3697}
3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3380sub main { 3708sub main {
3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3717
3381 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3721 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3723 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3388 }; 3725 };
3389 3726
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3727 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3739 reload_config;
3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3750 load_extensions;
3751
3752 utime time, time, $RUNTIMEFILE;
3753
3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3757
3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3397} 3770}
3398 3771
3399############################################################################# 3772#############################################################################
3400# initialisation and cleanup 3773# initialisation and cleanup
3401 3774
3402# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3403BEGIN { 3776BEGIN {
3404 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3405 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3406 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3407 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3408 }; 3781 };
3409 } 3782 }
3410} 3783}
3411 3784
3412sub write_runtime_sync { 3785sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
3414 3787
3415 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3417 3790
3418 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3792
3420 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3421 3794
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3423 or return; 3796 or return;
3424 3797
3425 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
3438 3811
3439 close $fh 3812 close $fh
3440 or return; 3813 or return;
3441 3814
3442 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3816 and return;
3444 3817
3445 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3446 3819
3447 1 3820 1
3448} 3821}
3449 3822
3450our $uuid_lock; 3823our $uuid_lock;
3459 my $uuid = "$LOCALDIR/uuid"; 3832 my $uuid = "$LOCALDIR/uuid";
3460 3833
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3835 or return;
3463 3836
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3845 $uuid_skip = 0;
3466 3846
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3848 and return;
3469 3849
3475 or return; 3855 or return;
3476 3856
3477 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3478 and return; 3858 and return;
3479 3859
3480 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3481 3861
3482 1 3862 1
3483 3863
3484} 3864}
3485 3865
3491} 3871}
3492 3872
3493sub emergency_save() { 3873sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3495 3875
3496 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3497 3882
3498 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3499 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3892 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3894 $pl->save;
3508 } 3895 }
3509 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3510 3897
3511 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3903 $map->valid or next;
3515 $map->save; 3904 $map->save;
3516 } 3905 }
3517 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3518 3907
3519 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3522 3913
3523 warn "begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3915 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3526 }; 3936 };
3527 3937
3528 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3529} 3939}
3530 3940
3531sub post_cleanup { 3941sub post_cleanup {
3532 my ($make_core) = @_; 3942 my ($make_core) = @_;
3533 3943
3944 IO::AIO::flush;
3945
3534 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3951}
3952
3953# a safer delete_package, copied from Symbol
3954sub clear_package($) {
3955 my $pkg = shift;
3956
3957 # expand to full symbol table name if needed
3958 unless ($pkg =~ /^main::.*::$/) {
3959 $pkg = "main$pkg" if $pkg =~ /^::/;
3960 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3961 $pkg .= '::' unless $pkg =~ /::$/;
3962 }
3963
3964 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3965 my $stem_symtab = *{$stem}{HASH};
3966
3967 defined $stem_symtab and exists $stem_symtab->{$leaf}
3968 or return;
3969
3970 # clear all symbols
3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3972 for my $name (keys %$leaf_symtab) {
3973 _gv_clear *{"$pkg$name"};
3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3975 }
3536} 3976}
3537 3977
3538sub do_reload_perl() { 3978sub do_reload_perl() {
3539 # can/must only be called in main 3979 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3541 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3542 return; 3982 return;
3543 } 3983 }
3544 3984
3545 warn "reloading..."; 3985 return if $RELOAD++;
3546 3986
3547 warn "entering sync_job"; 3987 my $t1 = AE::time;
3548 3988
3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3992
3993 trace "perl_reload: entering sync_job";
3994
3549 cf::sync_job { 3995 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3996 #cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark
3553 3997
3554 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV;
3556
3557 # if anything goes wrong in here, we should simply crash as we already saved
3558
3559 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs;
3565 warn "iterate...";
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = (); 4000 %EXT_CORO = ();
3573 4001
3574 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3575 %COMMAND = (); 4003 %COMMAND = ();
3576 4004
3577 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3578 %EXTCMD = (); 4006 %EXTCMD = ();
3579 %EXTICMD = (); 4007 %EXTICMD = ();
3580 4008
3581 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3582 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3584 4012
3585 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3586 eval { 4014 eval {
3587 $cb->($pkg); 4015 $cb->($pkg);
3588 1 4016 1
3589 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
4018 }
4019
4020 trace "... clearing $pkg";
4021 clear_package $pkg;
3590 } 4022 }
3591 4023
3592 warn "... nuking $pkg";
3593 Symbol::delete_package $pkg;
3594 }
3595
3596 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3597 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 4027
3600 warn "... unloading $k"; 4028 trace "... unloading $k";
3601 delete $INC{$k}; 4029 delete $INC{$k};
3602 4030
3603 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3605 4033
3606 if (my $cb = $k->can ("unload_module")) { 4034 if (my $cb = $k->can ("unload_module")) {
3607 $cb->(); 4035 $cb->();
4036 }
4037
4038 clear_package $k;
3608 } 4039 }
3609 4040
3610 Symbol::delete_package $k;
3611 }
3612
3613 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 4042 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 4044
3617 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 4048
3621 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3622 # and global variables created in xs 4050 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3624 4052
3625 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3626 4054
3627 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3628 require cf; 4056 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3630 4058
3631 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3632 cf::reload_config; 4060 cf::reload_config;
3633 4061
3634 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3635 cf::load_extensions; 4063 cf::load_extensions;
3636 4064
4065 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3640 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3643 4073
3644 warn "leaving sync_job"; 4074 cf::_post_init 1;
3645 4075
4076 trace "perl_reload: leaving sync_job";
4077
3646 1 4078 1
3647 } or do { 4079 } or do {
3648 warn $@; 4080 error $@;
3649 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
4082 };
4083
4084 --$RELOAD;
3650 }; 4085 }
3651 4086
3652 warn "reloaded"; 4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3653}; 4089};
3654 4090
3655our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3656 4092
3657sub reload_perl() { 4093sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3660 4096
4097 $RELOAD_WATCHER ||= cf::async {
4098 Coro::AIO::aio_wait cache_extensions;
4099
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 4101 do_reload_perl;
3663 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
4103 };
3664 }; 4104 };
3665} 4105}
3666 4106
3667register_command "reload" => sub { 4107register_command "reload" => sub {
3668 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3674 reload_perl; 4114 reload_perl;
3675 }; 4115 };
3676 } 4116 }
3677}; 4117};
3678 4118
3679unshift @INC, $LIBDIR; 4119#############################################################################
3680 4120
3681my $bug_warning = 0; 4121my $bug_warning = 0;
3682 4122
3683our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN;
3685
3686sub wait_for_tick { 4123sub wait_for_tick() {
3687 return if tick_inhibit; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3688 return if $Coro::current == $Coro::main;
3689 4125
3690 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3691 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait;
3693} 4127}
3694 4128
3695sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3696 return if tick_inhibit; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3697 return if $Coro::current == $Coro::main;
3698 4131
3699 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 4134 $signal->wait;
3702} 4135}
3706 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3707 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3708 return; 4141 return;
3709 } 4142 }
3710 4143
3711 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4145
4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3712 4147
3713 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3715 Coro::async_pool { 4150 Coro::async_pool {
3716 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3717 write_runtime_sync 4152 write_runtime_sync
3718 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3719 }; 4154 };
3720 } 4155 }
3721 4156
3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3723 $sig->send; 4158 $sig->send;
3724 } 4159 }
3725 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3726 $sig->send;
3727 }
3728 4161
3729 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3730 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3731 4164
3732 if (0) { 4165 if (0) {
3733 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3734 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3737 } 4170 }
3738 } 4171 }
3739} 4172}
3740 4173
3741{ 4174{
3742 # configure BDB 4175 # configure BDB
3743 4176
3744 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3745 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3747 4180
3748 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4183 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 4184 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4185 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4186 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4187 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 4188
3755 cf::sync_job { 4189 cf::sync_job {
3756 eval { 4190 eval {
3782{ 4216{
3783 # configure IO::AIO 4217 # configure IO::AIO
3784 4218
3785 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4221 undef $AnyEvent::AIO::WATCHER;
3788} 4222}
3789 4223
3790my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3791 4226
3792sub _log_backtrace { 4227sub _log_backtrace {
3793 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3794 4229
3795 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3796 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3797 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3799 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3800 async { 4240 async {
3801 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3802 4242
3803 my @bt = fork_call { 4243 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4255 }
3816 4256
3817 @funcs 4257 @funcs
3818 }; 4258 };
3819 4259
3820 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4263 --$_log_backtrace;
3823 }; 4264 };
3824 } else { 4265 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3827 } 4268 }
3828} 4269}
3829 4270
3830# load additional modules 4271# load additional modules
3831use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3832 4274
3833END { cf::emergency_save } 4275END { cf::emergency_save }
3834 4276
38351 42771
3836 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines