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.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 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 Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 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.51 (); 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 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
433 608
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
437 610
438 my $busy = 1; 611 my $busy = 1;
439 my @res; 612 my @res;
440 613
441 (async { 614 (async {
442 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 616 @res = eval { $job->() };
444 warn $@ if $@; 617 error $@ if $@;
445 undef $busy; 618 undef $busy;
446 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
447 620
448 while ($busy) { 621 while ($busy) {
449 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
450 } 626 }
627 }
451 628
452 $time = Event::time - $time; 629 my $time = AE::time - $time;
453 630
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
458 632
459 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
460 } else { 634 } else {
461 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
462 636
482 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
483 657
484 $coro 658 $coro
485} 659}
486 660
487=item fork_call { }, $args 661=item fork_call { }, @args
488 662
489Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
493 667
494=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
495 673
496sub fork_call(&@) { 674sub fork_call(&@) {
497 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
498 676
499 # 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,
500 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
501 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
502 680
503 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
504 reset_signals; 682 cf::post_fork;
505 &$cb 683 &$cb
506 }, @args; 684 } @args;
507 685
508 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
509} 725}
510 726
511=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
512 728
513Returns a single value from the environment database. 729Returns a single value from the environment database.
523within each server. 739within each server.
524 740
525=cut 741=cut
526 742
527sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
528 my ($name) = @_; 747 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
530 749
531 eval { 750 eval {
532 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
542} 761}
543 762
544our $DB; 763our $DB;
545 764
546sub db_init { 765sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
549 };
550} 767}
551 768
552sub db_get($$) { 769sub db_get($$) {
553 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
554 771
555 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
556 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
557 776
558 $! ? () 777 $! ? ()
559 : $data 778 : $data
560 }
561} 779}
562 780
563sub db_put($$$) { 781sub db_put($$$) {
564 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
593 811
594 my @data; 812 my @data;
595 my $md5; 813 my $md5;
596 814
597 for (0 .. $#$src) { 815 for (0 .. $#$src) {
598 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
599 or Carp::croak "$src->[$_]: $!";
600 } 817 }
601 818
602 # if processing is expensive, check 819 # if processing is expensive, check
603 # checksum first 820 # checksum first
604 if (1) { 821 if (1) {
621 838
622 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data); 840 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
625 842
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
627 844
628 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
631 848
641 858
642=cut 859=cut
643 860
644sub datalog($@) { 861sub datalog($@) {
645 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
646 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
647} 864}
648 865
649=back 866=back
650 867
651=cut 868=cut
652 869
653############################################################################# 870#############################################################################
654 871
655=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
656 873
657Many 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
658attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
660 877
661In 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>
662C<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
663Crossfire TRT). 880Deliantra).
664 881
665=over 4 882=over 4
666 883
667=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
668 885
712=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
713 930
714Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
716 933
717Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
718that 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.
719 936
720These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
721 938
722=over 4 939=over 4
846 1063
847 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
848 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
849 1066
850 } elsif (ref $type) { 1067 } elsif (ref $type) {
851 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
852 1069
853 } else { 1070 } else {
854 shift @arg; 1071 shift @arg;
855 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
856 } 1073 }
857 } 1074 }
858} 1075}
859 1076
860sub _object_attach { 1077sub _object_attach {
870 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
871 } 1088 }
872 1089
873 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
874 } else { 1091 } else {
875 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
876 } 1093 }
877 1094
878 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
879} 1096}
880 1097
939 1156
940 for (@$callbacks) { 1157 for (@$callbacks) {
941 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
942 1159
943 if ($@) { 1160 if ($@) {
944 warn "$@";
945 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
946 override; 1162 override;
947 } 1163 }
948 1164
949 return 1 if $override; 1165 return 1 if $override;
950 } 1166 }
951 1167
952 0 1168 0
953} 1169}
954 1170
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1172
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1174
959Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
960 1176
966 1182
967=cut 1183=cut
968 1184
969############################################################################# 1185#############################################################################
970# object support 1186# object support
971#
972 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#
973sub _can_merge { 1221sub _can_merge {
974 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
975 1223
976 return 1;#d# 1224 ++$SLOW_MERGES;#d#
977 1225
978 #todo#d# kill yourself and do some recursive checking manually without storable 1226 # we do the slow way here
979 sync_job { 1227 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1228}
987 1229
988sub reattach { 1230sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1232 my ($obj) = @_;
991 1233
1234 # no longer needed after getting rid of delete_package?
992 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
993 1236
994 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
995 1238
996 @$registry = (); 1239 @$registry = ();
997 1240
1002 for (@$attach) { 1245 for (@$attach) {
1003 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1004 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1005 } 1248 }
1006 } else { 1249 } else {
1007 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1008 } 1251 }
1009 } 1252 }
1010} 1253}
1011 1254
1012cf::attachable->attach ( 1255cf::attachable->attach (
1013 prio => -1000000, 1256 prio => -1000000,
1014 on_instantiate => sub { 1257 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1016 1259
1017 $data = from_json $data; 1260 $data = decode_json $data;
1018 1261
1019 for (@$data) { 1262 for (@$data) {
1020 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1021 1264
1022 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1039 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1040 1283
1041 sync_job { 1284 sync_job {
1042 if (length $$rdata) { 1285 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1044 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1045 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1046 1290
1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1050 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 }
1051 close $fh; 1298 aio_close $fh;
1052 1299
1053 if (@$objs) { 1300 if (@$objs) {
1054 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) {
1055 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1058 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 }
1059 close $fh; 1309 aio_close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1311 }
1062 } else { 1312 } else {
1063 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1064 } 1314 }
1065 1315
1066 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1067 } else { 1320 } else {
1068 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1069 } 1322 }
1070 } else { 1323 } else {
1071 aio_unlink $filename; 1324 aio_unlink $filename;
1072 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1073 } 1326 }
1092 1345
1093 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1348 or return;
1096 1349
1097 my $st = eval { Coro::Storable::thaw $av } 1350 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1351 $av = $st->{objs};
1100 } 1352 }
1101 1353
1102 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1104 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1105 1358
1106 ($data, $av) 1359 ($data, $av)
1107} 1360}
1108 1361
1109=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1165 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1166 1419
1167 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1168} 1421}
1169 1422
1423use File::Glob ();
1424
1170cf::player->attach ( 1425cf::player->attach (
1171 on_command => sub { 1426 on_unknown_command => sub {
1172 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1173 1428
1174 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1175 or return; 1430 or return;
1176 1431
1199 1454
1200 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1201 if $reply; 1456 if $reply;
1202 1457
1203 } else { 1458 } else {
1204 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1205 } 1460 }
1206 1461
1207 cf::override; 1462 cf::override;
1208 }, 1463 },
1209); 1464);
1210 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
1211sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1212 cf::sync_job { 1482 cf::sync_job {
1213 my %todo; 1483 my %todo;
1214 1484
1215 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1216 next unless -r $path; 1486 next unless -r $path;
1234 1504
1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1237 1507
1238 $ext{source} = 1508 $ext{source} =
1239 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1240 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1241 . $source 1511 . $source
1242 . "\n};\n1"; 1512 . "\n};\n1";
1243 1513
1244 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1245 } 1515 }
1246 1516
1517 my $pass = 0;
1247 my %done; 1518 my %done;
1248 while (%todo) { 1519 while (%todo) {
1249 my $progress; 1520 my $progress;
1250 1521
1522 ++$pass;
1523
1524 ext:
1251 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1252 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1253 goto skip 1527 next ext
1254 unless exists $done{$_}; 1528 unless exists $done{$_};
1255 } 1529 }
1256 1530
1257 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1258 1532
1259 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1260 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1261 : "$v->{base}: extension inactive.\n";
1262 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1263 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1264 warn $msg; 1540
1265 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1266 exit 1; 1542 delete $todo{$k};
1267 } 1543 } else {
1268 1544 $done{$k} = delete $todo{$k};
1269 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1270 } 1550 }
1271
1272 $done{$k} = delete $todo{$k};
1273 push @EXTS, $v->{pkg};
1274 $progress = 1;
1275 } 1551 }
1276 1552
1277 skip: 1553 unless ($progress) {
1278 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1279 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 }
1280 } 1563 }
1281 }; 1564 };
1282} 1565}
1283 1566
1284############################################################################# 1567#############################################################################
1285 1568
1286=back 1569=back
1287 1570
1288=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1289 1572
1290Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1291 1574
1292=cut 1575=cut
1293 1576
1294package cf::player; 1577package cf::player;
1295 1578
1338 1621
1339sub exists($) { 1622sub exists($) {
1340 my ($login) = @_; 1623 my ($login) = @_;
1341 1624
1342 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1343 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1344} 1627}
1345 1628
1346sub find($) { 1629sub find($) {
1347 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1348 my $login = $_[0]; 1631 my $login = $_[0];
1360 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1361 or return; 1644 or return;
1362 1645
1363 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1364 or return; 1647 or return;
1648
1365 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1367 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1368 } 1652 }
1369 } 1653 }
1370} 1654}
1371 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
1372sub save($) { 1669sub save($) {
1373 my ($pl) = @_; 1670 my ($pl) = @_;
1374 1671
1375 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1376 1673
1379 1676
1380 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1381 1678
1382 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1383 $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];
1384 1686
1385 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1386 cf::cede_to_tick; 1688 cf::cede_to_tick;
1387} 1689}
1388 1690
1420 my ($pl) = @_; 1722 my ($pl) = @_;
1421 1723
1422 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1423 1725
1424 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1425 $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
1426 1728
1427 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1428 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1429 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1430 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1431 1737
1432 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1433 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1434 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1472 1778
1473 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1474 my $path = path $login; 1780 my $path = path $login;
1475 1781
1476 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1479 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1480 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 } 1788 }
1482 1789
1486 1793
1487 \@logins 1794 \@logins
1488} 1795}
1489 1796
1490=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1491 1800
1492Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1493player. May block. 1802player. May block.
1494 1803
1495=cut 1804=cut
1513 } 1822 }
1514 1823
1515 \@paths 1824 \@paths
1516} 1825}
1517 1826
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1519 1828
1520Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568 1830
1569=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1570 1832
1571Sends an ext reply to the player. 1833Sends an ext reply to the player.
1572 1834
1604 1866
1605=cut 1867=cut
1606 1868
1607sub find_by_path($) { 1869sub find_by_path($) {
1608 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1609 1873
1610 my ($match, $specificity); 1874 my ($match, $specificity);
1611 1875
1612 for my $region (list) { 1876 for my $region (list) {
1613 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1639our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1641 1905
1642sub generate_random_map { 1906sub generate_random_map {
1643 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1644 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1645 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1649 $rmp->{exit_on_final_map},
1650 $rmp->{xsize}, $rmp->{ysize},
1651 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1652 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1653 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1654 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1655 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1656 (cf::region::find $rmp->{region}), $rmp->{custom}
1657 )
1658} 1912}
1659 1913
1660=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1661 1915
1662Register 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
1667 1921
1668sub register { 1922sub register {
1669 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1670 my $pkg = caller; 1924 my $pkg = caller;
1671 1925
1672 no strict;
1673 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1674 1927
1675 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1676} 1929}
1677 1930
1678# also paths starting with '/' 1931# also paths starting with '/'
1679$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1680 1933
1681sub thawer_merge { 1934sub thawer_merge {
1682 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1683 1936
1684 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1689} 1942}
1690 1943
1691sub normalise { 1944sub normalise {
1692 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1693 1946
1694 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1695 1948
1696 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1697 1950
1698 # map plan: 1951 # map plan:
1699 # 1952 #
1714 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1715 $path = "$base/$path"; 1968 $path = "$base/$path";
1716 } 1969 }
1717 1970
1718 for ($path) { 1971 for ($path) {
1719 redo if s{//}{/};
1720 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1721 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1722 } 1974 }
1723 1975
1724 $path 1976 $path
1738 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1739 return $self; 1991 return $self;
1740 } 1992 }
1741 } 1993 }
1742 1994
1743 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1744 () 1996 ()
1745} 1997}
1746 1998
1999# may re-bless or do other evil things
1747sub init { 2000sub init {
1748 my ($self) = @_; 2001 my ($self) = @_;
1749 2002
1750 $self 2003 $self
1751} 2004}
1770 2023
1771# the temporary/swap location 2024# the temporary/swap location
1772sub save_path { 2025sub save_path {
1773 my ($self) = @_; 2026 my ($self) = @_;
1774 2027
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1777} 2030}
1778 2031
1779# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1780sub uniq_path { 2033sub uniq_path {
1781 my ($self) = @_; 2034 my ($self) = @_;
1782 2035
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1785}
1786
1787# and all this just because we cannot iterate over
1788# all maps in C++...
1789sub change_all_map_light {
1790 my ($change) = @_;
1791
1792 $_->change_map_light ($change)
1793 for grep $_->outdoor, values %cf::MAP;
1794} 2038}
1795 2039
1796sub decay_objects { 2040sub decay_objects {
1797 my ($self) = @_; 2041 my ($self) = @_;
1798 2042
1825 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1826 2070
1827 1 2071 1
1828} 2072}
1829 2073
2074# used to laod the header of an original map
1830sub load_header_orig { 2075sub load_header_orig {
1831 my ($self) = @_; 2076 my ($self) = @_;
1832 2077
1833 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1834} 2079}
1835 2080
2081# used to laod the header of an instantiated map
1836sub load_header_temp { 2082sub load_header_temp {
1837 my ($self) = @_; 2083 my ($self) = @_;
1838 2084
1839 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1840} 2086}
1841 2087
2088# called after loading the header from an instantiated map
1842sub prepare_temp { 2089sub prepare_temp {
1843 my ($self) = @_; 2090 my ($self) = @_;
1844 2091
1845 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1846 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1847 # safety 2094 # safety
1848 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1849 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1850} 2097}
1851 2098
2099# called after loading the header from an original map
1852sub prepare_orig { 2100sub prepare_orig {
1853 my ($self) = @_; 2101 my ($self) = @_;
1854 2102
1855 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1856 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1880 2128
1881sub find; 2129sub find;
1882sub find { 2130sub find {
1883 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1884 2132
2133 cf::cede_to_tick;
2134
1885 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1886 2136
1887 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1888 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1889 2139
1890 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1894 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1895 or return; 2142 or return;
1896 2143
1897 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1898 2145
1900 or return; 2147 or return;
1901 2148
1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1903 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
1904 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
1905 undef $guard1; 2153 undef $guard1;
1906 undef $guard2;
1907 $map->reset; 2154 $map->reset;
1908 return find $path; 2155 return find $path;
1909 } 2156 }
1910 2157
1911 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1912 } 2159 }
1913} 2160}
1914 2161
1915sub pre_load { } 2162sub pre_load { }
1916sub post_load { } 2163#sub post_load { } # XS
1917 2164
1918sub load { 2165sub load {
1919 my ($self) = @_; 2166 my ($self) = @_;
1920 2167
1921 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
1924 2171
1925 { 2172 {
1926 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
1927 2174
1928 return unless $self->valid; 2175 return unless $self->valid;
1929 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->state == cf::MAP_SWAPPED;
1930
1931 $self->in_memory (cf::MAP_LOADING);
1932 2177
1933 $self->alloc; 2178 $self->alloc;
1934 2179
1935 $self->pre_load; 2180 $self->pre_load;
1936 cf::cede_to_tick; 2181 cf::cede_to_tick;
1937 2182
2183 if (exists $self->{load_path}) {
1938 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block; 2185 $f->skip_block;
1940 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
1941 or return; 2187 or return;
1942 2188
1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2189 $self->post_load_original
1944 if delete $self->{load_original}; 2190 if delete $self->{load_original};
1945 2191
1946 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
1947 utf8::encode $uniq; 2193 utf8::encode $uniq;
1948 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
1950 $self->clear_unique_items; 2196 $self->clear_unique_items;
1951 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
1953 } 2200 }
1954 } 2201 }
1955 }
1956 2202
1957 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->state (cf::MAP_INACTIVE);
1958 2210
1959 cf::cede_to_tick; 2211 cf::cede_to_tick;
1960 # now do the right thing for maps 2212 # now do the right thing for maps
1961 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
1962 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
1966 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
1967 $self->decay_objects; 2219 $self->decay_objects;
1968 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
1969 $self->update_buttons; 2221 $self->update_buttons;
1970 cf::cede_to_tick; 2222 cf::cede_to_tick;
1971 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
1972 cf::cede_to_tick;
1973 $self->activate;
1974 } 2224 }
1975 2225
1976 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
1978
1979 $self->in_memory (cf::MAP_IN_MEMORY);
1980 } 2228 }
1981 2229
1982 $self->post_load; 2230 $self->post_load;
1983}
1984 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
1985sub customise_for { 2238sub customise_for {
1986 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
1987 2240
1988 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
1989 if $self->per_player; 2242 if $self->per_player;
2005 or next; 2258 or next;
2006 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2007 or next; 2260 or next;
2008 $neigh->load; 2261 $neigh->load;
2009 2262
2263 # now find the diagonal neighbours
2010 push @neigh, 2264 push @neigh,
2011 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2012 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2013 } 2267 }
2014 2268
2021} 2275}
2022 2276
2023sub find_sync { 2277sub find_sync {
2024 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2025 2279
2026 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2027} 2285}
2028 2286
2029sub do_load_sync { 2287sub do_load_sync {
2030 my ($map) = @_; 2288 my ($map) = @_;
2031 2289
2290 # it's a bug to call this from the main context
2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2033 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2034 2293
2035 cf::sync_job { $map->load }; 2294 $map->load;
2036} 2295}
2037 2296
2038our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2039our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2040 2299
2041sub find_async { 2300sub find_async {
2042 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2043 2302
2044 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2045 2304
2046 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2306 return $map if !$load || $map->linkable;
2048 } 2307 }
2049 2308
2050 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2051 2310
2052 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2066 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2067 2326
2068 () 2327 ()
2069} 2328}
2070 2329
2330# common code, used by both ->save and ->swapout
2071sub save { 2331sub _save {
2072 my ($self) = @_; 2332 my ($self) = @_;
2073
2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
2075 2333
2076 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2077 2335
2078 return unless $self->dirty; 2336 return unless $self->dirty;
2079 2337
2088 2346
2089 cf::async { 2347 cf::async {
2090 $Coro::current->{desc} = "map player save"; 2348 $Coro::current->{desc} = "map player save";
2091 $_->contr->save for $self->players; 2349 $_->contr->save for $self->players;
2092 }; 2350 };
2351
2352 cf::get_slot 0.02;
2093 2353
2094 if ($uniq) { 2354 if ($uniq) {
2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2355 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2096 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2356 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2097 } else { 2357 } else {
2098 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2099 } 2359 }
2100} 2360}
2101 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2102sub swap_out { 2370sub swap_out {
2103 my ($self) = @_; 2371 my ($self) = @_;
2104 2372
2105 # save first because save cedes
2106 $self->save;
2107
2108 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2109 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2110 return if $self->players; 2377 return if $self->players;
2111 return if $self->in_memory != cf::MAP_IN_MEMORY; 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->state (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2112 return if $self->{deny_save}; 2395 return 1e99 if $self->{deny_reset};
2113 2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2114 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->state (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2115 2429
2116 $self->deactivate; 2430 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2118 $self->clear; 2432 $self->clear;
2119}
2120
2121sub reset_at {
2122 my ($self) = @_;
2123
2124 # TODO: safety, remove and allow resettable per-player maps
2125 return 1e99 if $self->{deny_reset};
2126
2127 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2128 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2129
2130 $time + $to
2131}
2132
2133sub should_reset {
2134 my ($self) = @_;
2135
2136 $self->reset_at <= $cf::RUNTIME
2137}
2138
2139sub reset {
2140 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143
2144 return if $self->players;
2145
2146 warn "resetting map ", $self->path;
2147
2148 $self->in_memory (cf::MAP_SWAPPED);
2149
2150 # need to save uniques path
2151 unless ($self->{deny_save}) {
2152 my $uniq = $self->uniq_path; utf8::encode $uniq;
2153
2154 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2155 if $uniq;
2156 }
2157
2158 delete $cf::MAP{$self->path};
2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
2162 $self->clear;
2163 2433
2164 $self->unlink_save; 2434 $self->unlink_save;
2165 $self->destroy; 2435 $self->destroy;
2166} 2436}
2167 2437
2175 2445
2176 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2177 2447
2178 $self->unlink_save; 2448 $self->unlink_save;
2179 2449
2180 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2181 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2182 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2183 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2185 2455
2234 2504
2235sub unique_maps() { 2505sub unique_maps() {
2236 [ 2506 [
2237 map { 2507 map {
2238 utf8::decode $_; 2508 utf8::decode $_;
2239 /\.map$/ 2509 s/\.map$//; # TODO future compatibility hack
2510 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2511 ? ()
2240 ? normalise $_ 2512 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2514 ]
2244} 2515}
2245 2516
2246package cf; 2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2247 2548
2248=back 2549=back
2249 2550
2250=head3 cf::object 2551=head3 cf::object
2251 2552
2255 2556
2256=over 4 2557=over 4
2257 2558
2258=item $ob->inv_recursive 2559=item $ob->inv_recursive
2259 2560
2260Returns the inventory of the object _and_ their inventories, recursively. 2561Returns the inventory of the object I<and> their inventories, recursively,
2562but I<not> the object itself.
2261 2563
2262=cut 2564=cut
2263 2565
2264sub inv_recursive_; 2566sub inv_recursive_;
2265sub inv_recursive_ { 2567sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2572 inv_recursive_ inv $_[0]
2271} 2573}
2272 2574
2273=item $ref = $ob->ref 2575=item $ref = $ob->ref
2274 2576
2275creates and returns a persistent reference to an objetc that can be stored as a string. 2577Creates and returns a persistent reference to an object that can be stored as a string.
2276 2578
2277=item $ob = cf::object::deref ($refstring) 2579=item $ob = cf::object::deref ($refstring)
2278 2580
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2581returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block. 2582even if the object actually exists. May block.
2312can be C<undef>. Does the right thing when the player is currently in a 2614can be C<undef>. Does the right thing when the player is currently in a
2313dialogue with the given NPC character. 2615dialogue with the given NPC character.
2314 2616
2315=cut 2617=cut
2316 2618
2619our $SAY_CHANNEL = {
2620 id => "say",
2621 title => "Map",
2622 reply => "say ",
2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2624};
2625
2626our $CHAT_CHANNEL = {
2627 id => "chat",
2628 title => "Chat",
2629 reply => "chat ",
2630 tooltip => "Player chat and shouts, global to the server.",
2631};
2632
2317# rough implementation of a future "reply" method that works 2633# rough implementation of a future "reply" method that works
2318# with dialog boxes. 2634# with dialog boxes.
2319#TODO: the first argument must go, split into a $npc->reply_to ( method 2635#TODO: the first argument must go, split into a $npc->reply_to ( method
2320sub cf::object::player::reply($$$;$) { 2636sub cf::object::player::reply($$$;$) {
2321 my ($self, $npc, $msg, $flags) = @_; 2637 my ($self, $npc, $msg, $flags) = @_;
2332 my $dialog = $pl->{npc_dialog}; 2648 my $dialog = $pl->{npc_dialog};
2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2649 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2334 2650
2335 } else { 2651 } else {
2336 $msg = $npc->name . " says: $msg" if $npc; 2652 $msg = $npc->name . " says: $msg" if $npc;
2337 $self->message ($msg, $flags); 2653 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2338 } 2654 }
2339 } 2655 }
2340} 2656}
2341 2657
2342=item $object->send_msg ($channel, $msg, $color, [extra...]) 2658=item $object->send_msg ($channel, $msg, $color, [extra...])
2367 2683
2368=item $player_object->enter_link 2684=item $player_object->enter_link
2369 2685
2370Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2371 2687
2372The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2373I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2374 2692
2375Will never block. 2693Will never block.
2376 2694
2377=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2378 2696
2398sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2399 my ($self) = @_; 2717 my ($self) = @_;
2400 2718
2401 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2402 2720
2721 ++$self->{_link_recursion};
2722
2403 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2404 2724
2405 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2406 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2407 2727
2408 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2409} 2729}
2410 2730
2411sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2412 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2413 2733
2430 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2431 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2432 2752
2433 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2434 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2435 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2436 2756
2437 $map->load; 2757 $map->load;
2438 $map->load_neighbours; 2758 $map->load_neighbours;
2439 2759
2440 return unless $self->contr->active; 2760 return unless $self->contr->active;
2441 $self->activate_recursive;
2442 2761
2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2444 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2445} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2446 2769
2770}
2771
2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2448 2773
2449Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2450her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2451that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2452the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process. 2778be called at the end of this process.
2454 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2455=cut 2783=cut
2456 2784
2457our $GOTOGEN; 2785our $GOTOGEN;
2458 2786
2459sub cf::object::player::goto { 2787sub cf::object::player::goto {
2460 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2461 2795
2462 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2464 2798
2465 $self->enter_link; 2799 $self->enter_link;
2485 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2486 } 2820 }
2487 } 2821 }
2488 2822
2489 my $map = eval { 2823 my $map = eval {
2490 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2491 2825
2492 if ($map) { 2826 if ($map) {
2493 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2494 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2495 } else { 2829 } else {
2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2497 } 2831 }
2498 2832
2499 $map 2833 $map
2507 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2508 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2509 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2510 } 2844 }
2511 2845
2512 $done->() if $done; 2846 $done->($self) if $done;
2513 })->prio (1); 2847 })->prio (1);
2514} 2848}
2515 2849
2516=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2517 2851
2537} 2871}
2538 2872
2539sub prepare_random_map { 2873sub prepare_random_map {
2540 my ($exit) = @_; 2874 my ($exit) = @_;
2541 2875
2542 my $guard = cf::lock_acquire "exit_prepare:$exit";
2543
2544 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2545 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2546 # that depends on the exit object 2878 # that depends on the exit object
2547 2879
2548 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2550 if ($exit->map) { 2882 if ($exit->map) {
2551 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2552 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2553 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2554 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2555 } 2889 }
2556 2890
2557 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2558 2892
2559 my $data = cf::to_json $rmp; 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2560 my $md5 = Digest::MD5::md5_hex $data; 2894 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2895 my $meta = "$RANDOMDIR/$md5.meta";
2562 2896
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2565 undef $fh; 2899 undef $fh;
2566 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2567 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2568 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2569 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2570 } 2908 }
2571} 2909}
2572 2910
2573sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2574 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2575 2913
2576 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2577 2915
2578 if ($exit->slaying eq "/!") {
2579 #TODO: this should de-fi-ni-te-ly not be a sync-job
2580 # the problem is that $exit might not survive long enough
2581 # so it needs to be done right now, right here
2582 cf::sync_job { prepare_random_map $exit };
2583 }
2584
2585 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2586 my $hp = $exit->stats->hp;
2587 my $sp = $exit->stats->sp;
2588
2589 $self->enter_link; 2916 $self->enter_link;
2590 2917
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2595 (async { 2918 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2919 $Coro::current->{desc} = "enter_exit";
2597 2920
2598 $self->deactivate_recursive; # just to be sure
2599 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2950
2600 $self->goto ($slaying, $hp, $sp); 2951 $self->goto ($map, $x, $y);
2601 2952
2953 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y)
2955 if $exit->flag (cf::FLAG_DAMNED);
2956
2602 1; 2957 1
2603 }) { 2958 }) {
2604 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2605 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2606 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2607 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2608 2963
2609 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2610 $self->leave_link; 2965 $self->leave_link;
2611 } 2966 }
2612 })->prio (1); 2967 })->prio (1);
2613} 2968}
2614 2969
2626sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2627 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2628 2983
2629 utf8::encode $text; 2984 utf8::encode $text;
2630 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt)
2989
2990Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required.
2992
2993=cut
2994
2995our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2996
2997sub cf::client::send_big_packet {
2998 my ($self, $pkt) = @_;
2999
3000 # try lzf for large packets
3001 $pkt = "lzf " . Compress::LZF::compress $pkt
3002 if 1024 <= length $pkt and $self->{can_lzf};
3003
3004 # split very large packets
3005 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3006 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3007 $pkt = "frag";
3008 }
3009
3010 $self->send_packet ($pkt);
2631} 3011}
2632 3012
2633=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2634 3014
2635Send a drawinfo or msg packet to the client, formatting the msg for the 3015Send a drawinfo or msg packet to the client, formatting the msg for the
2637the message, with C<log> being the default. If C<$color> is negative, suppress 3017the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet. 3018the message unless the client supports the msg packet.
2639 3019
2640=cut 3020=cut
2641 3021
3022# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2643 "c/identify" => { 3030 "c/identify" => {
2644 id => "infobox", 3031 id => "infobox",
2645 title => "Identify", 3032 title => "Identify",
2646 reply => undef, 3033 reply => undef,
2647 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
2650 id => "infobox", 3037 id => "infobox",
2651 title => "Examine", 3038 title => "Examine",
2652 reply => undef, 3039 reply => undef,
2653 tooltip => "Signs and other items you examined", 3040 tooltip => "Signs and other items you examined",
2654 }, 3041 },
3042 "c/shopinfo" => {
3043 id => "infobox",
3044 title => "Shop Info",
3045 reply => undef,
3046 tooltip => "What your bargaining skill tells you about the shop",
3047 },
3048 "c/book" => {
3049 id => "infobox",
3050 title => "Book",
3051 reply => undef,
3052 tooltip => "The contents of a note or book",
3053 },
2655 "c/lookat" => { 3054 "c/lookat" => {
2656 id => "infobox", 3055 id => "infobox",
2657 title => "Look", 3056 title => "Look",
2658 reply => undef, 3057 reply => undef,
2659 tooltip => "What you saw there", 3058 tooltip => "What you saw there",
2660 }, 3059 },
3060 "c/who" => {
3061 id => "infobox",
3062 title => "Players",
3063 reply => undef,
3064 tooltip => "Shows players who are currently online",
3065 },
3066 "c/body" => {
3067 id => "infobox",
3068 title => "Body Parts",
3069 reply => undef,
3070 tooltip => "Shows which body parts you posess and are available",
3071 },
3072 "c/statistics" => {
3073 id => "infobox",
3074 title => "Statistics",
3075 reply => undef,
3076 tooltip => "Shows your primary statistics",
3077 },
3078 "c/skills" => {
3079 id => "infobox",
3080 title => "Skills",
3081 reply => undef,
3082 tooltip => "Shows your experience per skill and item power",
3083 },
3084 "c/shopitems" => {
3085 id => "infobox",
3086 title => "Shop Items",
3087 reply => undef,
3088 tooltip => "Shows the items currently for sale in this shop",
3089 },
3090 "c/resistances" => {
3091 id => "infobox",
3092 title => "Resistances",
3093 reply => undef,
3094 tooltip => "Shows your resistances",
3095 },
3096 "c/pets" => {
3097 id => "infobox",
3098 title => "Pets",
3099 reply => undef,
3100 tooltip => "Shows information abotu your pets/a specific pet",
3101 },
3102 "c/perceiveself" => {
3103 id => "infobox",
3104 title => "Perceive Self",
3105 reply => undef,
3106 tooltip => "You gained detailed knowledge about yourself",
3107 },
3108 "c/uptime" => {
3109 id => "infobox",
3110 title => "Uptime",
3111 reply => undef,
3112 tooltip => "How long the server has been running since last restart",
3113 },
3114 "c/mapinfo" => {
3115 id => "infobox",
3116 title => "Map Info",
3117 reply => undef,
3118 tooltip => "Information related to the maps",
3119 },
3120 "c/party" => {
3121 id => "party",
3122 title => "Party",
3123 reply => "gsay ",
3124 tooltip => "Messages and chat related to your party",
3125 },
3126 "c/death" => {
3127 id => "death",
3128 title => "Death",
3129 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death",
3131 },
3132 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL,
2661); 3134);
2662 3135
2663sub cf::client::send_msg { 3136sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2665 3138
2666 $msg = $self->pl->expand_cfpod ($msg); 3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
2667 3141
2668 $color &= cf::NDI_CLIENT_MASK; # just in case... 3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669 3143
2670 # check predefined channels, for the benefit of C 3144 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) { 3145 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel}; 3146 $channel = $CHANNEL{$channel};
2673 3147
2674 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2678 3150
2679 } elsif (ref $channel) { 3151 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent 3152 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) { 3153 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel; 3154 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel) 3155 $self->ext_msg (channel_info => $channel);
2684 if $self->can_msg;
2685 } 3156 }
2686 3157
2687 $channel = $channel->{id}; 3158 $channel = $channel->{id};
2688 } 3159 }
2689 3160
2690 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2691 3162
2692 if ($self->can_msg) {
2693 # default colour, mask it out 3163 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF; 3165 if $color & cf::NDI_DEF;
2696 3166
2697 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3167 my $pkt = "msg "
3168 . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2699 } else { 3170 );
2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710 3171
2711 $color &= cf::NDI_COLOR_MASK; 3172 $self->send_big_packet ($pkt);
2712
2713 utf8::encode $msg;
2714
2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2718 } else {
2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2720 $self->send_packet ("drawinfo $color $msg")
2721 }
2722 }
2723 }
2724} 3173}
2725 3174
2726=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2727 3176
2728Sends an ext event to the client. 3177Sends an ext event to the client.
2731 3180
2732sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2733 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2734 3183
2735 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2738 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 } 3189 }
2741} 3190}
2742 3191
2743=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2744 3193
2748 3197
2749sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2751 3200
2752 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove 3204 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 } 3207 }
2759} 3208}
2760 3209
2761=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2762 3211
2833 3282
2834 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
2835 if $reply; 3284 if $reply;
2836 3285
2837 } else { 3286 } else {
2838 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2839 } 3288 }
2840 3289
2841 cf::override; 3290 cf::override;
2842 }, 3291 },
2843); 3292);
2863 3312
2864 $coro 3313 $coro
2865} 3314}
2866 3315
2867cf::client->attach ( 3316cf::client->attach (
2868 on_destroy => sub { 3317 on_client_destroy => sub {
2869 my ($ns) = @_; 3318 my ($ns) = @_;
2870 3319
2871 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2872 }, 3321 },
2873); 3322);
2889our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
2890 3339
2891$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
2892 3341
2893$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
2895 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
2896 sort time 3345 sort time
2897)); 3346));
2898 3347
2899# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
2902 3351
2903The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
2904 3353
2905 cf::object 3354 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy 3355 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr 3356 insert remove name archname title slaying race decrease split
3357 value
2908 3358
2909 cf::object::player 3359 cf::object::player
2910 player 3360 player
2911 3361
2912 cf::player 3362 cf::player
2917 3367
2918=cut 3368=cut
2919 3369
2920for ( 3370for (
2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3371 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race 3372 insert remove inv nrof name archname title slaying race
2923 decrease_ob_nr destroy)], 3373 decrease split destroy change_exp value msg lore send_msg)],
2924 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
2925 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
2926 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
2927) { 3377) {
2928 no strict 'refs';
2929 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
2930 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2931 for @funs; 3380 for @funs;
2932} 3381}
2933 3382
2948 3397
2949 my $qcode = $code; 3398 my $qcode = $code;
2950 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2951 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
2952 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
2953 local $_; 3405 local $_;
2954 local @safe::cf::_safe_eval_args = values %vars;
2955 3406
2956 my $eval = 3407 my $eval =
2957 "do {\n" 3408 "do {\n"
2958 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2959 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
2960 . $code 3411 . $code
2961 . "\n}" 3412 . "\n}"
2962 ; 3413 ;
2963 3414
3415 if ($CFG{safe_eval}) {
2964 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
2965 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2966 sub_generation_inc; 3419 sub_generation_inc;
3420 } else {
3421 local @cf::_safe_eval_args = values %vars;
3422 @res = wantarray ? eval eval : scalar eval $eval;
3423 }
2967 3424
2968 if ($@) { 3425 if ($@) {
2969 warn "$@"; 3426 warn "$@",
2970 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
2971 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
2972 } 3429 }
2973 3430
2974 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
2975} 3432}
2976 3433
2990=cut 3447=cut
2991 3448
2992sub register_script_function { 3449sub register_script_function {
2993 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
2994 3451
2995 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
2996 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
2997} 3454}
2998 3455
2999=back 3456=back
3000 3457
3001=cut 3458=cut
3010 # for this (global event?) 3467 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3012 3469
3013 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3014 3471
3015 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3016 3473
3017 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3018 0 < aio_load $path, $facedata
3019 or die "$path: $!";
3020
3021 $facedata = Coro::Storable::thaw $facedata;
3022 3475
3023 $facedata->{version} == 2 3476 $facedata->{version} == 2
3024 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3025 3478
3026 # patch in the exptable 3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3027 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC, 3482 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3030 }; 3485 };
3031 cf::cede_to_tick; 3486 cf::cede_to_tick;
3032 3487
3033 { 3488 {
3034 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
3035 3490
3036 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493
3038 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3042 3499
3043 cf::cede_to_tick; 3500 cf::cede_to_tick;
3044 } 3501 }
3045 3502
3046 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3504 next unless $info->{smooth};
3505
3048 my $idx = cf::face::find $face 3506 my $idx = cf::face::find $face
3049 or next; 3507 or next;
3508
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3512 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3055 } 3514 }
3056 3515
3057 cf::cede_to_tick; 3516 cf::cede_to_tick;
3058 } 3517 }
3059 } 3518 }
3068 3527
3069 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3070 } 3529 }
3071 3530
3072 { 3531 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3076 3533
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082 3537
3083 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3084 # prepend meta info 3539 cf::face::set_type $idx, $info->{type};
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else { 3540 } else {
3093 $data = $info->{data}; 3541 $RESOURCE{$name} = $info; # unused
3094 } 3542 }
3095 3543
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3544 cf::cede_to_tick;
3100 } 3545 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3546 }
3547
3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3549
3121 1 3550 1
3122} 3551}
3123 3552
3124register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3126 3555
3127 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v); 3557 $ns->fx_want ($k, $v);
3129 } 3558 }
3130}; 3559};
3560
3561sub load_resource_file($) {
3562 my $guard = lock_acquire "load_resource_file";
3563
3564 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100;
3566 cf::arch::commit_load;
3567
3568 $status
3569}
3131 3570
3132sub reload_regions { 3571sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework 3572 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?) 3573 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = (); 3574 %ext::player_env::MUSIC_FACE_CACHE = ();
3149} 3588}
3150 3589
3151sub reload_archetypes { 3590sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes" 3591 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n"; 3592 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
3159} 3593}
3160 3594
3161sub reload_treasures { 3595sub reload_treasures {
3162 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3163 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3164} 3598}
3165 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3166sub reload_resources { 3620sub reload_resources {
3167 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3168 3622
3623 reload_exp_table;
3624 reload_materials;
3625 reload_facedata;
3626 reload_sound;
3627 reload_archetypes;
3169 reload_regions; 3628 reload_regions;
3170 reload_facedata;
3171 #reload_archetypes;#d#
3172 reload_archetypes;
3173 reload_treasures; 3629 reload_treasures;
3174 3630
3175 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3176}
3177
3178sub init {
3179 reload_resources;
3180} 3632}
3181 3633
3182sub reload_config { 3634sub reload_config {
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3184 or return;
3185 3636
3186 local $/; 3637 my $config = load_file "$CONFDIR/config";
3187 *CFG = YAML::Syck::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3188 3640
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3190 3642
3191 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3192 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3193 3645
3194 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
3198 }; 3650 };
3199 warn $@ if $@; 3651 warn $@ if $@;
3200 } 3652 }
3201} 3653}
3202 3654
3655sub pidfile() {
3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3657 or die "$PIDFILE: $!";
3658 flock $fh, &Fcntl::LOCK_EX
3659 or die "$PIDFILE: flock: $!";
3660 $fh
3661}
3662
3663# make sure only one server instance is running at any one time
3664sub atomic {
3665 my $fh = pidfile;
3666
3667 my $pid = <$fh>;
3668 kill 9, $pid if $pid > 0;
3669
3670 seek $fh, 0, 0;
3671 print $fh $$;
3672}
3673
3674sub main_loop {
3675 trace "EV::loop starting\n";
3676 if (1) {
3677 EV::loop;
3678 }
3679 trace "EV::loop returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP;
3681}
3682
3203sub main { 3683sub main {
3684 cf::init_globals; # initialise logging
3685
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692
3204 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3207 (async { 3696 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3698 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
3211 }; 3700 };
3212 3701
3702 evthread_start IO::AIO::poll_fileno;
3703
3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3711 cf::load_settings;
3712
3713 reload_resources;
3213 reload_config; 3714 reload_config;
3214 db_init; 3715 db_init;
3716
3717 cf::init_uuid;
3718 cf::init_signals;
3719 cf::init_skills;
3720
3721 cf::init_beforeplay;
3722
3723 atomic;
3724
3215 load_extensions; 3725 load_extensions;
3216 3726
3217 $TICK_WATCHER->start; 3727 utime time, time, $RUNTIMEFILE;
3218 Event::loop; 3728
3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3732
3733 cf::_post_init 0;
3734 };
3735
3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3744 goto &main_loop;
3219} 3745}
3220 3746
3221############################################################################# 3747#############################################################################
3222# initialisation and cleanup 3748# initialisation and cleanup
3223 3749
3224# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3225BEGIN { 3751BEGIN {
3752 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3234 },
3235 ); 3756 };
3236 } 3757 }
3237} 3758}
3238 3759
3239sub write_runtime { 3760sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime"; 3761 my $t0 = AE::time;
3241 3762
3242 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3244 3765
3245 IO::AIO::aio_utime $runtime, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3246 3767
3247 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3248 3769
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3250 or return; 3771 or return;
3251 3772
3252 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3264 aio_utime $fh, undef, undef; 3785 aio_utime $fh, undef, undef;
3265 3786
3266 close $fh 3787 close $fh
3267 or return; 3788 or return;
3268 3789
3269 aio_rename "$runtime~", $runtime 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3270 and return; 3791 and return;
3271 3792
3272 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3273 3794
3274 1 3795 1
3796}
3797
3798our $uuid_lock;
3799our $uuid_skip;
3800
3801sub write_uuid_sync($) {
3802 $uuid_skip ||= $_[0];
3803
3804 return if $uuid_lock;
3805 local $uuid_lock = 1;
3806
3807 my $uuid = "$LOCALDIR/uuid";
3808
3809 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3810 or return;
3811
3812 my $value = uuid_seq uuid_cur;
3813
3814 unless ($value) {
3815 info "cowardly refusing to write zero uuid value!\n";
3816 return;
3817 }
3818
3819 my $value = uuid_str $value + $uuid_skip;
3820 $uuid_skip = 0;
3821
3822 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3823 and return;
3824
3825 # always fsync - this file is important
3826 aio_fsync $fh
3827 and return;
3828
3829 close $fh
3830 or return;
3831
3832 aio_rename "$uuid~", $uuid
3833 and return;
3834
3835 trace "uuid file written ($value).\n";
3836
3837 1
3838
3839}
3840
3841sub write_uuid($$) {
3842 my ($skip, $sync) = @_;
3843
3844 $sync ? write_uuid_sync $skip
3845 : async { write_uuid_sync $skip };
3275} 3846}
3276 3847
3277sub emergency_save() { 3848sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3279 3850
3280 warn "enter emergency perl save\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3281 3857
3282 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3283 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3284 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3285 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3286 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3287 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3288 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3289 $pl->valid or next; 3867 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3291 $pl->save; 3869 $pl->save;
3292 } 3870 }
3293 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
3294 3872
3295 warn "begin emergency map save\n"; 3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3875 info "emergency_perl_save: begin map save\n";
3296 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3297 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3298 $map->valid or next; 3878 $map->valid or next;
3299 $map->save; 3879 $map->save;
3300 } 3880 }
3301 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
3302 3882
3303 warn "begin emergency database checkpoint\n"; 3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3885 info "emergency_perl_save: begin database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3305 warn "end emergency database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3888
3889 info "emergency_perl_save: begin write uuid\n";
3890 write_uuid_sync 1;
3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3306 }; 3911 };
3307 3912
3308 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
3309} 3914}
3310 3915
3311sub post_cleanup { 3916sub post_cleanup {
3312 my ($make_core) = @_; 3917 my ($make_core) = @_;
3313 3918
3919 IO::AIO::flush;
3920
3314 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3315 if $make_core; 3922 if $make_core;
3923
3924 my $fh = pidfile;
3925 unlink $PIDFILE if <$fh> == $$;
3926}
3927
3928# a safer delete_package, copied from Symbol
3929sub clear_package($) {
3930 my $pkg = shift;
3931
3932 # expand to full symbol table name if needed
3933 unless ($pkg =~ /^main::.*::$/) {
3934 $pkg = "main$pkg" if $pkg =~ /^::/;
3935 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3936 $pkg .= '::' unless $pkg =~ /::$/;
3937 }
3938
3939 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3940 my $stem_symtab = *{$stem}{HASH};
3941
3942 defined $stem_symtab and exists $stem_symtab->{$leaf}
3943 or return;
3944
3945 # clear all symbols
3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3947 for my $name (keys %$leaf_symtab) {
3948 _gv_clear *{"$pkg$name"};
3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3950 }
3316} 3951}
3317 3952
3318sub do_reload_perl() { 3953sub do_reload_perl() {
3319 # can/must only be called in main 3954 # can/must only be called in main
3320 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3321 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3322 return; 3957 return;
3323 } 3958 }
3324 3959
3325 warn "reloading..."; 3960 return if $RELOAD++;
3326 3961
3327 warn "entering sync_job"; 3962 my $t1 = AE::time;
3328 3963
3964 while ($RELOAD) {
3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3967
3968 trace "perl_reload: entering sync_job";
3969
3329 cf::sync_job { 3970 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark
3331 cf::emergency_save; 3971 #cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark
3333 3972
3334 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV;
3336
3337 # if anything goes wrong in here, we should simply crash as we already saved
3338
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests";
3345 for (;;) {
3346 BDB::flush;
3347 IO::AIO::flush;
3348 Coro::cede;
3349 last unless IO::AIO::nreqs || BDB::nreqs;
3350 warn "iterate...";
3351 }
3352
3353 ++$RELOAD;
3354
3355 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3356 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3357 %EXT_CORO = (); 3975 %EXT_CORO = ();
3358 3976
3359 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3360 %COMMAND = (); 3978 %COMMAND = ();
3361 3979
3362 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3363 %EXTCMD = (); 3981 %EXTCMD = ();
3364 %EXTICMD = (); 3982 %EXTICMD = ();
3365 3983
3366 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3367 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3368 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3369 3987
3370 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3371 eval { 3989 eval {
3372 $cb->($pkg); 3990 $cb->($pkg);
3373 1 3991 1
3374 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3993 }
3994
3995 trace "... clearing $pkg";
3996 clear_package $pkg;
3375 } 3997 }
3376 3998
3377 warn "... nuking $pkg";
3378 Symbol::delete_package $pkg;
3379 }
3380
3381 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3382 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3383 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3384 4002
3385 warn "... unloading $k"; 4003 trace "... unloading $k";
3386 delete $INC{$k}; 4004 delete $INC{$k};
3387 4005
3388 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3389 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3390 4008
3391 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
3392 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
3393 } 4014 }
3394 4015
3395 Symbol::delete_package $k;
3396 }
3397
3398 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3399 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
3400 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3401 4019
3402 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3403 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3404 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3405 4023
3406 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3407 # and global variables created in xs 4025 # and global variables created in xs
3408 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3409 4027
3410 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3411 4029
3412 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3413 require cf; 4031 require cf;
3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3415 4033
3416 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3417 cf::reload_config; 4035 cf::reload_config;
3418 4036
3419 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3420 cf::load_extensions; 4038 cf::load_extensions;
3421 4039
4040 if ($REATTACH_ON_RELOAD) {
3422 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3423 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3424 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3425 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3426 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3427 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
3428 4048
3429 warn "leaving sync_job"; 4049 cf::_post_init 1;
3430 4050
4051 trace "perl_reload: leaving sync_job";
4052
3431 1 4053 1
3432 } or do { 4054 } or do {
3433 warn $@; 4055 error $@;
3434 warn "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3435 exit 1; 4057 };
4058
4059 --$RELOAD;
3436 }; 4060 }
3437 4061
3438 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
3439}; 4064};
3440 4065
3441our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3442 4067
3443sub reload_perl() { 4068sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3446 4071
3447 $RELOAD_WATCHER ||= Event->timer ( 4072 $RELOAD_WATCHER ||= cf::async {
3448 reentrant => 0, 4073 Coro::AIO::aio_wait cache_extensions;
3449 after => 0, 4074
3450 data => WF_AUTOCANCEL, 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3451 cb => sub {
3452 do_reload_perl; 4076 do_reload_perl;
3453 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3454 }, 4078 };
3455 ); 4079 };
3456} 4080}
3457 4081
3458register_command "reload" => sub { 4082register_command "reload" => sub {
3459 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
3460 4084
3465 reload_perl; 4089 reload_perl;
3466 }; 4090 };
3467 } 4091 }
3468}; 4092};
3469 4093
3470unshift @INC, $LIBDIR; 4094#############################################################################
3471 4095
3472my $bug_warning = 0; 4096my $bug_warning = 0;
3473 4097
3474our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3476 4100
3477sub wait_for_tick { 4101sub wait_for_tick() {
3478 return unless $TICK_WATCHER->is_active;
3479 return if $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3480 4103
3481 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 4106 $signal->wait;
3484} 4107}
3485 4108
3486sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3487 return unless $TICK_WATCHER->is_active;
3488 return if $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3489 4111
3490 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 4114 $signal->wait;
3493} 4115}
3494 4116
3495$TICK_WATCHER = Event->timer ( 4117sub tick {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 4118 if ($Coro::current != $Coro::main) {
3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3504 unless ++$bug_warning > 10; 4120 unless ++$bug_warning > 10;
3505 return; 4121 return;
3506 } 4122 }
3507 4123
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3511 4125
3512 $RUNTIME += $TICK; 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3513 $NEXT_TICK += $TICK;
3514 4127
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 4130 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 4132 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3521 };
3522 } 4134 };
4135 }
3523 4136
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 4138 $sig->send;
3526 } 4139 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 4140 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 4141 $sig->send;
3529 } 4142 }
3530 4143
3531 $NOW = Event::time; 4144 $LOAD = ($NOW - $TICK_START) / $TICK;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 4146
3542 _post_tick; 4147 if (0) {
4148 if ($NEXT_TICK) {
4149 my $jitter = $TICK_START - $NEXT_TICK;
4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4151 debug "jitter $JITTER\n";#d#
4152 }
3543 }, 4153 }
3544); 4154}
3545 4155
3546{ 4156{
4157 # configure BDB
4158
3547 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3548 BDB::max_poll_time $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 4161 $AnyEvent::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 4162
3573 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3576 | BDB::LOG_AUTOREMOVE, 1); 4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4167 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4168 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4169 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3579 4170
3580 cf::sync_job { 4171 cf::sync_job {
3581 eval { 4172 eval {
3591 4182
3592 cf::cleanup "db_env_open(db): $@" if $@; 4183 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 4184 };
3594 } 4185 }
3595 4186
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 4187 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4188 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 4189 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4190 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 4192 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 4195 };
3626} 4196}
3627 4197
3628{ 4198{
4199 # configure IO::AIO
4200
3629 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 4203 undef $AnyEvent::AIO::WATCHER;
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 4204}
3642 4205
3643my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3644 4208
3645sub _log_backtrace { 4209sub _log_backtrace {
3646 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3647 4211
3648 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3649 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3650 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3651 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3652 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3653 async { 4222 async {
3654 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3655 4224
3656 my @bt = fork_call { 4225 my @bt = fork_call {
3657 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3668 } 4237 }
3669 4238
3670 @funcs 4239 @funcs
3671 }; 4240 };
3672 4241
3673 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3674 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3675 --$_log_backtrace; 4245 --$_log_backtrace;
3676 }; 4246 };
3677 } else { 4247 } else {
3678 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3679 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3680 } 4250 }
3681} 4251}
3682 4252
3683# load additional modules 4253# load additional modules
3684use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3685 4256
3686END { cf::emergency_save } 4257END { cf::emergency_save }
3687 4258
36881 42591
3689 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines