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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines