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.444 by root, Mon Sep 8 11:27:25 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 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 75
70$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" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
87our $DATADIR = datadir; 99our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
91our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
97our %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;
98 120
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 123our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
103 125
104our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 129our $DB_ENV;
108 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
109our %CFG; 133our %CFG;
110 134
111our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
113our $NOW; 138our $NOW;
114 139
115our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
116our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
117our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 149our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
126 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
127binmode STDOUT; 160binmode STDOUT;
128binmode STDERR; 161binmode STDERR;
129 162
130# read virtual server time, if available 163# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
135} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
136 171
137mkdir $_ 172mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 174
140our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
141 176
142sub cf::map::normalise; 177sub cf::map::normalise;
143 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
144############################################################################# 183#############################################################################
145 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
146=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
147 197
148=over 4 198=over 4
149 199
150=item $cf::UPTIME 200=item $cf::UPTIME
151 201
152The 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.
153 218
154=item $cf::RUNTIME 219=item $cf::RUNTIME
155 220
156The 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
157every server tick. 222every server tick.
163Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
164directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
165unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
166database environment. 231database environment.
167 232
168=item $cf::NOW
169
170The time of the last (current) server tick.
171
172=item $cf::TICK
173
174The interval between server ticks, in seconds.
175
176=item $cf::LOADAVG 233=item $cf::LOADAVG
177 234
178The 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
179(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
180objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
189from wherever your confdir points to. 246from wherever your confdir points to.
190 247
191=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
192 249
193These 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
194returns 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
195per 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.
196 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
197=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
198 272
199This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 275that call.
202 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
203=back 283=back
204 284
205=cut 285=cut
206 286
207BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
208 *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 {
209 my $msg = join "", @_; 294 my $msg = join "", @_;
210 295
211 $msg .= "\n" 296 $msg .= "\n"
212 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
213 298
214 $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;
215 300
216 LOG llevError, $msg; 301 LOG llevWarn, $msg;
217 }; 302};
218}
219 303
220$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
222 306
223 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 311 return;#d#
226 }#d# 312 }#d#
227 313
228 # kill coroutine otherwise 314 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 315 Coro::terminate
231}; 316};
232
233$SIG{__DIE__} = sub { }; #d#?
234 317
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 335)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 337}
255 338
256$EV::DIED = sub { 339$EV::DIED = sub {
257 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
258}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
259 347
260############################################################################# 348#############################################################################
261 349
262=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
263 351
284 $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;
285 $d 373 $d
286 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
287} 375}
288 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
289=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
290 392
291Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
292 394
293=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
299our $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
300 402
301sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 468=item cf::lock_wait $string
305 469
306Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
307 471
308=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
309 473
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
313returned. 477returned.
314 478
315Locks 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
316deadlocked coro. 480deadlocked coro.
322 486
323Return 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.
324 488
325=cut 489=cut
326 490
327our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 492
330sub lock_wait($) { 493sub lock_wait($) {
331 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 495}
344 496
345sub lock_acquire($) { 497sub lock_acquire($) {
346 my ($key) = @_; 498 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 499}
360 500
361sub lock_active($) { 501sub lock_active($) {
362 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 503}
366 504
367sub freeze_mainloop { 505sub freeze_mainloop {
368 tick_inhibit_inc; 506 tick_inhibit_inc;
369 507
370 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
371} 509}
372 510
373=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
374 512
375Like 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
376get spread over timer. 514get spread over time.
377 515
378=cut 516=cut
379 517
380sub periodic($$) { 518sub periodic($$) {
381 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
386} 524}
387 525
388=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
389 527
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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.
393 535
394The 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
395used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
396 538
397Useful for short background jobs. 539Useful for short background jobs.
398 540
399=cut 541=cut
400 542
401our @SLOT_QUEUE; 543our @SLOT_QUEUE;
402our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
403 546
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
407 550
408 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
409 553
410 while () { 554 while () {
411 next_job: 555 next_job:
556
412 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 558
414 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 563 $job->[2]->send;
418 Coro::cede; 564 Coro::cede;
419 goto next_job; 565 goto next_job;
420 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 568 }
422 } 569 }
423 570
424 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 574 } else {
575 $busy = 0;
429 Coro::schedule; 576 Coro::schedule;
430 } 577 }
431 } 578 }
432}; 579};
433 580
434sub get_slot($;$$) { 581sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
436 583
437 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
438 585
439 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
440 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
441 589
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
470=cut 618=cut
471 619
472sub sync_job(&) { 620sub sync_job(&) {
473 my ($job) = @_; 621 my ($job) = @_;
474 622
475 if ($Coro::current == $Coro::main) { 623 if (in_main) {
476 my $time = EV::time; 624 my $time = AE::time;
477 625
478 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
480 628
481 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
482 630
483 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
484 632
485 my $busy = 1; 633 my $busy = 1;
486 my @res; 634 my @res;
487 635
488 (async { 636 (async {
489 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 638 @res = eval { $job->() };
491 warn $@ if $@; 639 error $@ if $@;
492 undef $busy; 640 undef $busy;
493 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
494 642
495 while ($busy) { 643 while ($busy) {
496 if (Coro::nready) { 644 if (Coro::nready) {
498 } else { 646 } else {
499 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
500 } 648 }
501 } 649 }
502 650
503 my $time = EV::time - $time; 651 my $time = AE::time - $time;
504 652
505 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
506 654
507 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
508 } else { 656 } else {
530 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
531 679
532 $coro 680 $coro
533} 681}
534 682
535=item fork_call { }, $args 683=item fork_call { }, @args
536 684
537Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 688never block itself or use any form of event handling.
541 689
542=cut 690=cut
543 691
692sub post_fork {
693 reset_signals;
694}
695
544sub fork_call(&@) { 696sub fork_call(&@) {
545 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
546 698
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
550 702
551 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
552 reset_signals; 704 cf::post_fork;
553 &$cb 705 &$cb
554 }, @args; 706 } @args;
555 707
556 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 )
557} 720}
558 721
559=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
560 723
561=cut 724=cut
598within each server. 761within each server.
599 762
600=cut 763=cut
601 764
602sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
603 my ($name) = @_; 769 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
605 771
606 eval { 772 eval {
607 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
617} 783}
618 784
619our $DB; 785our $DB;
620 786
621sub db_init { 787sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
624 };
625} 789}
626 790
627sub db_get($$) { 791sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
629 793
630 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
631 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
632 798
633 $! ? () 799 $! ? ()
634 : $data 800 : $data
635 }
636} 801}
637 802
638sub db_put($$$) { 803sub db_put($$$) {
639 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 833
669 my @data; 834 my @data;
670 my $md5; 835 my $md5;
671 836
672 for (0 .. $#$src) { 837 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 839 }
676 840
677 # if processing is expensive, check 841 # if processing is expensive, check
678 # checksum first 842 # checksum first
679 if (1) { 843 if (1) {
696 860
697 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 862 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
700 864
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 866
703 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
706 870
716 880
717=cut 881=cut
718 882
719sub datalog($@) { 883sub datalog($@) {
720 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 886}
723 887
724=back 888=back
725 889
726=cut 890=cut
727 891
728############################################################################# 892#############################################################################
729 893
730=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
731 895
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
735 899
736In 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>
737C<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
787=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
788 952
789Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
791 955
792Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 958
795These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
796 960
797=over 4 961=over 4
921 1085
922 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1088
925 } elsif (ref $type) { 1089 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
927 1091
928 } else { 1092 } else {
929 shift @arg; 1093 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
931 } 1095 }
932 } 1096 }
933} 1097}
934 1098
935sub _object_attach { 1099sub _object_attach {
945 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
946 } 1110 }
947 1111
948 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
949 } else { 1113 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1115 }
952 1116
953 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
954} 1118}
955 1119
1014 1178
1015 for (@$callbacks) { 1179 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1017 1181
1018 if ($@) { 1182 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1184 override;
1022 } 1185 }
1023 1186
1024 return 1 if $override; 1187 return 1 if $override;
1025 } 1188 }
1104 for (@$attach) { 1267 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1107 } 1270 }
1108 } else { 1271 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1273 }
1111 } 1274 }
1112} 1275}
1113 1276
1114cf::attachable->attach ( 1277cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1142 1305
1143 sync_job { 1306 sync_job {
1144 if (length $$rdata) { 1307 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1148 1312
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1320 aio_close $fh;
1154 1321
1155 if (@$objs) { 1322 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1331 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1333 }
1164 } else { 1334 } else {
1165 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1166 } 1336 }
1167 1337
1168 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1342 } else {
1170 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1171 } 1344 }
1172 } else { 1345 } else {
1173 aio_unlink $filename; 1346 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1175 } 1348 }
1199 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs}; 1373 $av = $st->{objs};
1201 } 1374 }
1202 1375
1203 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1206 1380
1207 ($data, $av) 1381 ($data, $av)
1208} 1382}
1209 1383
1210=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1266 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1267 1441
1268 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1269} 1443}
1270 1444
1445use File::Glob ();
1446
1271cf::player->attach ( 1447cf::player->attach (
1272 on_command => sub { 1448 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1274 1450
1275 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1276 or return; 1452 or return;
1277 1453
1300 1476
1301 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1302 if $reply; 1478 if $reply;
1303 1479
1304 } else { 1480 } else {
1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1306 } 1482 }
1307 1483
1308 cf::override; 1484 cf::override;
1309 }, 1485 },
1310); 1486);
1311 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
1312sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1313 cf::sync_job { 1504 cf::sync_job {
1314 my %todo; 1505 my %todo;
1315 1506
1316 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1317 next unless -r $path; 1508 next unless -r $path;
1335 1526
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338 1529
1339 $ext{source} = 1530 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1341 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1342 . $source 1533 . $source
1343 . "\n};\n1"; 1534 . "\n};\n1";
1344 1535
1345 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1346 } 1537 }
1347 1538
1539 my $pass = 0;
1348 my %done; 1540 my %done;
1349 while (%todo) { 1541 while (%todo) {
1350 my $progress; 1542 my $progress;
1351 1543
1544 ++$pass;
1545
1546 ext:
1352 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1549 next ext
1355 unless exists $done{$_}; 1550 unless exists $done{$_};
1356 } 1551 }
1357 1552
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1554
1360 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1559
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1561 if exists $v->{meta}{mandatory};
1368 1562
1369 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;
1370 } 1572 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1573 }
1376 1574
1377 skip: 1575 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1585 }
1381 }; 1586 };
1382} 1587}
1383 1588
1384############################################################################# 1589#############################################################################
1385 1590
1386=back 1591=back
1387 1592
1388=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1389 1594
1390Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1391 1596
1392=cut 1597=cut
1393 1598
1394package cf::player; 1599package cf::player;
1395 1600
1438 1643
1439sub exists($) { 1644sub exists($) {
1440 my ($login) = @_; 1645 my ($login) = @_;
1441 1646
1442 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1444} 1649}
1445 1650
1446sub find($) { 1651sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1653 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1469 } 1674 }
1470 } 1675 }
1471} 1676}
1472 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
1473sub save($) { 1691sub save($) {
1474 my ($pl) = @_; 1692 my ($pl) = @_;
1475 1693
1476 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1477 1695
1482 1700
1483 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1485 1703
1486 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1487 1708
1488 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1710 cf::cede_to_tick;
1490} 1711}
1491 1712
1525 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1526 1747
1527 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1750
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1531 $pl->deactivate; 1752 $pl->deactivate;
1753
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1534 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1535 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1536 1759
1537 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1538 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1593 \@logins 1816 \@logins
1594} 1817}
1595 1818
1596=item $player->maps 1819=item $player->maps
1597 1820
1821=item cf::player::maps $login
1822
1598Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1599player. May block. 1824player. May block.
1600 1825
1601=cut 1826=cut
1602 1827
1619 } 1844 }
1620 1845
1621 \@paths 1846 \@paths
1622} 1847}
1623 1848
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1850
1626Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1627 1852
1628=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1629 1854
1630Sends an ext reply to the player. 1855Sends an ext reply to the player.
1631 1856
1663 1888
1664=cut 1889=cut
1665 1890
1666sub find_by_path($) { 1891sub find_by_path($) {
1667 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1668 1895
1669 my ($match, $specificity); 1896 my ($match, $specificity);
1670 1897
1671 for my $region (list) { 1898 for my $region (list) {
1672 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1701sub generate_random_map { 1928sub generate_random_map {
1702 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1703 1930
1704 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
1705 1932
1706 # mit "rum" bekleckern, nicht
1707 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1711 $rmp->{exit_on_final_map},
1712 $rmp->{xsize}, $rmp->{ysize},
1713 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1714 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1715 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1716 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1717 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1718 (cf::region::find $rmp->{region}), $rmp->{custom}
1719 )
1720} 1934}
1721 1935
1722=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1723 1937
1724Register 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
1729 1943
1730sub register { 1944sub register {
1731 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1732 my $pkg = caller; 1946 my $pkg = caller;
1733 1947
1734 no strict;
1735 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1736 1949
1737 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1738} 1951}
1739 1952
1740# also paths starting with '/' 1953# also paths starting with '/'
1741$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1742 1955
1743sub thawer_merge { 1956sub thawer_merge {
1744 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1745 1958
1746 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1751} 1964}
1752 1965
1753sub normalise { 1966sub normalise {
1754 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1755 1968
1756 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1757 1970
1758 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1759 1972
1760 # map plan: 1973 # map plan:
1761 # 1974 #
1776 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1777 $path = "$base/$path"; 1990 $path = "$base/$path";
1778 } 1991 }
1779 1992
1780 for ($path) { 1993 for ($path) {
1781 redo if s{//}{/};
1782 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1783 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1784 } 1996 }
1785 1997
1786 $path 1998 $path
1800 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1801 return $self; 2013 return $self;
1802 } 2014 }
1803 } 2015 }
1804 2016
1805 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1806 () 2018 ()
1807} 2019}
1808 2020
2021# may re-bless or do other evil things
1809sub init { 2022sub init {
1810 my ($self) = @_; 2023 my ($self) = @_;
1811 2024
1812 $self 2025 $self
1813} 2026}
1844 2057
1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1847} 2060}
1848 2061
1849# and all this just because we cannot iterate over
1850# all maps in C++...
1851sub change_all_map_light {
1852 my ($change) = @_;
1853
1854 $_->change_map_light ($change)
1855 for grep $_->outdoor, values %cf::MAP;
1856}
1857
1858sub decay_objects { 2062sub decay_objects {
1859 my ($self) = @_; 2063 my ($self) = @_;
1860 2064
1861 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1862 2066
1887 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1888 2092
1889 1 2093 1
1890} 2094}
1891 2095
2096# used to laod the header of an original map
1892sub load_header_orig { 2097sub load_header_orig {
1893 my ($self) = @_; 2098 my ($self) = @_;
1894 2099
1895 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1896} 2101}
1897 2102
2103# used to laod the header of an instantiated map
1898sub load_header_temp { 2104sub load_header_temp {
1899 my ($self) = @_; 2105 my ($self) = @_;
1900 2106
1901 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1902} 2108}
1903 2109
2110# called after loading the header from an instantiated map
1904sub prepare_temp { 2111sub prepare_temp {
1905 my ($self) = @_; 2112 my ($self) = @_;
1906 2113
1907 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1908 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1909 # safety 2116 # safety
1910 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1911 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1912} 2119}
1913 2120
2121# called after loading the header from an original map
1914sub prepare_orig { 2122sub prepare_orig {
1915 my ($self) = @_; 2123 my ($self) = @_;
1916 2124
1917 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1918 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1942 2150
1943sub find; 2151sub find;
1944sub find { 2152sub find {
1945 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1946 2154
2155 cf::cede_to_tick;
2156
1947 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1948 2158
1949 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1951 2161
1952 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1957 or return; 2164 or return;
1958 2165
1959 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1960 2167
1972 2179
1973 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1974 } 2181 }
1975} 2182}
1976 2183
1977sub pre_load { } 2184sub pre_load { }
1978sub post_load { } 2185#sub post_load { } # XS
1979 2186
1980sub load { 2187sub load {
1981 my ($self) = @_; 2188 my ($self) = @_;
1982 2189
1983 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1986 2193
1987 { 2194 {
1988 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1989 2196
1990 return unless $self->valid; 2197 return unless $self->valid;
1991 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
1992
1993 $self->in_memory (cf::MAP_LOADING);
1994 2199
1995 $self->alloc; 2200 $self->alloc;
1996 2201
1997 $self->pre_load; 2202 $self->pre_load;
1998 cf::cede_to_tick; 2203 cf::cede_to_tick;
1999 2204
2205 if (exists $self->{load_path}) {
2000 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2001 $f->skip_block; 2207 $f->skip_block;
2002 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2003 or return; 2209 or return;
2004 2210
2005 $self->post_load_original 2211 $self->post_load_original
2006 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2007 2213
2008 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2009 utf8::encode $uniq; 2215 utf8::encode $uniq;
2010 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2011 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2012 $self->clear_unique_items; 2218 $self->clear_unique_items;
2013 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2014 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2015 } 2222 }
2016 } 2223 }
2017 }
2018 2224
2019 $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);
2020 2232
2021 cf::cede_to_tick; 2233 cf::cede_to_tick;
2022 # now do the right thing for maps 2234 # now do the right thing for maps
2023 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2024 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2027 2239
2028 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2029 $self->decay_objects; 2241 $self->decay_objects;
2030 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2031 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2032 cf::cede_to_tick; 2245 cf::cede_to_tick;
2033 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2034 cf::cede_to_tick;
2035 $self->activate;
2036 } 2247 }
2037 2248
2038 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2040
2041 $self->in_memory (cf::MAP_ACTIVE);
2042 } 2251 }
2043 2252
2044 $self->post_load; 2253 $self->post_load;
2045}
2046 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
2047sub customise_for { 2261sub customise_for {
2048 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2049 2263
2050 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2051 if $self->per_player; 2265 if $self->per_player;
2067 or next; 2281 or next;
2068 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2069 or next; 2283 or next;
2070 $neigh->load; 2284 $neigh->load;
2071 2285
2286 # now find the diagonal neighbours
2072 push @neigh, 2287 push @neigh,
2073 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2074 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2075 } 2290 }
2076 2291
2083} 2298}
2084 2299
2085sub find_sync { 2300sub find_sync {
2086 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2087 2302
2088 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
2089} 2308}
2090 2309
2091sub do_load_sync { 2310sub do_load_sync {
2092 my ($map) = @_; 2311 my ($map) = @_;
2093 2312
2313 # it's a bug to call this from the main context
2094 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2095 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2096 2316
2097 cf::sync_job { $map->load }; 2317 $map->load;
2098} 2318}
2099 2319
2100our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2101our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2102 2322
2103sub find_async { 2323sub find_async {
2104 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2105 2325
2106 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2107 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2108 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2110 } 2332 }
2111 2333
2112 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2113 2335
2114 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2128 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2129 2351
2130 () 2352 ()
2131} 2353}
2132 2354
2355# common code, used by both ->save and ->swapout
2133sub save { 2356sub _save {
2134 my ($self) = @_; 2357 my ($self) = @_;
2135
2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
2137 2358
2138 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2139 2360
2140 return unless $self->dirty; 2361 return unless $self->dirty;
2141 2362
2161 } else { 2382 } else {
2162 $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);
2163 } 2384 }
2164} 2385}
2165 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2166sub swap_out { 2395sub swap_out {
2167 my ($self) = @_; 2396 my ($self) = @_;
2168 2397
2169 # save first because save cedes
2170 $self->save;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2174 return if $self->players; 2402 return if $self->players;
2175 return if $self->in_memory != cf::MAP_ACTIVE; 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
2176 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2177 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
2178 $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};
2179 2454
2180 $self->deactivate; 2455 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->clear; 2457 $self->clear;
2183}
2184
2185sub reset_at {
2186 my ($self) = @_;
2187
2188 # TODO: safety, remove and allow resettable per-player maps
2189 return 1e99 if $self->{deny_reset};
2190
2191 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2192 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2193
2194 $time + $to
2195}
2196
2197sub should_reset {
2198 my ($self) = @_;
2199
2200 $self->reset_at <= $cf::RUNTIME
2201}
2202
2203sub reset {
2204 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207
2208 return if $self->players;
2209
2210 warn "resetting map ", $self->path;
2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 # need to save uniques path
2215 unless ($self->{deny_save}) {
2216 my $uniq = $self->uniq_path; utf8::encode $uniq;
2217
2218 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2219 if $uniq;
2220 }
2221
2222 delete $cf::MAP{$self->path};
2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
2226 $self->clear;
2227 2458
2228 $self->unlink_save; 2459 $self->unlink_save;
2229 $self->destroy; 2460 $self->destroy;
2230} 2461}
2231 2462
2239 2470
2240 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2241 2472
2242 $self->unlink_save; 2473 $self->unlink_save;
2243 2474
2244 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2245 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2246 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2247 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2249 2480
2306 : normalise $_ 2537 : normalise $_
2307 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2308 ] 2539 ]
2309} 2540}
2310 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
2311=back 2574=back
2312 2575
2313=head3 cf::object 2576=head3 cf::object
2314 2577
2315=cut 2578=cut
2380 2643
2381our $SAY_CHANNEL = { 2644our $SAY_CHANNEL = {
2382 id => "say", 2645 id => "say",
2383 title => "Map", 2646 title => "Map",
2384 reply => "say ", 2647 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2386}; 2649};
2387 2650
2388our $CHAT_CHANNEL = { 2651our $CHAT_CHANNEL = {
2389 id => "chat", 2652 id => "chat",
2390 title => "Chat", 2653 title => "Chat",
2445 2708
2446=item $player_object->enter_link 2709=item $player_object->enter_link
2447 2710
2448Freezes 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}>).
2449 2712
2450The 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.
2451I<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.
2452 2717
2453Will never block. 2718Will never block.
2454 2719
2455=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2456 2721
2476sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2477 my ($self) = @_; 2742 my ($self) = @_;
2478 2743
2479 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2480 2745
2746 ++$self->{_link_recursion};
2747
2481 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2482 2749
2483 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2484 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2485 2752
2486 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2487} 2754}
2488 2755
2489sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2490 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2491 2758
2508 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2509 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2510 2777
2511 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2512 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2513 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2514 2781
2515 $map->load; 2782 $map->load;
2516 $map->load_neighbours; 2783 $map->load_neighbours;
2517 2784
2518 return unless $self->contr->active; 2785 return unless $self->contr->active;
2519 $self->activate_recursive;
2520 2786
2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2523} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2524 2794
2795}
2796
2525=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)]])
2526 2798
2527Moves 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
2528her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2529that 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
2530the 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
2537 2809
2538our $GOTOGEN; 2810our $GOTOGEN;
2539 2811
2540sub cf::object::player::goto { 2812sub cf::object::player::goto {
2541 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 }
2542 2820
2543 # 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
2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2545 2823
2546 $self->enter_link; 2824 $self->enter_link;
2566 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2567 } 2845 }
2568 } 2846 }
2569 2847
2570 my $map = eval { 2848 my $map = eval {
2571 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2572 2850
2573 if ($map) { 2851 if ($map) {
2574 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2575 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2576 } else { 2854 } else {
2577 $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);
2578 } 2856 }
2579 2857
2580 $map 2858 $map
2588 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2589 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2590 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2591 } 2869 }
2592 2870
2593 $done->() if $done; 2871 $done->($self) if $done;
2594 })->prio (1); 2872 })->prio (1);
2595} 2873}
2596 2874
2597=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2598 2876
2666 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2667 2945
2668 unless (eval { 2946 unless (eval {
2669 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2670 2948
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2680 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp; 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 }
2682 2975
2683 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2684 2977
2685 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED); 2980 if $exit->flag (cf::FLAG_DAMNED);
2688 2981
2689 1 2982 1
2690 }) { 2983 }) {
2691 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2692 . "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. "
2693 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2694 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2695 2988
2696 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2697 $self->leave_link; 2990 $self->leave_link;
2698 } 2991 }
2699 })->prio (1); 2992 })->prio (1);
2700} 2993}
2701 2994
2713sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2714 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2715 3008
2716 utf8::encode $text; 3009 utf8::encode $text;
2717 $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);
2718} 3036}
2719 3037
2720=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2721 3039
2722Send 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
2726 3044
2727=cut 3045=cut
2728 3046
2729# non-persistent channels (usually the info channel) 3047# non-persistent channels (usually the info channel)
2730our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2731 "c/identify" => { 3055 "c/identify" => {
2732 id => "infobox", 3056 id => "infobox",
2733 title => "Identify", 3057 title => "Identify",
2734 reply => undef, 3058 reply => undef,
2735 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2737 "c/examine" => { 3061 "c/examine" => {
2738 id => "infobox", 3062 id => "infobox",
2739 title => "Examine", 3063 title => "Examine",
2740 reply => undef, 3064 reply => undef,
2741 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",
2742 }, 3072 },
2743 "c/book" => { 3073 "c/book" => {
2744 id => "infobox", 3074 id => "infobox",
2745 title => "Book", 3075 title => "Book",
2746 reply => undef, 3076 reply => undef,
2762 id => "infobox", 3092 id => "infobox",
2763 title => "Body Parts", 3093 title => "Body Parts",
2764 reply => undef, 3094 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available", 3095 tooltip => "Shows which body parts you posess and are available",
2766 }, 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 },
2767 "c/uptime" => { 3133 "c/uptime" => {
2768 id => "infobox", 3134 id => "infobox",
2769 title => "Uptime", 3135 title => "Uptime",
2770 reply => undef, 3136 reply => undef,
2771 tooltip => "How long the server has been running since last restart", 3137 tooltip => "How long the server has been running since last restart",
2780 id => "party", 3146 id => "party",
2781 title => "Party", 3147 title => "Party",
2782 reply => "gsay ", 3148 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party", 3149 tooltip => "Messages and chat related to your party",
2784 }, 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,
2785); 3159);
2786 3160
2787sub cf::client::send_msg { 3161sub cf::client::send_msg {
2788 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2789 3163
2790 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2791 3166
2792 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793 3168
2794 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2797 3172
2798 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2802 3175
2803 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2808 if $self->can_msg;
2809 } 3181 }
2810 3182
2811 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2812 } 3184 }
2813 3185
2814 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2815 3187
2816 if ($self->can_msg) {
2817 # default colour, mask it out 3188 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2820 3191
2821 my $pkt = "msg " 3192 my $pkt = "msg "
2822 . $self->{json_coder}->encode ( 3193 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 ); 3195 );
2825 3196
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt); 3197 $self->send_big_packet ($pkt);
2837 } else {
2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2856 } else {
2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2858 $self->send_packet ("drawinfo $color $msg")
2859 }
2860 }
2861 }
2862} 3198}
2863 3199
2864=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2865 3201
2866Sends an ext event to the client. 3202Sends an ext event to the client.
2869 3205
2870sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2871 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2872 3208
2873 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2875 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2876 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 } 3214 }
2879} 3215}
2880 3216
2881=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2882 3218
2886 3222
2887sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2889 3225
2890 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove 3229 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2896 } 3232 }
2897} 3233}
2898 3234
2899=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2900 3236
2971 3307
2972 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
2973 if $reply; 3309 if $reply;
2974 3310
2975 } else { 3311 } else {
2976 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";
2977 } 3313 }
2978 3314
2979 cf::override; 3315 cf::override;
2980 }, 3316 },
2981); 3317);
3001 3337
3002 $coro 3338 $coro
3003} 3339}
3004 3340
3005cf::client->attach ( 3341cf::client->attach (
3006 on_destroy => sub { 3342 on_client_destroy => sub {
3007 my ($ns) = @_; 3343 my ($ns) = @_;
3008 3344
3009 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3010 }, 3346 },
3011); 3347);
3027our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
3028 3364
3029$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
3030 3366
3031$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
3033 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
3034 sort time 3370 sort time
3035)); 3371));
3036 3372
3037# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
3041The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
3042 3378
3043 cf::object 3379 cf::object
3044 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
3045 insert remove name archname title slaying race decrease split 3381 insert remove name archname title slaying race decrease split
3382 value
3046 3383
3047 cf::object::player 3384 cf::object::player
3048 player 3385 player
3049 3386
3050 cf::player 3387 cf::player
3056=cut 3393=cut
3057 3394
3058for ( 3395for (
3059 ["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
3060 insert remove inv nrof name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3062 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3063 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
3064 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3065) { 3402) {
3066 no strict 'refs';
3067 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3068 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3069 for @funs; 3405 for @funs;
3070} 3406}
3071 3407
3086 3422
3087 my $qcode = $code; 3423 my $qcode = $code;
3088 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3089 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
3090 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
3091 local $_; 3430 local $_;
3092 local @safe::cf::_safe_eval_args = values %vars;
3093 3431
3094 my $eval = 3432 my $eval =
3095 "do {\n" 3433 "do {\n"
3096 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3097 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
3098 . $code 3436 . $code
3099 . "\n}" 3437 . "\n}"
3100 ; 3438 ;
3101 3439
3440 if ($CFG{safe_eval}) {
3102 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3103 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3104 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 }
3105 3449
3106 if ($@) { 3450 if ($@) {
3107 warn "$@"; 3451 warn "$@",
3108 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3109 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3110 } 3454 }
3111 3455
3112 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3113} 3457}
3114 3458
3128=cut 3472=cut
3129 3473
3130sub register_script_function { 3474sub register_script_function {
3131 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3132 3476
3133 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3134 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3135} 3479}
3136 3480
3137=back 3481=back
3138 3482
3139=cut 3483=cut
3148 # for this (global event?) 3492 # for this (global event?)
3149 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3150 3494
3151 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3152 3496
3153 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3154 3498
3155 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3156 0 < aio_load $path, $facedata
3157 or die "$path: $!";
3158
3159 $facedata = Coro::Storable::thaw $facedata;
3160 3500
3161 $facedata->{version} == 2 3501 $facedata->{version} == 2
3162 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3163 3503
3164 # 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]);
3165 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC, 3507 type => FT_RSRC,
3167 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),
3168 }; 3510 };
3169 cf::cede_to_tick; 3511 cf::cede_to_tick;
3170 3512
3171 { 3513 {
3172 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3174 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3175 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176 3518
3177 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3178 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3180 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} ;
3181 3524
3182 cf::cede_to_tick; 3525 cf::cede_to_tick;
3183 } 3526 }
3184 3527
3185 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3190 3533
3191 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3192 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3194 } else { 3537 } else {
3195 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3196 } 3539 }
3197 3540
3198 cf::cede_to_tick; 3541 cf::cede_to_tick;
3199 } 3542 }
3200 } 3543 }
3209 3552
3210 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3211 } 3554 }
3212 3555
3213 { 3556 {
3214 # TODO: for gcfclient pleasure, we should give resources
3215 # that gcfclient doesn't grok a >10000 face index.
3216 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3217 3558
3218 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) { 3560 if (defined $info->{type}) {
3220 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
3222 3562
3223 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3224 # prepend meta info
3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3238 } else { 3565 } else {
3239 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3240 } 3567 }
3241 3568
3242 cf::cede_to_tick; 3569 cf::cede_to_tick;
3243 } 3570 }
3244 } 3571 }
3245 3572
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3247 3574
3248 1 3575 1
3249} 3576}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3270 3577
3271register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3272 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3273 3580
3274 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3313sub reload_treasures { 3620sub reload_treasures {
3314 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3315 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3316} 3623}
3317 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
3318sub reload_resources { 3645sub reload_resources {
3319 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3320 3647
3648 reload_exp_table;
3649 reload_materials;
3321 reload_facedata; 3650 reload_facedata;
3651 reload_sound;
3322 reload_archetypes; 3652 reload_archetypes;
3323 reload_regions; 3653 reload_regions;
3324 reload_treasures; 3654 reload_treasures;
3325 3655
3326 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3327}
3328
3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3334 reload_resources;
3335} 3657}
3336 3658
3337sub reload_config { 3659sub reload_config {
3338 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3339 or return;
3340 3661
3341 local $/; 3662 my $config = load_file "$CONFDIR/config";
3342 *CFG = YAML::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3343 3665
3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3345 3667
3346 $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};
3347 $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};
3348 3670
3349 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3353 }; 3675 };
3354 warn $@ if $@; 3676 warn $@ if $@;
3355 } 3677 }
3356} 3678}
3357 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
3358sub 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
3359 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3360 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3361 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#
3362 (async { 3721 (async {
3363 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT; 3723 EV::loop EV::LOOP_ONESHOT;
3365 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3366 }; 3725 };
3367 3726
3368 { 3727 evthread_start IO::AIO::poll_fileno;
3369 my $guard = freeze_mainloop; 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;
3370 reload_config; 3739 reload_config;
3371 db_init; 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
3372 load_extensions; 3750 load_extensions;
3373 3751
3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 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;
3375 } 3759 };
3376 3760
3377 EV::loop; 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;
3378} 3770}
3379 3771
3380############################################################################# 3772#############################################################################
3381# initialisation and cleanup 3773# initialisation and cleanup
3382 3774
3383# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3384BEGIN { 3776BEGIN {
3385 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3386 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3387 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3388 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3389 }; 3781 };
3390 } 3782 }
3391} 3783}
3392 3784
3393sub write_runtime_sync { 3785sub write_runtime_sync {
3394 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
3395 3787
3396 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3397 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3398 3790
3399 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400 3792
3401 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3402 3794
3403 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3404 or return; 3796 or return;
3405 3797
3406 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3407 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3408 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3418 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
3419 3811
3420 close $fh 3812 close $fh
3421 or return; 3813 or return;
3422 3814
3423 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424 and return; 3816 and return;
3425 3817
3426 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3427 3819
3428 1 3820 1
3429} 3821}
3430 3822
3431our $uuid_lock; 3823our $uuid_lock;
3440 my $uuid = "$LOCALDIR/uuid"; 3832 my $uuid = "$LOCALDIR/uuid";
3441 3833
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return; 3835 or return;
3444 3836
3445 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;
3446 $uuid_skip = 0; 3845 $uuid_skip = 0;
3447 3846
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return; 3848 and return;
3450 3849
3456 or return; 3855 or return;
3457 3856
3458 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3459 and return; 3858 and return;
3460 3859
3461 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3462 3861
3463 1 3862 1
3464 3863
3465} 3864}
3466 3865
3472} 3871}
3473 3872
3474sub emergency_save() { 3873sub emergency_save() {
3475 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3476 3875
3477 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;
3478 3882
3479 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3480 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3481 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3482 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3483 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3484 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3485 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3486 $pl->valid or next; 3892 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488 $pl->save; 3894 $pl->save;
3489 } 3895 }
3490 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3491 3897
3492 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";
3493 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3494 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3495 $map->valid or next; 3903 $map->valid or next;
3496 $map->save; 3904 $map->save;
3497 } 3905 }
3498 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3499 3907
3500 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";
3501 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3502 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3503 3913
3504 warn "begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3505 write_uuid_sync 1; 3915 write_uuid_sync 1;
3506 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
3507 }; 3936 };
3508 3937
3509 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3510} 3939}
3511 3940
3512sub post_cleanup { 3941sub post_cleanup {
3513 my ($make_core) = @_; 3942 my ($make_core) = @_;
3514 3943
3944 IO::AIO::flush;
3945
3515 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3516 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3517} 3951}
3518 3952
3519# a safer delete_package, copied from Symbol 3953# a safer delete_package, copied from Symbol
3520sub clear_package($) { 3954sub clear_package($) {
3521 my $pkg = shift; 3955 my $pkg = shift;
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) { 3972 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"}; 3973 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 } 3975 }
3542 warn "cleared package #$pkg\n";#d#
3543} 3976}
3544
3545our $RELOAD; # how many times to reload
3546 3977
3547sub do_reload_perl() { 3978sub do_reload_perl() {
3548 # can/must only be called in main 3979 # can/must only be called in main
3549 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3550 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3551 return; 3982 return;
3552 } 3983 }
3553 3984
3554 return if $RELOAD++; 3985 return if $RELOAD++;
3555 3986
3987 my $t1 = AE::time;
3988
3556 while ($RELOAD) { 3989 while ($RELOAD) {
3557 warn "reloading..."; 3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3558 3992
3559 warn "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3560 3994
3561 cf::sync_job { 3995 cf::sync_job {
3562 cf::write_runtime_sync; # external watchdog should not bark
3563 cf::emergency_save; 3996 #cf::emergency_save;
3564 cf::write_runtime_sync; # external watchdog should not bark
3565 3997
3566 warn "syncing database to disk";
3567 BDB::db_env_txn_checkpoint $DB_ENV;
3568
3569 # if anything goes wrong in here, we should simply crash as we already saved
3570
3571 warn "flushing outstanding aio requests";
3572 while (IO::AIO::nreqs || BDB::nreqs) {
3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3577 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3578 %EXT_CORO = (); 4000 %EXT_CORO = ();
3579 4001
3580 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3581 %COMMAND = (); 4003 %COMMAND = ();
3582 4004
3583 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3584 %EXTCMD = (); 4006 %EXTCMD = ();
3585 %EXTICMD = (); 4007 %EXTICMD = ();
3586 4008
3587 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3588 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3589 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3590 4012
3591 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3592 eval { 4014 eval {
3593 $cb->($pkg); 4015 $cb->($pkg);
3594 1 4016 1
3595 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
3596 } 4018 }
3597 4019
3598 warn "... clearing $pkg"; 4020 trace "... clearing $pkg";
3599 clear_package $pkg; 4021 clear_package $pkg;
3600 } 4022 }
3601 4023
3602 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605 4027
3606 warn "... unloading $k"; 4028 trace "... unloading $k";
3607 delete $INC{$k}; 4029 delete $INC{$k};
3608 4030
3609 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3611 4033
3614 } 4036 }
3615 4037
3616 clear_package $k; 4038 clear_package $k;
3617 } 4039 }
3618 4040
3619 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3620 clear_package "safe::$_" 4042 clear_package "safe::$_"
3621 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);
3622 4044
3623 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3624 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3625 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626 4048
3627 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3628 # and global variables created in xs 4050 # and global variables created in xs
3629 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3630 4052
3631 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3632 4054
3633 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3634 require cf; 4056 require cf;
3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3636 4058
3637 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3638 cf::reload_config; 4060 cf::reload_config;
3639 4061
3640 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3641 cf::load_extensions; 4063 cf::load_extensions;
3642 4064
4065 if ($REATTACH_ON_RELOAD) {
3643 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3644 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3645 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3646 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3647 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3648 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3649 4073
3650 warn "leaving sync_job"; 4074 cf::_post_init 1;
4075
4076 trace "perl_reload: leaving sync_job";
3651 4077
3652 1 4078 1
3653 } or do { 4079 } or do {
3654 warn $@; 4080 error $@;
3655 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3656 }; 4082 };
3657 4083
3658 warn "reloaded";
3659 --$RELOAD; 4084 --$RELOAD;
3660 } 4085 }
4086
4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3661}; 4089};
3662 4090
3663our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3664 4092
3665sub reload_perl() { 4093sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3668 4096
4097 $RELOAD_WATCHER ||= cf::async {
4098 Coro::AIO::aio_wait cache_extensions;
4099
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4101 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
4103 };
3672 }; 4104 };
3673} 4105}
3674 4106
3675register_command "reload" => sub { 4107register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3682 reload_perl; 4114 reload_perl;
3683 }; 4115 };
3684 } 4116 }
3685}; 4117};
3686 4118
3687unshift @INC, $LIBDIR; 4119#############################################################################
3688 4120
3689my $bug_warning = 0; 4121my $bug_warning = 0;
3690 4122
3691our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN;
3693
3694sub wait_for_tick { 4123sub wait_for_tick() {
3695 return if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3696 4125
3697 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3698 push @WAIT_FOR_TICK, $signal;
3699 $signal->wait;
3700} 4127}
3701 4128
3702sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3703 return if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3704 4131
3705 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3706 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3707 $signal->wait; 4134 $signal->wait;
3708} 4135}
3712 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"
3713 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3714 return; 4141 return;
3715 } 4142 }
3716 4143
3717 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#
3718 4147
3719 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3720 $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.;
3721 Coro::async_pool { 4150 Coro::async_pool {
3722 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3723 write_runtime_sync 4152 write_runtime_sync
3724 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3725 }; 4154 };
3726 } 4155 }
3727 4156
3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3729 $sig->send; 4158 $sig->send;
3730 } 4159 }
3731 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3732 $sig->send;
3733 }
3734 4161
3735 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3737 4164
3738 if (0) { 4165 if (0) {
3739 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3740 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3743 } 4170 }
3744 } 4171 }
3745} 4172}
3746 4173
3747{ 4174{
3748 # configure BDB 4175 # configure BDB
3749 4176
3750 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3751 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3752 $AnyEvent::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3753 4180
3754 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3755 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3792 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3793 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3794 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
3795} 4222}
3796 4223
3797my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3798 4226
3799sub _log_backtrace { 4227sub _log_backtrace {
3800 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3801 4229
3802 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3803 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3804 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3805 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3806 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3807 async { 4240 async {
3808 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3809 4242
3810 my @bt = fork_call { 4243 my @bt = fork_call {
3811 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3822 } 4255 }
3823 4256
3824 @funcs 4257 @funcs
3825 }; 4258 };
3826 4259
3827 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3829 --$_log_backtrace; 4263 --$_log_backtrace;
3830 }; 4264 };
3831 } else { 4265 } else {
3832 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3833 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3834 } 4268 }
3835} 4269}
3836 4270
3837# load additional modules 4271# load additional modules
3838use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3839 4274
3840END { cf::emergency_save } 4275END { cf::emergency_save }
3841 4276
38421 42771
3843 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines