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.378 by root, Thu Oct 4 11:36:54 2007 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 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;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
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 $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
83 125
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 129our $DB_ENV;
89 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
90our %CFG; 133our %CFG;
91 134
92our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 136our $RUNTIME;
137our $NOW;
94 138
95our (%PLAYER, %PLAYER_LOADING); # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 140our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
98 142
99# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 145
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
105 155
106binmode STDOUT; 156binmode STDOUT;
107binmode STDERR; 157binmode STDERR;
108 158
109# read virtual server time, if available 159# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
114} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
115 167
116mkdir $_ 168mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 170
119our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
120 172
121sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 189
123############################################################################# 190#############################################################################
124 191
125=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
126 193
162 229
163The raw value load value from the last tick. 230The raw value load value from the last tick.
164 231
165=item %cf::CFG 232=item %cf::CFG
166 233
167Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 235from wherever your confdir points to.
169 236
170=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
171 238
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These 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 240returns 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. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
176=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
177 249
178This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 252that call.
181 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
182=back 260=back
183 261
184=cut 262=cut
185 263
186BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 271 my $msg = join "", @_;
189 272
190 $msg .= "\n" 273 $msg .= "\n"
191 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
192 275
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 277
195 LOG llevError, $msg; 278 LOG llevWarn, $msg;
196 }; 279};
197} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
198 294
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 305for my $pkg (qw(
210 cf::global cf::attachable 306 cf::global cf::attachable
211 cf::object cf::object::player 307 cf::object cf::object::player
212 cf::client cf::player 308 cf::client cf::player
213 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
214 cf::map cf::party cf::region 311 cf::party cf::region
215)) { 312)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 314}
219 315
220$Event::DIED = sub { 316$EV::DIED = sub {
221 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
222}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
223 324
224############################################################################# 325#############################################################################
225 326
226=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
227 328
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 350 $d
250 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
251} 352}
252 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
253=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
254 369
255Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
256 371
257=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
258 373
259Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
260 375
261=cut 376=cut
262 377
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 379
265sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
267 444
268=item cf::lock_wait $string 445=item cf::lock_wait $string
269 446
270Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
271 448
272=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
273 450
274Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
277returned. 454returned.
278 455
279Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 457deadlocked coro.
286 463
287Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
288 465
289=cut 466=cut
290 467
291our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 469
294sub lock_wait($) { 470sub lock_wait($) {
295 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 472}
308 473
309sub lock_acquire($) { 474sub lock_acquire($) {
310 my ($key) = @_; 475 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 476}
324 477
325sub lock_active($) { 478sub lock_active($) {
326 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 480}
330 481
331sub freeze_mainloop { 482sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
333 484
334 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 486}
336 }; 487
337 $TICK_WATCHER->stop; 488=item cf::periodic $interval, $cb
338 $guard 489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
339} 501}
340 502
341=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
342 504
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
344This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
345of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
346 512
347The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
349 515
350Useful for short background jobs. 516Useful for short background jobs.
351 517
352=cut 518=cut
353 519
354our @SLOT_QUEUE; 520our @SLOT_QUEUE;
355our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
356 523
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
360 527
361 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
362 530
363 while () { 531 while () {
364 next_job: 532 next_job:
533
365 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 535
367 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 540 $job->[2]->send;
371 Coro::cede; 541 Coro::cede;
372 goto next_job; 542 goto next_job;
373 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 545 }
375 } 546 }
376 547
377 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 551 $signal->wait;
381 } else { 552 } else {
553 $busy = 0;
382 Coro::schedule; 554 Coro::schedule;
383 } 555 }
384 } 556 }
385}; 557};
386 558
387sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
388 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
389 563
390 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
391 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
392 567
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
406 581
407BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
408 583
409=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
410 585
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 589acceptable.
415 590
416If it must be done, put the blocking parts into C<sync_job>. This will run 591If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
421=cut 596=cut
422 597
423sub sync_job(&) { 598sub sync_job(&) {
424 my ($job) = @_; 599 my ($job) = @_;
425 600
426 if ($Coro::current == $Coro::main) { 601 if (in_main) {
427 my $time = Event::time; 602 my $time = AE::time;
428 603
429 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
431 606
432 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 608
434 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
435 610
436 my $busy = 1; 611 my $busy = 1;
437 my @res; 612 my @res;
438 613
439 (async { 614 (async {
440 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
441 @res = eval { $job->() }; 616 @res = eval { $job->() };
442 warn $@ if $@; 617 error $@ if $@;
443 undef $busy; 618 undef $busy;
444 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
445 620
446 while ($busy) { 621 while ($busy) {
447 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
448 } 626 }
627 }
449 628
450 $time = Event::time - $time; 629 my $time = AE::time - $time;
451 630
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
456 632
457 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
458 } else { 634 } else {
459 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
460 636
480 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
481 657
482 $coro 658 $coro
483} 659}
484 660
485=item fork_call { }, $args 661=item fork_call { }, @args
486 662
487Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
491 667
492=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
493 673
494sub fork_call(&@) { 674sub fork_call(&@) {
495 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
496 676
497 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
498 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
500 680
501 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
502 reset_signals; 682 cf::post_fork;
503 &$cb 683 &$cb
504 }, @args; 684 } @args;
505 685
506 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
507} 725}
508 726
509=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
510 728
511Returns a single value from the environment database. 729Returns a single value from the environment database.
521within each server. 739within each server.
522 740
523=cut 741=cut
524 742
525sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
526 my ($name) = @_; 747 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
528 749
529 eval { 750 eval {
530 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
540} 761}
541 762
542our $DB; 763our $DB;
543 764
544sub db_init { 765sub db_init {
545 cf::sync_job {
546 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
547 };
548} 767}
549 768
550sub db_get($$) { 769sub db_get($$) {
551 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
552 771
553 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
554 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
555 776
556 $! ? () 777 $! ? ()
557 : $data 778 : $data
558 }
559} 779}
560 780
561sub db_put($$$) { 781sub db_put($$$) {
562 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
563 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
591 811
592 my @data; 812 my @data;
593 my $md5; 813 my $md5;
594 814
595 for (0 .. $#$src) { 815 for (0 .. $#$src) {
596 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
597 or Carp::croak "$src->[$_]: $!";
598 } 817 }
599 818
600 # if processing is expensive, check 819 # if processing is expensive, check
601 # checksum first 820 # checksum first
602 if (1) { 821 if (1) {
619 838
620 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
621 my $data = $process->(\@data); 840 my $data = $process->(\@data);
622 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
623 842
624 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
625 844
626 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
627 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
628 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
629 848
639 858
640=cut 859=cut
641 860
642sub datalog($@) { 861sub datalog($@) {
643 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
644 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
645} 864}
646 865
647=back 866=back
648 867
649=cut 868=cut
650 869
651############################################################################# 870#############################################################################
652 871
653=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
654 873
655Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
656attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
658 877
659In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 880Deliantra).
662 881
663=over 4 882=over 4
664 883
665=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
666 885
710=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
711 930
712Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
714 933
715Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
716that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
717 936
718These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
719 938
720=over 4 939=over 4
844 1063
845 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
846 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
847 1066
848 } elsif (ref $type) { 1067 } elsif (ref $type) {
849 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
850 1069
851 } else { 1070 } else {
852 shift @arg; 1071 shift @arg;
853 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
854 } 1073 }
855 } 1074 }
856} 1075}
857 1076
858sub _object_attach { 1077sub _object_attach {
868 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
869 } 1088 }
870 1089
871 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
872 } else { 1091 } else {
873 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
874 } 1093 }
875 1094
876 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
877} 1096}
878 1097
937 1156
938 for (@$callbacks) { 1157 for (@$callbacks) {
939 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
940 1159
941 if ($@) { 1160 if ($@) {
942 warn "$@";
943 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
944 override; 1162 override;
945 } 1163 }
946 1164
947 return 1 if $override; 1165 return 1 if $override;
948 } 1166 }
949 1167
950 0 1168 0
951} 1169}
952 1170
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1172
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1174
957Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
958 1176
964 1182
965=cut 1183=cut
966 1184
967############################################################################# 1185#############################################################################
968# object support 1186# object support
969#
970 1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
971sub _can_merge { 1221sub _can_merge {
972 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
973 1223
974 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1225
978 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
979} 1228}
980 1229
981sub reattach { 1230sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1232 my ($obj) = @_;
984 1233
1234 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1236
987 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
988 1238
989 @$registry = (); 1239 @$registry = ();
990 1240
995 for (@$attach) { 1245 for (@$attach) {
996 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
997 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
998 } 1248 }
999 } else { 1249 } else {
1000 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1001 } 1251 }
1002 } 1252 }
1003} 1253}
1004 1254
1005cf::attachable->attach ( 1255cf::attachable->attach (
1006 prio => -1000000, 1256 prio => -1000000,
1007 on_instantiate => sub { 1257 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1009 1259
1010 $data = from_json $data; 1260 $data = decode_json $data;
1011 1261
1012 for (@$data) { 1262 for (@$data) {
1013 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1014 1264
1015 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1032 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1033 1283
1034 sync_job { 1284 sync_job {
1035 if (length $$rdata) { 1285 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1039 1290
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1044 close $fh; 1298 aio_close $fh;
1045 1299
1046 if (@$objs) { 1300 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1052 close $fh; 1309 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1311 }
1055 } else { 1312 } else {
1056 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1057 } 1314 }
1058 1315
1059 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1320 } else {
1061 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1062 } 1322 }
1063 } else { 1323 } else {
1064 aio_unlink $filename; 1324 aio_unlink $filename;
1065 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1066 } 1326 }
1085 1345
1086 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1348 or return;
1089 1349
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1091 } 1352 }
1092 1353
1093 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1096 1358
1097 ($data, $av) 1359 ($data, $av)
1098} 1360}
1099 1361
1100=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1156 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1157 1419
1158 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1159} 1421}
1160 1422
1423use File::Glob ();
1424
1161cf::player->attach ( 1425cf::player->attach (
1162 on_command => sub { 1426 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1164 1428
1165 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1166 or return; 1430 or return;
1167 1431
1190 1454
1191 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1192 if $reply; 1456 if $reply;
1193 1457
1194 } else { 1458 } else {
1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1196 } 1460 }
1197 1461
1198 cf::override; 1462 cf::override;
1199 }, 1463 },
1200); 1464);
1201 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1202sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1203 cf::sync_job { 1482 cf::sync_job {
1204 my %todo; 1483 my %todo;
1205 1484
1206 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1207 next unless -r $path; 1486 next unless -r $path;
1225 1504
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1507
1229 $ext{source} = 1508 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1231 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1232 . $source 1511 . $source
1233 . "\n};\n1"; 1512 . "\n};\n1";
1234 1513
1235 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1236 } 1515 }
1237 1516
1517 my $pass = 0;
1238 my %done; 1518 my %done;
1239 while (%todo) { 1519 while (%todo) {
1240 my $progress; 1520 my $progress;
1241 1521
1522 ++$pass;
1523
1524 ext:
1242 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip 1527 next ext
1245 unless exists $done{$_}; 1528 unless exists $done{$_};
1246 } 1529 }
1247 1530
1248 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1249 1532
1250 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1251 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1252 : "$v->{base}: extension inactive.\n";
1253 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1254 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1255 warn $msg; 1540
1256 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1257 exit 1; 1542 delete $todo{$k};
1258 } 1543 } else {
1259 1544 $done{$k} = delete $todo{$k};
1260 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1261 } 1550 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
1266 } 1551 }
1267 1552
1268 skip: 1553 unless ($progress) {
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1270 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1271 } 1563 }
1272 }; 1564 };
1273} 1565}
1274 1566
1275############################################################################# 1567#############################################################################
1276 1568
1277=back 1569=back
1278 1570
1279=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1280 1572
1281Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1282 1574
1283=cut 1575=cut
1284 1576
1285package cf::player; 1577package cf::player;
1286 1578
1329 1621
1330sub exists($) { 1622sub exists($) {
1331 my ($login) = @_; 1623 my ($login) = @_;
1332 1624
1333 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1335} 1627}
1336 1628
1337sub find($) { 1629sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1631 my $login = $_[0];
1351 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1644 or return;
1353 1645
1354 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1355 or return; 1647 or return;
1648
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1359 } 1652 }
1360 } 1653 }
1361} 1654}
1362 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1363sub save($) { 1669sub save($) {
1364 my ($pl) = @_; 1670 my ($pl) = @_;
1365 1671
1366 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1367 1673
1370 1676
1371 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1372 1678
1373 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1375 1686
1376 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1688 cf::cede_to_tick;
1378} 1689}
1379 1690
1411 my ($pl) = @_; 1722 my ($pl) = @_;
1412 1723
1413 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1414 1725
1415 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1728
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1419 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1421 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1422 1737
1423 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1425 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1463 1778
1464 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1465 my $path = path $login; 1780 my $path = path $login;
1466 1781
1467 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1788 }
1473 1789
1477 1793
1478 \@logins 1794 \@logins
1479} 1795}
1480 1796
1481=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1482 1800
1483Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1484player. May block. 1802player. May block.
1485 1803
1486=cut 1804=cut
1504 } 1822 }
1505 1823
1506 \@paths 1824 \@paths
1507} 1825}
1508 1826
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1828
1511Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1830
1560=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1561 1832
1562Sends an ext reply to the player. 1833Sends an ext reply to the player.
1563 1834
1595 1866
1596=cut 1867=cut
1597 1868
1598sub find_by_path($) { 1869sub find_by_path($) {
1599 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1600 1873
1601 my ($match, $specificity); 1874 my ($match, $specificity);
1602 1875
1603 for my $region (list) { 1876 for my $region (list) {
1604 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1630our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1632 1905
1633sub generate_random_map { 1906sub generate_random_map {
1634 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1635 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1636 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1640 $rmp->{exit_on_final_map},
1641 $rmp->{xsize}, $rmp->{ysize},
1642 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1643 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1644 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1645 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1646 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1647 (cf::region::find $rmp->{region}), $rmp->{custom}
1648 )
1649} 1912}
1650 1913
1651=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1652 1915
1653Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1658 1921
1659sub register { 1922sub register {
1660 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1661 my $pkg = caller; 1924 my $pkg = caller;
1662 1925
1663 no strict;
1664 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1665 1927
1666 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1667} 1929}
1668 1930
1669# also paths starting with '/' 1931# also paths starting with '/'
1670$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1671 1933
1672sub thawer_merge { 1934sub thawer_merge {
1673 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1674 1936
1675 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1680} 1942}
1681 1943
1682sub normalise { 1944sub normalise {
1683 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1684 1946
1685 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1686 1948
1687 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1688 1950
1689 # map plan: 1951 # map plan:
1690 # 1952 #
1692 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1693 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1694 # ?random/... random maps 1956 # ?random/... random maps
1695 # /... normal maps 1957 # /... normal maps
1696 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1697 1960
1698 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1699 1962
1700 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1701 # something that looks reasonable 1964 # something that looks reasonable
1702 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1703 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1704 1967
1705 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1706 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1707 } 1984 }
1708 1985
1709 for ($path) { 1986 for ($path) {
1710 redo if s{//}{/};
1711 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1712 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1713 } 1989 }
1714 1990
1715 $path 1991 $path
1729 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1730 return $self; 2006 return $self;
1731 } 2007 }
1732 } 2008 }
1733 2009
1734 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1735 () 2011 ()
1736} 2012}
1737 2013
2014# may re-bless or do other evil things
1738sub init { 2015sub init {
1739 my ($self) = @_; 2016 my ($self) = @_;
1740 2017
1741 $self 2018 $self
1742} 2019}
1761 2038
1762# the temporary/swap location 2039# the temporary/swap location
1763sub save_path { 2040sub save_path {
1764 my ($self) = @_; 2041 my ($self) = @_;
1765 2042
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1768} 2045}
1769 2046
1770# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1771sub uniq_path { 2048sub uniq_path {
1772 my ($self) = @_; 2049 my ($self) = @_;
1773 2050
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1776}
1777
1778# and all this just because we cannot iterate over
1779# all maps in C++...
1780sub change_all_map_light {
1781 my ($change) = @_;
1782
1783 $_->change_map_light ($change)
1784 for grep $_->outdoor, values %cf::MAP;
1785} 2053}
1786 2054
1787sub decay_objects { 2055sub decay_objects {
1788 my ($self) = @_; 2056 my ($self) = @_;
1789 2057
1871 2139
1872sub find; 2140sub find;
1873sub find { 2141sub find {
1874 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1875 2143
2144 cf::cede_to_tick;
2145
1876 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1877 2147
1878 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1880 2150
1881 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1885 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
1886 or return; 2153 or return;
1887 2154
1888 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1889 2156
1891 or return; 2158 or return;
1892 2159
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
1896 undef $guard1; 2164 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2165 $map->reset;
1899 return find $path; 2166 return find $path;
1900 } 2167 }
1901 2168
1902 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1903 } 2170 }
1904} 2171}
1905 2172
1906sub pre_load { } 2173sub pre_load { }
1907sub post_load { } 2174#sub post_load { } # XS
1908 2175
1909sub load { 2176sub load {
1910 my ($self) = @_; 2177 my ($self) = @_;
1911 2178
1912 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
1924 $self->alloc; 2191 $self->alloc;
1925 2192
1926 $self->pre_load; 2193 $self->pre_load;
1927 cf::cede_to_tick; 2194 cf::cede_to_tick;
1928 2195
2196 if (exists $self->{load_path}) {
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2198 $f->skip_block;
1931 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
1932 or return; 2200 or return;
1933 2201
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
1935 if delete $self->{load_original}; 2203 if delete $self->{load_original};
1936 2204
1937 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2206 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
1941 $self->clear_unique_items; 2209 $self->clear_unique_items;
1942 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
1944 } 2213 }
1945 } 2214 }
1946 }
1947 2215
1948 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
1949 2218
1950 cf::cede_to_tick; 2219 cf::cede_to_tick;
1951 # now do the right thing for maps 2220 # now do the right thing for maps
1952 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
1953 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
1957 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
1958 $self->decay_objects; 2227 $self->decay_objects;
1959 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
1960 $self->update_buttons; 2229 $self->update_buttons;
1961 cf::cede_to_tick; 2230 cf::cede_to_tick;
1962 $self->set_darkness_map;
1963 cf::cede_to_tick;
1964 $self->activate; 2231 $self->activate;
1965 } 2232 }
1966 2233
1967 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
1969 2236
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2238 }
1972 2239
1973 $self->post_load; 2240 $self->post_load;
1974}
1975 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
1976sub customise_for { 2248sub customise_for {
1977 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
1978 2250
1979 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
1980 if $self->per_player; 2252 if $self->per_player;
1996 or next; 2268 or next;
1997 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
1998 or next; 2270 or next;
1999 $neigh->load; 2271 $neigh->load;
2000 2272
2273 # now find the diagonal neighbours
2001 push @neigh, 2274 push @neigh,
2002 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2003 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2004 } 2277 }
2005 2278
2012} 2285}
2013 2286
2014sub find_sync { 2287sub find_sync {
2015 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2016 2289
2017 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2018} 2294}
2019 2295
2020sub do_load_sync { 2296sub do_load_sync {
2021 my ($map) = @_; 2297 my ($map) = @_;
2022 2298
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2025 2301
2026 cf::sync_job { $map->load }; 2302 $map->load;
2027} 2303}
2028 2304
2029our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2030our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2031 2307
2032sub find_async { 2308sub find_async {
2033 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2034 2310
2035 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2036 2312
2037 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2315 }
2040 2316
2041 $MAP_PREFETCH{$path} |= $load; 2317 $MAP_PREFETCH{$path} |= $load;
2042 2318
2043 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
2057 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2058 2334
2059 () 2335 ()
2060} 2336}
2061 2337
2338# common code, used by both ->save and ->swapout
2062sub save { 2339sub _save {
2063 my ($self) = @_; 2340 my ($self) = @_;
2064
2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2066 2341
2067 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2068 2343
2069 return unless $self->dirty; 2344 return unless $self->dirty;
2070 2345
2079 2354
2080 cf::async { 2355 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2356 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2083 }; 2358 };
2359
2360 cf::get_slot 0.02;
2084 2361
2085 if ($uniq) { 2362 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2365 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2090 } 2367 }
2091} 2368}
2092 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2093sub swap_out { 2378sub swap_out {
2094 my ($self) = @_; 2379 my ($self) = @_;
2095 2380
2096 # save first because save cedes
2097 $self->save;
2098
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2101 return if $self->players; 2385 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2103 return if $self->{deny_save};
2104 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2105 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2106 2437
2107 $self->deactivate; 2438 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2440 $self->clear;
2110}
2111
2112sub reset_at {
2113 my ($self) = @_;
2114
2115 # TODO: safety, remove and allow resettable per-player maps
2116 return 1e99 if $self->{deny_reset};
2117
2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2120
2121 $time + $to
2122}
2123
2124sub should_reset {
2125 my ($self) = @_;
2126
2127 $self->reset_at <= $cf::RUNTIME
2128}
2129
2130sub reset {
2131 my ($self) = @_;
2132
2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
2134
2135 return if $self->players;
2136
2137 warn "resetting map ", $self->path;
2138
2139 $self->in_memory (cf::MAP_SWAPPED);
2140
2141 # need to save uniques path
2142 unless ($self->{deny_save}) {
2143 my $uniq = $self->uniq_path; utf8::encode $uniq;
2144
2145 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2146 if $uniq;
2147 }
2148
2149 delete $cf::MAP{$self->path};
2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2153 $self->clear;
2154 2441
2155 $self->unlink_save; 2442 $self->unlink_save;
2156 $self->destroy; 2443 $self->destroy;
2157} 2444}
2158 2445
2166 2453
2167 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2168 2455
2169 $self->unlink_save; 2456 $self->unlink_save;
2170 2457
2171 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2172 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2173 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2174 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2176 2463
2225 2512
2226sub unique_maps() { 2513sub unique_maps() {
2227 [ 2514 [
2228 map { 2515 map {
2229 utf8::decode $_; 2516 utf8::decode $_;
2230 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2231 ? normalise $_ 2520 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2522 ]
2235} 2523}
2236 2524
2237package cf; 2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2238 2556
2239=back 2557=back
2240 2558
2241=head3 cf::object 2559=head3 cf::object
2242 2560
2246 2564
2247=over 4 2565=over 4
2248 2566
2249=item $ob->inv_recursive 2567=item $ob->inv_recursive
2250 2568
2251Returns the inventory of the object _and_ their inventories, recursively. 2569Returns the inventory of the object I<and> their inventories, recursively,
2570but I<not> the object itself.
2252 2571
2253=cut 2572=cut
2254 2573
2255sub inv_recursive_; 2574sub inv_recursive_;
2256sub inv_recursive_ { 2575sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2262} 2581}
2263 2582
2264=item $ref = $ob->ref 2583=item $ref = $ob->ref
2265 2584
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2585Creates and returns a persistent reference to an object that can be stored as a string.
2267 2586
2268=item $ob = cf::object::deref ($refstring) 2587=item $ob = cf::object::deref ($refstring)
2269 2588
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2590even if the object actually exists. May block.
2303can be C<undef>. Does the right thing when the player is currently in a 2622can be C<undef>. Does the right thing when the player is currently in a
2304dialogue with the given NPC character. 2623dialogue with the given NPC character.
2305 2624
2306=cut 2625=cut
2307 2626
2627our $SAY_CHANNEL = {
2628 id => "say",
2629 title => "Map",
2630 reply => "say ",
2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2632};
2633
2634our $CHAT_CHANNEL = {
2635 id => "chat",
2636 title => "Chat",
2637 reply => "chat ",
2638 tooltip => "Player chat and shouts, global to the server.",
2639};
2640
2308# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2309# with dialog boxes. 2642# with dialog boxes.
2310#TODO: the first argument must go, split into a $npc->reply_to ( method 2643#TODO: the first argument must go, split into a $npc->reply_to ( method
2311sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2312 my ($self, $npc, $msg, $flags) = @_; 2645 my ($self, $npc, $msg, $flags) = @_;
2323 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2324 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2657 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2325 2658
2326 } else { 2659 } else {
2327 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2328 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2329 } 2662 }
2330 } 2663 }
2331} 2664}
2332 2665
2333=item $object->send_msg ($channel, $msg, $color, [extra...]) 2666=item $object->send_msg ($channel, $msg, $color, [extra...])
2358 2691
2359=item $player_object->enter_link 2692=item $player_object->enter_link
2360 2693
2361Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2362 2695
2363The player should be reasonably safe there for short amounts of time. You 2696The player should be reasonably safe there for short amounts of time (e.g.
2364I<MUST> call C<leave_link> as soon as possible, though. 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2698though, as the player cannot control the character while it is on the link
2699map.
2365 2700
2366Will never block. 2701Will never block.
2367 2702
2368=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2369 2704
2389sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2390 my ($self) = @_; 2725 my ($self) = @_;
2391 2726
2392 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2393 2728
2729 ++$self->{_link_recursion};
2730
2394 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2395 2732
2396 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2397 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2398 2735
2399 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2400} 2737}
2401 2738
2402sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2403 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2404 2741
2421 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2422 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2423 2760
2424 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2425 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2426 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2427 2764
2428 $map->load; 2765 $map->load;
2429 $map->load_neighbours; 2766 $map->load_neighbours;
2430 2767
2431 return unless $self->contr->active; 2768 return unless $self->contr->active;
2432 $self->activate_recursive;
2433 2769
2434 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2435 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2436} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2437 2777
2778}
2779
2438=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2439 2781
2440Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2441her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2442that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2443the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
2444be called at the end of this process. 2786be called at the end of this process.
2445 2787
2788Note that $check will be called with a potentially non-loaded map, so if
2789it needs a loaded map it has to call C<< ->load >>.
2790
2446=cut 2791=cut
2447 2792
2448our $GOTOGEN; 2793our $GOTOGEN;
2449 2794
2450sub cf::object::player::goto { 2795sub cf::object::player::goto {
2451 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2452 2803
2453 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2455 2806
2456 $self->enter_link; 2807 $self->enter_link;
2476 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2477 } 2828 }
2478 } 2829 }
2479 2830
2480 my $map = eval { 2831 my $map = eval {
2481 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2482 2833
2483 if ($map) { 2834 if ($map) {
2484 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2485 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2486 } else { 2837 } else {
2487 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2488 } 2839 }
2489 2840
2490 $map 2841 $map
2498 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2499 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2500 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2501 } 2852 }
2502 2853
2503 $done->() if $done; 2854 $done->($self) if $done;
2504 })->prio (1); 2855 })->prio (1);
2505} 2856}
2506 2857
2507=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2508 2859
2528} 2879}
2529 2880
2530sub prepare_random_map { 2881sub prepare_random_map {
2531 my ($exit) = @_; 2882 my ($exit) = @_;
2532 2883
2533 my $guard = cf::lock_acquire "exit_prepare:$exit";
2534
2535 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2536 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2537 # that depends on the exit object 2886 # that depends on the exit object
2538 2887
2539 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
2541 if ($exit->map) { 2890 if ($exit->map) {
2542 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2543 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2544 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2545 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2546 } 2897 }
2547 2898
2548 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2549 2900
2550 my $data = cf::to_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2551 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2552 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2553 2904
2554 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2555 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2556 undef $fh; 2907 undef $fh;
2557 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2558 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2559 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2560 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2561 } 2916 }
2562} 2917}
2563 2918
2564sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2565 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2566 2921
2567 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2568 2923
2569 if ($exit->slaying eq "/!") {
2570 #TODO: this should de-fi-ni-te-ly not be a sync-job
2571 # the problem is that $exit might not survive long enough
2572 # so it needs to be done right now, right here
2573 cf::sync_job { prepare_random_map $exit };
2574 }
2575
2576 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2577 my $hp = $exit->stats->hp;
2578 my $sp = $exit->stats->sp;
2579
2580 $self->enter_link; 2924 $self->enter_link;
2581 2925
2582 # if exit is damned, update players death & WoR home-position
2583 $self->contr->savebed ($slaying, $hp, $sp)
2584 if $exit->flag (FLAG_DAMNED);
2585
2586 (async { 2926 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2927 $Coro::current->{desc} = "enter_exit";
2588 2928
2589 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2929 unless (eval {
2930 $self->deactivate_recursive; # just to be sure
2931
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp;
2943
2591 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2592 2945
2946 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y)
2948 if $exit->flag (cf::FLAG_DAMNED);
2949
2593 1; 2950 1
2594 }) { 2951 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2956
2600 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2601 $self->leave_link; 2958 $self->leave_link;
2602 } 2959 }
2603 })->prio (1); 2960 })->prio (1);
2604} 2961}
2605 2962
2617sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2618 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2619 2976
2620 utf8::encode $text; 2977 utf8::encode $text;
2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2622} 3004}
2623 3005
2624=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2625 3007
2626Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2628the message, with C<log> being the default. If C<$color> is negative, suppress 3010the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 3011the message unless the client supports the msg packet.
2630 3012
2631=cut 3013=cut
2632 3014
3015# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2634 "c/identify" => { 3023 "c/identify" => {
2635 id => "infobox", 3024 id => "infobox",
2636 title => "Identify", 3025 title => "Identify",
2637 reply => undef, 3026 reply => undef,
2638 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
2641 id => "infobox", 3030 id => "infobox",
2642 title => "Examine", 3031 title => "Examine",
2643 reply => undef, 3032 reply => undef,
2644 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
2645 }, 3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
3040 },
3041 "c/book" => {
3042 id => "infobox",
3043 title => "Book",
3044 reply => undef,
3045 tooltip => "The contents of a note or book",
3046 },
2646 "c/lookat" => { 3047 "c/lookat" => {
2647 id => "infobox", 3048 id => "infobox",
2648 title => "Look", 3049 title => "Look",
2649 reply => undef, 3050 reply => undef,
2650 tooltip => "What you saw there", 3051 tooltip => "What you saw there",
2651 }, 3052 },
3053 "c/who" => {
3054 id => "infobox",
3055 title => "Players",
3056 reply => undef,
3057 tooltip => "Shows players who are currently online",
3058 },
3059 "c/body" => {
3060 id => "infobox",
3061 title => "Body Parts",
3062 reply => undef,
3063 tooltip => "Shows which body parts you posess and are available",
3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
3071 "c/skills" => {
3072 id => "infobox",
3073 title => "Skills",
3074 reply => undef,
3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
3100 },
3101 "c/uptime" => {
3102 id => "infobox",
3103 title => "Uptime",
3104 reply => undef,
3105 tooltip => "How long the server has been running since last restart",
3106 },
3107 "c/mapinfo" => {
3108 id => "infobox",
3109 title => "Map Info",
3110 reply => undef,
3111 tooltip => "Information related to the maps",
3112 },
3113 "c/party" => {
3114 id => "party",
3115 title => "Party",
3116 reply => "gsay ",
3117 tooltip => "Messages and chat related to your party",
3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
2652); 3127);
2653 3128
2654sub cf::client::send_msg { 3129sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2656 3131
2657 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2658 3134
2659 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2660 3136
2661 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2662 if ($CHANNEL{$channel}) { 3138 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel}; 3139 $channel = $CHANNEL{$channel};
2664 3140
2665 $self->ext_msg (channel_info => $channel) 3141 $self->ext_msg (channel_info => $channel);
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id}; 3142 $channel = $channel->{id};
2669 3143
2670 } elsif (ref $channel) { 3144 } elsif (ref $channel) {
2671 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2672 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2673 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2674 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2675 if $self->can_msg;
2676 } 3149 }
2677 3150
2678 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2679 } 3152 }
2680 3153
2681 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2682 3155
2683 if ($self->can_msg) {
2684 # default colour, mask it out 3156 # default colour, mask it out
2685 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2686 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2687 3159
2688 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2689 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2690 } else { 3163 );
2691 if ($color >= 0) {
2692 # replace some tags by gcfclient-compatible ones
2693 for ($msg) {
2694 1 while
2695 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2696 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2697 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2698 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2699 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2700 }
2701 3164
2702 $color &= cf::NDI_COLOR_MASK; 3165 $self->send_big_packet ($pkt);
2703
2704 utf8::encode $msg;
2705
2706 if (0 && $msg =~ /\[/) {
2707 # COMMAND/INFO
2708 $self->send_packet ("drawextinfo $color 10 8 $msg")
2709 } else {
2710 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2711 $self->send_packet ("drawinfo $color $msg")
2712 }
2713 }
2714 }
2715} 3166}
2716 3167
2717=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2718 3169
2719Sends an ext event to the client. 3170Sends an ext event to the client.
2722 3173
2723sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2724 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2725 3176
2726 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2727 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2728 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2729 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 } 3182 }
2732} 3183}
2733 3184
2734=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2735 3186
2739 3190
2740sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2741 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2742 3193
2743 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2744 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2745 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2746 #TODO: version 1, remove 3197 #TODO: version 1, remove
2747 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2748 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2749 } 3200 }
2750} 3201}
2751 3202
2752=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2753 3204
2824 3275
2825 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
2826 if $reply; 3277 if $reply;
2827 3278
2828 } else { 3279 } else {
2829 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2830 } 3281 }
2831 3282
2832 cf::override; 3283 cf::override;
2833 }, 3284 },
2834); 3285);
2854 3305
2855 $coro 3306 $coro
2856} 3307}
2857 3308
2858cf::client->attach ( 3309cf::client->attach (
2859 on_destroy => sub { 3310 on_client_destroy => sub {
2860 my ($ns) = @_; 3311 my ($ns) = @_;
2861 3312
2862 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2863 }, 3314 },
2864); 3315);
2880our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
2881 3332
2882$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
2883 3334
2884$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
2885 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
2886 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
2887 sort time 3338 sort time
2888)); 3339));
2889 3340
2890# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
2892=pod 3343=pod
2893 3344
2894The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
2895 3346
2896 cf::object 3347 cf::object
2897 contr pay_amount pay_player map x y force_find force_add 3348 contr pay_amount pay_player map x y force_find force_add destroy
2898 insert remove name archname title slaying race decrease_ob_nr 3349 insert remove name archname title slaying race decrease split
3350 value
2899 3351
2900 cf::object::player 3352 cf::object::player
2901 player 3353 player
2902 3354
2903 cf::player 3355 cf::player
2908 3360
2909=cut 3361=cut
2910 3362
2911for ( 3363for (
2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race 3365 insert remove inv nrof name archname title slaying race
2914 decrease_ob_nr)], 3366 decrease split destroy change_exp value msg lore send_msg)],
2915 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
2916 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
2917 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
2918) { 3370) {
2919 no strict 'refs';
2920 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
2921 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2922 for @funs; 3373 for @funs;
2923} 3374}
2924 3375
2939 3390
2940 my $qcode = $code; 3391 my $qcode = $code;
2941 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2942 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
2943 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
2944 local $_; 3398 local $_;
2945 local @safe::cf::_safe_eval_args = values %vars;
2946 3399
2947 my $eval = 3400 my $eval =
2948 "do {\n" 3401 "do {\n"
2949 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2950 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
2951 . $code 3404 . $code
2952 . "\n}" 3405 . "\n}"
2953 ; 3406 ;
2954 3407
3408 if ($CFG{safe_eval}) {
2955 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
2956 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2957 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
2958 3417
2959 if ($@) { 3418 if ($@) {
2960 warn "$@"; 3419 warn "$@",
2961 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
2962 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
2963 } 3422 }
2964 3423
2965 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
2966} 3425}
2967 3426
2981=cut 3440=cut
2982 3441
2983sub register_script_function { 3442sub register_script_function {
2984 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
2985 3444
2986 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
2987 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
2988} 3447}
2989 3448
2990=back 3449=back
2991 3450
2992=cut 3451=cut
3001 # for this (global event?) 3460 # for this (global event?)
3002 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3003 3462
3004 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3005 3464
3006 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3007 3466
3008 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3009 0 < aio_load $path, $facedata
3010 or die "$path: $!";
3011
3012 $facedata = Coro::Storable::thaw $facedata;
3013 3468
3014 $facedata->{version} == 2 3469 $facedata->{version} == 2
3015 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3016 3471
3017 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3018 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3019 type => FT_RSRC, 3475 type => FT_RSRC,
3020 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3021 }; 3478 };
3022 cf::cede_to_tick; 3479 cf::cede_to_tick;
3023 3480
3024 { 3481 {
3025 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
3026 3483
3027 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3028 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486
3029 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3030 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3033 3492
3034 cf::cede_to_tick; 3493 cf::cede_to_tick;
3035 } 3494 }
3036 3495
3037 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3038 next unless $info->{smooth}; 3497 next unless $info->{smooth};
3498
3039 my $idx = cf::face::find $face 3499 my $idx = cf::face::find $face
3040 or next; 3500 or next;
3501
3041 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3042 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3043 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3044 } else { 3505 } else {
3045 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3046 } 3507 }
3047 3508
3048 cf::cede_to_tick; 3509 cf::cede_to_tick;
3049 } 3510 }
3050 } 3511 }
3059 3520
3060 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3061 } 3522 }
3062 3523
3063 { 3524 {
3064 # TODO: for gcfclient pleasure, we should give resources
3065 # that gcfclient doesn't grok a >10000 face index.
3066 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3067 3526
3068 my $soundconf = delete $res->{"res/sound.conf"};
3069
3070 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3528 if (defined $info->{type}) {
3071 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data;
3073 3530
3074 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3075 # prepend meta info 3532 cf::face::set_type $idx, $info->{type};
3076
3077 my $meta = $enc->encode ({
3078 name => $name,
3079 %{ $info->{meta} || {} },
3080 });
3081
3082 $data = pack "(w/a*)*", $meta, $info->{data};
3083 } else { 3533 } else {
3084 $data = $info->{data}; 3534 $RESOURCE{$name} = $info; # unused
3085 } 3535 }
3086 3536
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
3090 cf::cede_to_tick; 3537 cf::cede_to_tick;
3091 } 3538 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
3110 } 3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3111 3542
3112 1 3543 1
3113} 3544}
3114 3545
3115register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3117 3548
3118 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3119 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
3120 } 3551 }
3121}; 3552};
3553
3554sub load_resource_file($) {
3555 my $guard = lock_acquire "load_resource_file";
3556
3557 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100;
3559 cf::arch::commit_load;
3560
3561 $status
3562}
3122 3563
3123sub reload_regions { 3564sub reload_regions {
3124 # HACK to clear player env face cache, we need some signal framework 3565 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?) 3566 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3567 %ext::player_env::MUSIC_FACE_CACHE = ();
3140} 3581}
3141 3582
3142sub reload_archetypes { 3583sub reload_archetypes {
3143 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
3144 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
3145 #d# NEED to laod twice to resolve forward references
3146 # this really needs to be done in an extra post-pass
3147 # (which needs to be synchronous, so solve it differently)
3148 load_resource_file "$DATADIR/archetypes"
3149 or die "unable to load archetypes\n";
3150} 3586}
3151 3587
3152sub reload_treasures { 3588sub reload_treasures {
3153 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3154 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3155} 3591}
3156 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3157sub reload_resources { 3613sub reload_resources {
3158 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3159 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
3160 reload_regions; 3621 reload_regions;
3161 reload_facedata;
3162 #reload_archetypes;#d#
3163 reload_archetypes;
3164 reload_treasures; 3622 reload_treasures;
3165 3623
3166 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3167}
3168
3169sub init {
3170 reload_resources;
3171} 3625}
3172 3626
3173sub reload_config { 3627sub reload_config {
3174 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3175 or return;
3176 3629
3177 local $/; 3630 my $config = load_file "$CONFDIR/config";
3178 *CFG = YAML::Syck::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3179 3633
3180 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3181 3635
3182 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3183 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3184 3638
3185 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3189 }; 3643 };
3190 warn $@ if $@; 3644 warn $@ if $@;
3191 } 3645 }
3192} 3646}
3193 3647
3648sub pidfile() {
3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3650 or die "$PIDFILE: $!";
3651 flock $fh, &Fcntl::LOCK_EX
3652 or die "$PIDFILE: flock: $!";
3653 $fh
3654}
3655
3656# make sure only one server instance is running at any one time
3657sub atomic {
3658 my $fh = pidfile;
3659
3660 my $pid = <$fh>;
3661 kill 9, $pid if $pid > 0;
3662
3663 seek $fh, 0, 0;
3664 print $fh $$;
3665}
3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3194sub main { 3676sub main {
3677 cf::init_globals; # initialise logging
3678
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685
3195 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3196 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3198 (async { 3689 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3200 Event::one_event; 3691 EV::loop EV::LOOP_ONESHOT;
3201 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3202 }; 3693 };
3203 3694
3695 evthread_start IO::AIO::poll_fileno;
3696
3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3706 reload_resources;
3204 reload_config; 3707 reload_config;
3205 db_init; 3708 db_init;
3709
3710 cf::init_uuid;
3711 cf::init_signals;
3712 cf::init_skills;
3713
3714 cf::init_beforeplay;
3715
3716 atomic;
3717
3206 load_extensions; 3718 load_extensions;
3207 3719
3208 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
3209 Event::loop; 3721
3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3210} 3738}
3211 3739
3212############################################################################# 3740#############################################################################
3213# initialisation and cleanup 3741# initialisation and cleanup
3214 3742
3215# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3216BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
3217 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3218 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3219 reentrant => 0,
3220 data => WF_AUTOCANCEL,
3221 signal => $signal,
3222 prio => 0,
3223 cb => sub {
3224 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3225 },
3226 ); 3749 };
3227 } 3750 }
3228} 3751}
3229 3752
3230sub write_runtime { 3753sub write_runtime_sync {
3231 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3232 3755
3233 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3234 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3235 3758
3236 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3237 3760
3238 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3239 3762
3240 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3241 or return; 3764 or return;
3242 3765
3243 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3244 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3245 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3255 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3256 3779
3257 close $fh 3780 close $fh
3258 or return; 3781 or return;
3259 3782
3260 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3261 and return; 3784 and return;
3262 3785
3263 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3264 3787
3265 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 };
3266} 3839}
3267 3840
3268sub emergency_save() { 3841sub emergency_save() {
3269 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3270 3843
3271 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;
3272 3850
3273 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3274 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3275 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3276 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3277 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3278 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3279 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3280 $pl->valid or next; 3860 $pl->valid or next;
3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3281 $pl->save; 3862 $pl->save;
3282 } 3863 }
3283 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3284 3865
3285 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";
3286 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3287 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3288 $map->valid or next; 3871 $map->valid or next;
3289 $map->save; 3872 $map->save;
3290 } 3873 }
3291 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3292 3875
3293 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";
3294 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3295 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::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3296 }; 3904 };
3297 3905
3298 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3299} 3907}
3300 3908
3301sub post_cleanup { 3909sub post_cleanup {
3302 my ($make_core) = @_; 3910 my ($make_core) = @_;
3303 3911
3912 IO::AIO::flush;
3913
3304 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3305 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 }
3306} 3944}
3307 3945
3308sub do_reload_perl() { 3946sub do_reload_perl() {
3309 # can/must only be called in main 3947 # can/must only be called in main
3310 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3311 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3312 return; 3950 return;
3313 } 3951 }
3314 3952
3315 warn "reloading..."; 3953 return if $RELOAD++;
3316 3954
3317 warn "entering sync_job"; 3955 my $t1 = AE::time;
3318 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
3319 cf::sync_job { 3963 cf::sync_job {
3320 cf::write_runtime; # external watchdog should not bark
3321 cf::emergency_save; 3964 #cf::emergency_save;
3322 cf::write_runtime; # external watchdog should not bark
3323 3965
3324 warn "syncing database to disk";
3325 BDB::db_env_txn_checkpoint $DB_ENV;
3326
3327 # if anything goes wrong in here, we should simply crash as we already saved
3328
3329 warn "cancelling all WF_AUTOCANCEL watchers";
3330 for (Event::all_watchers) {
3331 $_->cancel if $_->data & WF_AUTOCANCEL;
3332 }
3333
3334 warn "flushing outstanding aio requests";
3335 for (;;) {
3336 BDB::flush;
3337 IO::AIO::flush;
3338 Coro::cede;
3339 last unless IO::AIO::nreqs || BDB::nreqs;
3340 warn "iterate...";
3341 }
3342
3343 ++$RELOAD;
3344
3345 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3346 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3347 %EXT_CORO = (); 3968 %EXT_CORO = ();
3348 3969
3349 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3350 %COMMAND = (); 3971 %COMMAND = ();
3351 3972
3352 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3353 %EXTCMD = (); 3974 %EXTCMD = ();
3354 %EXTICMD = (); 3975 %EXTICMD = ();
3355 3976
3356 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3357 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3358 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3359 3980
3360 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3361 eval { 3982 eval {
3362 $cb->($pkg); 3983 $cb->($pkg);
3363 1 3984 1
3364 } 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;
3365 } 3990 }
3366 3991
3367 warn "... nuking $pkg";
3368 Symbol::delete_package $pkg;
3369 }
3370
3371 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3372 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3373 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3374 3995
3375 warn "... unloading $k"; 3996 trace "... unloading $k";
3376 delete $INC{$k}; 3997 delete $INC{$k};
3377 3998
3378 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3379 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3380 4001
3381 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3382 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3383 } 4007 }
3384 4008
3385 Symbol::delete_package $k;
3386 }
3387
3388 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3389 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3390 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);
3391 4012
3392 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3393 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3394 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3395 4016
3396 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3397 # and global variables created in xs 4018 # and global variables created in xs
3398 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3399 4020
3400 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3401 4022
3402 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3403 require cf; 4024 require cf;
3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3405 4026
3406 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3407 cf::reload_config; 4028 cf::reload_config;
3408 4029
3409 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3410 cf::load_extensions; 4031 cf::load_extensions;
3411 4032
4033 if ($REATTACH_ON_RELOAD) {
3412 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3413 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3414 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3415 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3416 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3417 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3418 4041
3419 warn "leaving sync_job"; 4042 cf::_post_init 1;
3420 4043
4044 trace "perl_reload: leaving sync_job";
4045
3421 1 4046 1
3422 } or do { 4047 } or do {
3423 warn $@; 4048 error $@;
3424 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3425 exit 1; 4050 };
4051
4052 --$RELOAD;
3426 }; 4053 }
3427 4054
3428 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3429}; 4057};
3430 4058
3431our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3432 4060
3433sub reload_perl() { 4061sub reload_perl() {
3434 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3435 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3436 4064
3437 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
3438 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
3439 after => 0, 4067
3440 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3441 cb => sub {
3442 do_reload_perl; 4069 do_reload_perl;
3443 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3444 }, 4071 };
3445 ); 4072 };
3446} 4073}
3447 4074
3448register_command "reload" => sub { 4075register_command "reload" => sub {
3449 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3450 4077
3455 reload_perl; 4082 reload_perl;
3456 }; 4083 };
3457 } 4084 }
3458}; 4085};
3459 4086
3460unshift @INC, $LIBDIR; 4087#############################################################################
3461 4088
3462my $bug_warning = 0; 4089my $bug_warning = 0;
3463 4090
3464our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3465our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3466 4093
3467sub wait_for_tick { 4094sub wait_for_tick() {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3470 4096
3471 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3473 $signal->wait; 4099 $signal->wait;
3474} 4100}
3475 4101
3476sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3477 return unless $TICK_WATCHER->is_active;
3478 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3479 4104
3480 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3481 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3482 $signal->wait; 4107 $signal->wait;
3483} 4108}
3484 4109
3485$TICK_WATCHER = Event->timer ( 4110sub tick {
3486 reentrant => 0,
3487 parked => 1,
3488 prio => 0,
3489 at => $NEXT_TICK || $TICK,
3490 data => WF_AUTOCANCEL,
3491 cb => sub {
3492 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
3493 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3494 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
3495 return; 4114 return;
3496 } 4115 }
3497 4116
3498 $NOW = $tick_start = Event::time;
3499
3500 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3501 4118
3502 $RUNTIME += $TICK; 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3503 $NEXT_TICK += $TICK;
3504 4120
3505 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3506 $NEXT_RUNTIME_WRITE = $NOW + 10; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3507 Coro::async_pool { 4123 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3509 write_runtime 4125 write_runtime_sync
3510 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3511 };
3512 } 4127 };
4128 }
3513 4129
3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3515 $sig->send; 4131 $sig->send;
3516 } 4132 }
3517 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
3518 $sig->send; 4134 $sig->send;
3519 } 4135 }
3520 4136
3521 $NOW = Event::time; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
3522
3523 # if we are delayed by four ticks or more, skip them all
3524 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3525
3526 $TICK_WATCHER->at ($NEXT_TICK);
3527 $TICK_WATCHER->start;
3528
3529 $LOAD = ($NOW - $tick_start) / $TICK;
3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3531 4139
3532 _post_tick; 4140 if (0) {
4141 if ($NEXT_TICK) {
4142 my $jitter = $TICK_START - $NEXT_TICK;
4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4144 debug "jitter $JITTER\n";#d#
4145 }
3533 }, 4146 }
3534); 4147}
3535 4148
3536{ 4149{
4150 # configure BDB
4151
3537 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3538 BDB::max_poll_time $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3539 $BDB_POLL_WATCHER = Event->io ( 4154 $AnyEvent::BDB::WATCHER->priority (1);
3540 reentrant => 0,
3541 fd => BDB::poll_fileno,
3542 poll => 'r',
3543 prio => 0,
3544 data => WF_AUTOCANCEL,
3545 cb => \&BDB::poll_cb,
3546 );
3547
3548 BDB::set_sync_prepare {
3549 my $status;
3550 my $current = $Coro::current;
3551 (
3552 sub {
3553 $status = $!;
3554 $current->ready; undef $current;
3555 },
3556 sub {
3557 Coro::schedule while defined $current;
3558 $! = $status;
3559 },
3560 )
3561 };
3562 4155
3563 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3564 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3566 | BDB::LOG_AUTOREMOVE, 1); 4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4160 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3569 4163
3570 cf::sync_job { 4164 cf::sync_job {
3571 eval { 4165 eval {
3581 4175
3582 cf::cleanup "db_env_open(db): $@" if $@; 4176 cf::cleanup "db_env_open(db): $@" if $@;
3583 }; 4177 };
3584 } 4178 }
3585 4179
3586 $BDB_DEADLOCK_WATCHER = Event->timer ( 4180 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4181 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 ); 4182 };
3596 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4183 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4184 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 ); 4185 };
3606 $BDB_TRICKLE_WATCHER = Event->timer ( 4186 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4187 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 ); 4188 };
3616} 4189}
3617 4190
3618{ 4191{
4192 # configure IO::AIO
4193
3619 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3620
3621 undef $Coro::AIO::WATCHER;
3622 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3623 $AIO_POLL_WATCHER = Event->io ( 4196 undef $AnyEvent::AIO::WATCHER;
3624 reentrant => 0,
3625 data => WF_AUTOCANCEL,
3626 fd => IO::AIO::poll_fileno,
3627 poll => 'r',
3628 prio => 0,
3629 cb => \&IO::AIO::poll_cb,
3630 );
3631} 4197}
3632 4198
3633my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3634 4201
3635sub _log_backtrace { 4202sub _log_backtrace {
3636 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3637 4204
3638 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3639 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3640 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3641 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3642 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3643 async { 4215 async {
3644 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3645 4217
3646 my @bt = fork_call { 4218 my @bt = fork_call {
3647 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
3658 } 4230 }
3659 4231
3660 @funcs 4232 @funcs
3661 }; 4233 };
3662 4234
3663 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3664 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3665 --$_log_backtrace; 4238 --$_log_backtrace;
3666 }; 4239 };
3667 } else { 4240 } else {
3668 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3669 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3670 } 4243 }
3671} 4244}
3672 4245
3673# load additional modules 4246# load additional modules
3674use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3675 4249
3676END { cf::emergency_save } 4250END { cf::emergency_save }
3677 4251
36781 42521
3679 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines