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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.563 by root, Sat Apr 23 04:56:51 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines