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.560 by root, Fri Apr 22 02:03:12 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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 }
1275 } 1561 }
1276 }; 1562 };
1277} 1563}
1278 1564
1279############################################################################# 1565#############################################################################
1280 1566
1281=back 1567=back
1282 1568
1283=head2 CORE EXTENSIONS 1569=head2 CORE EXTENSIONS
1284 1570
1285Functions and methods that extend core crossfire objects. 1571Functions and methods that extend core deliantra objects.
1286 1572
1287=cut 1573=cut
1288 1574
1289package cf::player; 1575package cf::player;
1290 1576
1333 1619
1334sub exists($) { 1620sub exists($) {
1335 my ($login) = @_; 1621 my ($login) = @_;
1336 1622
1337 $cf::PLAYER{$login} 1623 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1624 or !aio_stat path $login
1339} 1625}
1340 1626
1341sub find($) { 1627sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1628 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1629 my $login = $_[0];
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1639 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1640
1355 my $f = new_from_file cf::object::thawer path $login 1641 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1642 or return;
1357 1643
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1644 my $pl = cf::player::load_pl $f
1360 or return; 1645 or return;
1646
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1647 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1648 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1364 } 1650 }
1365 } 1651 }
1366} 1652}
1367 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1368sub save($) { 1667sub save($) {
1369 my ($pl) = @_; 1668 my ($pl) = @_;
1370 1669
1371 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1372 1671
1375 1674
1376 return if $pl->{deny_save}; 1675 return if $pl->{deny_save};
1377 1676
1378 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1379 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1679
1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1380 1684
1381 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1686 cf::cede_to_tick;
1383} 1687}
1384 1688
1416 my ($pl) = @_; 1720 my ($pl) = @_;
1417 1721
1418 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1419 1723
1420 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1421 $pl->password ("*"); # this should lock out the player until we nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1422 1726
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1424 $pl->deactivate; 1728 $pl->deactivate;
1729
1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1426 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1427 1735
1428 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1430 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1468 1776
1469 for my $login (@$dirs) { 1777 for my $login (@$dirs) {
1470 my $path = path $login; 1778 my $path = path $login;
1471 1779
1472 # a .pst is a dead give-away for a valid player 1780 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1781 # if no pst file found, open and chekc for blocked users
1782 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1783 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1784 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1785 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1786 }
1478 1787
1482 1791
1483 \@logins 1792 \@logins
1484} 1793}
1485 1794
1486=item $player->maps 1795=item $player->maps
1796
1797=item cf::player::maps $login
1487 1798
1488Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1489player. May block. 1800player. May block.
1490 1801
1491=cut 1802=cut
1509 } 1820 }
1510 1821
1511 \@paths 1822 \@paths
1512} 1823}
1513 1824
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1825=item $protocol_xml = $player->expand_cfpod ($cfpod)
1515 1826
1516Expand crossfire pod fragments into protocol xml. 1827Expand 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 1828
1565=item $player->ext_reply ($msgid, @msg) 1829=item $player->ext_reply ($msgid, @msg)
1566 1830
1567Sends an ext reply to the player. 1831Sends an ext reply to the player.
1568 1832
1600 1864
1601=cut 1865=cut
1602 1866
1603sub find_by_path($) { 1867sub find_by_path($) {
1604 my ($path) = @_; 1868 my ($path) = @_;
1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1605 1871
1606 my ($match, $specificity); 1872 my ($match, $specificity);
1607 1873
1608 for my $region (list) { 1874 for my $region (list) {
1609 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1635our $MAX_RESET = 3600; 1901our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1902our $DEFAULT_RESET = 3000;
1637 1903
1638sub generate_random_map { 1904sub generate_random_map {
1639 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1640 # mit "rum" bekleckern, nicht 1906
1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1908
1641 $self->_create_random_map ( 1909 $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} 1910}
1655 1911
1656=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1657 1913
1658Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
1663 1919
1664sub register { 1920sub register {
1665 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1666 my $pkg = caller; 1922 my $pkg = caller;
1667 1923
1668 no strict;
1669 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1670 1925
1671 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1672} 1927}
1673 1928
1674# also paths starting with '/' 1929# also paths starting with '/'
1675$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1676 1931
1677sub thawer_merge { 1932sub thawer_merge {
1678 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1679 1934
1680 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1685} 1940}
1686 1941
1687sub normalise { 1942sub normalise {
1688 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1689 1944
1690 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1691 1946
1692 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1693 1948
1694 # map plan: 1949 # map plan:
1695 # 1950 #
1710 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1711 $path = "$base/$path"; 1966 $path = "$base/$path";
1712 } 1967 }
1713 1968
1714 for ($path) { 1969 for ($path) {
1715 redo if s{//}{/};
1716 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1717 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1718 } 1972 }
1719 1973
1720 $path 1974 $path
1734 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1735 return $self; 1989 return $self;
1736 } 1990 }
1737 } 1991 }
1738 1992
1739 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1740 () 1994 ()
1741} 1995}
1742 1996
1743sub init { 1997sub init {
1744 my ($self) = @_; 1998 my ($self) = @_;
1766 2020
1767# the temporary/swap location 2021# the temporary/swap location
1768sub save_path { 2022sub save_path {
1769 my ($self) = @_; 2023 my ($self) = @_;
1770 2024
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2025 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 2026 "$TMPDIR/$path.map"
1773} 2027}
1774 2028
1775# the unique path, undef == no special unique path 2029# the unique path, undef == no special unique path
1776sub uniq_path { 2030sub uniq_path {
1777 my ($self) = @_; 2031 my ($self) = @_;
1778 2032
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 2034 "$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} 2035}
1791 2036
1792sub decay_objects { 2037sub decay_objects {
1793 my ($self) = @_; 2038 my ($self) = @_;
1794 2039
1876 2121
1877sub find; 2122sub find;
1878sub find { 2123sub find {
1879 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
1880 2125
2126 cf::cede_to_tick;
2127
1881 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1882 2129
1883 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1885 2132
1886 $cf::MAP{$path} || do { 2133 $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 2134 my $map = new_from_path cf::map $path
1891 or return; 2135 or return;
1892 2136
1893 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
1894 2138
1896 or return; 2140 or return;
1897 2141
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2142 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2143 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2144 #$cf::WAIT_FOR_TICK->wait;
2145 undef $guard2;
1901 undef $guard1; 2146 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2147 $map->reset;
1904 return find $path; 2148 return find $path;
1905 } 2149 }
1906 2150
1907 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1908 } 2152 }
1909} 2153}
1910 2154
1911sub pre_load { } 2155sub pre_load { }
1912sub post_load { } 2156#sub post_load { } # XS
1913 2157
1914sub load { 2158sub load {
1915 my ($self) = @_; 2159 my ($self) = @_;
1916 2160
1917 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2178 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2179 $f->skip_block;
1936 $self->_load_objects ($f) 2180 $self->_load_objects ($f)
1937 or return; 2181 or return;
1938 2182
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2183 $self->post_load_original
1940 if delete $self->{load_original}; 2184 if delete $self->{load_original};
1941 2185
1942 if (my $uniq = $self->uniq_path) { 2186 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2187 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2188 unless (aio_stat $uniq) {
1962 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
1963 $self->decay_objects; 2207 $self->decay_objects;
1964 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
1965 $self->update_buttons; 2209 $self->update_buttons;
1966 cf::cede_to_tick; 2210 cf::cede_to_tick;
1967 $self->set_darkness_map;
1968 cf::cede_to_tick;
1969 $self->activate; 2211 $self->activate;
1970 } 2212 }
1971 2213
1972 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
1974 2216
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2217 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2218 }
1977 2219
1978 $self->post_load; 2220 $self->post_load;
1979}
1980 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
1981sub customise_for { 2228sub customise_for {
1982 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
1983 2230
1984 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
1985 if $self->per_player; 2232 if $self->per_player;
2001 or next; 2248 or next;
2002 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2003 or next; 2250 or next;
2004 $neigh->load; 2251 $neigh->load;
2005 2252
2253 # now find the diagonal neighbours
2006 push @neigh, 2254 push @neigh,
2007 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2008 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2009 } 2257 }
2010 2258
2017} 2265}
2018 2266
2019sub find_sync { 2267sub find_sync {
2020 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2021 2269
2022 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2023} 2274}
2024 2275
2025sub do_load_sync { 2276sub do_load_sync {
2026 my ($map) = @_; 2277 my ($map) = @_;
2027 2278
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2030 2281
2031 cf::sync_job { $map->load }; 2282 $map->load;
2032} 2283}
2033 2284
2034our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2035our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2036 2287
2038 my ($path, $origin, $load) = @_; 2289 my ($path, $origin, $load) = @_;
2039 2290
2040 $path = normalise $path, $origin && $origin->{path}; 2291 $path = normalise $path, $origin && $origin->{path};
2041 2292
2042 if (my $map = $cf::MAP{$path}) { 2293 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2295 }
2045 2296
2046 $MAP_PREFETCH{$path} |= $load; 2297 $MAP_PREFETCH{$path} |= $load;
2047 2298
2048 $MAP_PREFETCHER ||= cf::async { 2299 $MAP_PREFETCHER ||= cf::async {
2300 $Coro::current->{desc} = "map prefetcher";
2301
2049 while (%MAP_PREFETCH) { 2302 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2303 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2304 if (my $map = find $k) {
2052 $map->load if $v; 2305 $map->load if $v;
2053 } 2306 }
2060 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2061 2314
2062 () 2315 ()
2063} 2316}
2064 2317
2318# common code, used by both ->save and ->swapout
2065sub save { 2319sub _save {
2066 my ($self) = @_; 2320 my ($self) = @_;
2067
2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
2069 2321
2070 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2071 2323
2072 return unless $self->dirty; 2324 return unless $self->dirty;
2073 2325
2079 return if $self->{deny_save}; 2331 return if $self->{deny_save};
2080 2332
2081 local $self->{last_access} = $self->last_access;#d# 2333 local $self->{last_access} = $self->last_access;#d#
2082 2334
2083 cf::async { 2335 cf::async {
2336 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2337 $_->contr->save for $self->players;
2085 }; 2338 };
2339
2340 cf::get_slot 0.02;
2086 2341
2087 if ($uniq) { 2342 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2343 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2344 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2345 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2092 } 2347 }
2093} 2348}
2094 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2095sub swap_out { 2358sub swap_out {
2096 my ($self) = @_; 2359 my ($self) = @_;
2097 2360
2098 # save first because save cedes
2099 $self->save;
2100
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2362
2363 return if $self->in_memory != cf::MAP_ACTIVE;
2364 return if $self->{deny_save};
2103 return if $self->players; 2365 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2105 return if $self->{deny_save};
2106 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2107 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2108 2417
2109 $self->deactivate; 2418 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2111 $self->clear; 2420 $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 2421
2157 $self->unlink_save; 2422 $self->unlink_save;
2158 $self->destroy; 2423 $self->destroy;
2159} 2424}
2160 2425
2168 2433
2169 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2170 2435
2171 $self->unlink_save; 2436 $self->unlink_save;
2172 2437
2173 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2174 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2175 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2176 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2178 2443
2227 2492
2228sub unique_maps() { 2493sub unique_maps() {
2229 [ 2494 [
2230 map { 2495 map {
2231 utf8::decode $_; 2496 utf8::decode $_;
2232 /\.map$/ 2497 s/\.map$//; # TODO future compatibility hack
2498 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2499 ? ()
2233 ? normalise $_ 2500 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2502 ]
2237} 2503}
2238 2504
2239package cf; 2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2240 2536
2241=back 2537=back
2242 2538
2243=head3 cf::object 2539=head3 cf::object
2244 2540
2248 2544
2249=over 4 2545=over 4
2250 2546
2251=item $ob->inv_recursive 2547=item $ob->inv_recursive
2252 2548
2253Returns the inventory of the object _and_ their inventories, recursively. 2549Returns the inventory of the object I<and> their inventories, recursively,
2550but I<not> the object itself.
2254 2551
2255=cut 2552=cut
2256 2553
2257sub inv_recursive_; 2554sub inv_recursive_;
2258sub inv_recursive_ { 2555sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2560 inv_recursive_ inv $_[0]
2264} 2561}
2265 2562
2266=item $ref = $ob->ref 2563=item $ref = $ob->ref
2267 2564
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2565Creates and returns a persistent reference to an object that can be stored as a string.
2269 2566
2270=item $ob = cf::object::deref ($refstring) 2567=item $ob = cf::object::deref ($refstring)
2271 2568
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2569returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2570even if the object actually exists. May block.
2275=cut 2572=cut
2276 2573
2277sub deref { 2574sub deref {
2278 my ($ref) = @_; 2575 my ($ref) = @_;
2279 2576
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2577 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2578 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2579 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2580 or return;
2287 $pl->ob->uuid eq $uuid 2581 $pl->ob->uuid eq $uuid
2288 or return; 2582 or return;
2308can be C<undef>. Does the right thing when the player is currently in a 2602can be C<undef>. Does the right thing when the player is currently in a
2309dialogue with the given NPC character. 2603dialogue with the given NPC character.
2310 2604
2311=cut 2605=cut
2312 2606
2607our $SAY_CHANNEL = {
2608 id => "say",
2609 title => "Map",
2610 reply => "say ",
2611 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2612};
2613
2614our $CHAT_CHANNEL = {
2615 id => "chat",
2616 title => "Chat",
2617 reply => "chat ",
2618 tooltip => "Player chat and shouts, global to the server.",
2619};
2620
2313# rough implementation of a future "reply" method that works 2621# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2622# with dialog boxes.
2315#TODO: the first argument must go, split into a $npc->reply_to ( method 2623#TODO: the first argument must go, split into a $npc->reply_to ( method
2316sub cf::object::player::reply($$$;$) { 2624sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2625 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2636 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2637 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330 2638
2331 } else { 2639 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2640 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2641 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2642 }
2335 } 2643 }
2336} 2644}
2337 2645
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2646=item $object->send_msg ($channel, $msg, $color, [extra...])
2363 2671
2364=item $player_object->enter_link 2672=item $player_object->enter_link
2365 2673
2366Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2367 2675
2368The player should be reasonably safe there for short amounts of time. You 2676The player should be reasonably safe there for short amounts of time (e.g.
2369I<MUST> call C<leave_link> as soon as possible, though. 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2678though, as the player cannot control the character while it is on the link
2679map.
2370 2680
2371Will never block. 2681Will never block.
2372 2682
2373=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2374 2684
2394sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2395 my ($self) = @_; 2705 my ($self) = @_;
2396 2706
2397 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2398 2708
2709 ++$self->{_link_recursion};
2710
2399 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2400 2712
2401 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2402 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2403 2715
2404 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2405} 2717}
2406 2718
2407sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2408 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2409 2721
2426 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2427 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2428 2740
2429 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2430 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2431 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2432 2744
2433 $map->load; 2745 $map->load;
2434 $map->load_neighbours; 2746 $map->load_neighbours;
2435 2747
2436 return unless $self->contr->active; 2748 return unless $self->contr->active;
2437 $self->activate_recursive;
2438 2749
2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2440 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2441} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2442 2757
2758}
2759
2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2444 2761
2445Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2446her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2447that has to return the map if sucecssful, and then unfreezes the player on 2764that 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 2765the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process. 2766be called at the end of this process.
2450 2767
2768Note that $check will be called with a potentially non-loaded map, so if
2769it needs a loaded map it has to call C<< ->load >>.
2770
2451=cut 2771=cut
2452 2772
2453our $GOTOGEN; 2773our $GOTOGEN;
2454 2774
2455sub cf::object::player::goto { 2775sub cf::object::player::goto {
2456 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2457 2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2783
2458 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2786
2461 $self->enter_link; 2787 $self->enter_link;
2462 2788
2463 (async { 2789 (async {
2790 $Coro::current->{desc} = "player::goto $path $x $y";
2791
2464 # *tag paths override both path and x|y 2792 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2793 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2794 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2795 my $ob = $obs[rand @obs];
2468 2796
2483 my $map = eval { 2811 my $map = eval {
2484 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2485 2813
2486 if ($map) { 2814 if ($map) {
2487 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2489 } else { 2817 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 } 2819 }
2492 2820
2493 $map 2821 $map
2501 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2503 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2504 } 2832 }
2505 2833
2506 $done->() if $done; 2834 $done->($self) if $done;
2507 })->prio (1); 2835 })->prio (1);
2508} 2836}
2509 2837
2510=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2511 2839
2531} 2859}
2532 2860
2533sub prepare_random_map { 2861sub prepare_random_map {
2534 my ($exit) = @_; 2862 my ($exit) = @_;
2535 2863
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2864 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2865 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2866 # that depends on the exit object
2541 2867
2542 my $rmp = parse_random_map_params $exit->msg; 2868 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2870 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2871 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2872 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2873 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2874 $rmp->{origin_y} = $exit->y;
2875
2876 $exit->map->touch;
2549 } 2877 }
2550 2878
2551 $rmp->{random_seed} ||= $exit->random_seed; 2879 $rmp->{random_seed} ||= $exit->random_seed;
2552 2880
2553 my $data = cf::to_json $rmp; 2881 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2882 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2883 my $meta = "$RANDOMDIR/$md5.meta";
2556 2884
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2885 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2886 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2887 undef $fh;
2560 aio_rename "$meta~", $meta; 2888 aio_rename "$meta~", $meta;
2561 2889
2890 my $slaying = "?random/$md5";
2891
2892 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2893 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2894 $exit->msg (undef);
2895 }
2564 } 2896 }
2565} 2897}
2566 2898
2567sub cf::object::player::enter_exit { 2899sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2900 my ($self, $exit) = @_;
2569 2901
2570 return unless $self->type == cf::PLAYER; 2902 return unless $self->type == cf::PLAYER;
2571 2903
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; 2904 $self->enter_link;
2584 2905
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 { 2906 (async {
2590 $self->deactivate_recursive; # just to be sure 2907 $Coro::current->{desc} = "enter_exit";
2908
2591 unless (eval { 2909 unless (eval {
2910 $self->deactivate_recursive; # just to be sure
2911
2912 # random map handling
2913 {
2914 my $guard = cf::lock_acquire "exit_prepare:$exit";
2915
2916 prepare_random_map $exit
2917 if $exit->slaying eq "/!";
2918 }
2919
2920 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2921 my $x = $exit->stats->hp;
2922 my $y = $exit->stats->sp;
2923
2592 $self->goto ($slaying, $hp, $sp); 2924 $self->goto ($map, $x, $y);
2593 2925
2926 # if exit is damned, update players death & WoR home-position
2927 $self->contr->savebed ($map, $x, $y)
2928 if $exit->flag (cf::FLAG_DAMNED);
2929
2594 1; 2930 1
2595 }) { 2931 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2597 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2600 2936
2601 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2602 $self->leave_link; 2938 $self->leave_link;
2603 } 2939 }
2604 })->prio (1); 2940 })->prio (1);
2605} 2941}
2606 2942
2618sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2619 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2620 2956
2621 utf8::encode $text; 2957 utf8::encode $text;
2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2623} 2984}
2624 2985
2625=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2626 2987
2627Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send 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 2990the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2991the message unless the client supports the msg packet.
2631 2992
2632=cut 2993=cut
2633 2994
2995# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2635 "c/identify" => { 3003 "c/identify" => {
2636 id => "identify", 3004 id => "infobox",
2637 title => "Identify", 3005 title => "Identify",
2638 reply => undef, 3006 reply => undef,
2639 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2640 }, 3008 },
2641 "c/examine" => { 3009 "c/examine" => {
2642 id => "examine", 3010 id => "infobox",
2643 title => "Examine", 3011 title => "Examine",
2644 reply => undef, 3012 reply => undef,
2645 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
2646 }, 3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
3020 },
3021 "c/book" => {
3022 id => "infobox",
3023 title => "Book",
3024 reply => undef,
3025 tooltip => "The contents of a note or book",
3026 },
3027 "c/lookat" => {
3028 id => "infobox",
3029 title => "Look",
3030 reply => undef,
3031 tooltip => "What you saw there",
3032 },
3033 "c/who" => {
3034 id => "infobox",
3035 title => "Players",
3036 reply => undef,
3037 tooltip => "Shows players who are currently online",
3038 },
3039 "c/body" => {
3040 id => "infobox",
3041 title => "Body Parts",
3042 reply => undef,
3043 tooltip => "Shows which body parts you posess and are available",
3044 },
3045 "c/statistics" => {
3046 id => "infobox",
3047 title => "Statistics",
3048 reply => undef,
3049 tooltip => "Shows your primary statistics",
3050 },
3051 "c/skills" => {
3052 id => "infobox",
3053 title => "Skills",
3054 reply => undef,
3055 tooltip => "Shows your experience per skill and item power",
3056 },
3057 "c/shopitems" => {
3058 id => "infobox",
3059 title => "Shop Items",
3060 reply => undef,
3061 tooltip => "Shows the items currently for sale in this shop",
3062 },
3063 "c/resistances" => {
3064 id => "infobox",
3065 title => "Resistances",
3066 reply => undef,
3067 tooltip => "Shows your resistances",
3068 },
3069 "c/pets" => {
3070 id => "infobox",
3071 title => "Pets",
3072 reply => undef,
3073 tooltip => "Shows information abotu your pets/a specific pet",
3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
3080 },
3081 "c/uptime" => {
3082 id => "infobox",
3083 title => "Uptime",
3084 reply => undef,
3085 tooltip => "How long the server has been running since last restart",
3086 },
3087 "c/mapinfo" => {
3088 id => "infobox",
3089 title => "Map Info",
3090 reply => undef,
3091 tooltip => "Information related to the maps",
3092 },
3093 "c/party" => {
3094 id => "party",
3095 title => "Party",
3096 reply => "gsay ",
3097 tooltip => "Messages and chat related to your party",
3098 },
3099 "c/death" => {
3100 id => "death",
3101 title => "Death",
3102 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death",
3104 },
3105 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL,
2647); 3107);
2648 3108
2649sub cf::client::send_msg { 3109sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2651 3111
2652 $msg = $self->pl->expand_cfpod ($msg); 3112 $msg = $self->pl->expand_cfpod ($msg)
3113 unless $color & cf::NDI_VERBATIM;
2653 3114
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 3115 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 3116
2656 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3118 if ($CHANNEL{$channel}) {
3119 $channel = $CHANNEL{$channel};
2658 3120
3121 $self->ext_msg (channel_info => $channel);
3122 $channel = $channel->{id};
3123
2659 if (ref $channel) { 3124 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2664 if $self->can_msg;
2665 } 3129 }
2666 3130
2667 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2668 } 3132 }
2669 3133
2670 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2671 3135
2672 if ($self->can_msg) {
2673 # default colour, mask it out 3136 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2676 3139
2677 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3140 my $pkt = "msg "
3141 . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2679 } else { 3143 );
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 3144
2691 $color &= cf::NDI_COLOR_MASK; 3145 $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} 3146}
2705 3147
2706=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2707 3149
2708Sends an ext event to the client. 3150Sends an ext event to the client.
2711 3153
2712sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2713 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2714 3156
2715 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2718 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 } 3162 }
2721} 3163}
2722 3164
2723=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2724 3166
2728 3170
2729sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2731 3173
2732 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove 3177 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 } 3180 }
2739} 3181}
2740 3182
2741=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2742 3184
2813 3255
2814 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
2815 if $reply; 3257 if $reply;
2816 3258
2817 } else { 3259 } else {
2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2819 } 3261 }
2820 3262
2821 cf::override; 3263 cf::override;
2822 }, 3264 },
2823); 3265);
2843 3285
2844 $coro 3286 $coro
2845} 3287}
2846 3288
2847cf::client->attach ( 3289cf::client->attach (
2848 on_destroy => sub { 3290 on_client_destroy => sub {
2849 my ($ns) = @_; 3291 my ($ns) = @_;
2850 3292
2851 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2852 }, 3294 },
2853); 3295);
2869our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
2870 3312
2871$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
2872 3314
2873$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
2875 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
2876 sort time 3318 sort time
2877)); 3319));
2878 3320
2879# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
2881=pod 3323=pod
2882 3324
2883The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
2884 3326
2885 cf::object 3327 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3328 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3329 insert remove name archname title slaying race decrease split
3330 value
2888 3331
2889 cf::object::player 3332 cf::object::player
2890 player 3333 player
2891 3334
2892 cf::player 3335 cf::player
2897 3340
2898=cut 3341=cut
2899 3342
2900for ( 3343for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3344 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3346 decrease split destroy change_exp value msg lore send_msg)],
2904 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
2906 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
2907) { 3350) {
2908 no strict 'refs';
2909 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
2910 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2911 for @funs; 3353 for @funs;
2912} 3354}
2913 3355
2928 3370
2929 my $qcode = $code; 3371 my $qcode = $code;
2930 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2931 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
2932 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
2933 local $_; 3378 local $_;
2934 local @safe::cf::_safe_eval_args = values %vars;
2935 3379
2936 my $eval = 3380 my $eval =
2937 "do {\n" 3381 "do {\n"
2938 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2939 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
2940 . $code 3384 . $code
2941 . "\n}" 3385 . "\n}"
2942 ; 3386 ;
2943 3387
3388 if ($CFG{safe_eval}) {
2944 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
2945 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2946 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
2947 3397
2948 if ($@) { 3398 if ($@) {
2949 warn "$@"; 3399 warn "$@",
2950 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
2951 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
2952 } 3402 }
2953 3403
2954 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
2955} 3405}
2956 3406
2970=cut 3420=cut
2971 3421
2972sub register_script_function { 3422sub register_script_function {
2973 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
2974 3424
2975 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
2976 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
2977} 3427}
2978 3428
2979=back 3429=back
2980 3430
2981=cut 3431=cut
2990 # for this (global event?) 3440 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
2992 3442
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994 3444
2995 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
2996 3446
2997 my $facedata; 3447 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 3448
3003 $facedata->{version} == 2 3449 $facedata->{version} == 2
3004 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005 3451
3006 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3007 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC, 3455 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3010 }; 3458 };
3011 cf::cede_to_tick; 3459 cf::cede_to_tick;
3012 3460
3013 { 3461 {
3014 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3015 3463
3016 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3466
3018 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3022 3472
3023 cf::cede_to_tick; 3473 cf::cede_to_tick;
3024 } 3474 }
3025 3475
3026 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3477 next unless $info->{smooth};
3478
3028 my $idx = cf::face::find $face 3479 my $idx = cf::face::find $face
3029 or next; 3480 or next;
3481
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3485 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3035 } 3487 }
3036 3488
3037 cf::cede_to_tick; 3489 cf::cede_to_tick;
3038 } 3490 }
3039 } 3491 }
3048 3500
3049 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3050 } 3502 }
3051 3503
3052 { 3504 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3056 3506
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3508 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062 3510
3063 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3064 # prepend meta info 3512 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 { 3513 } else {
3073 $data = $info->{data}; 3514 $RESOURCE{$name} = $info; # unused
3074 } 3515 }
3075 3516
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; 3517 cf::cede_to_tick;
3080 } 3518 }
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 } 3519 }
3520
3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3522
3101 1 3523 1
3102} 3524}
3103 3525
3104register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3106 3528
3107 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3530 $ns->fx_want ($k, $v);
3109 } 3531 }
3110}; 3532};
3533
3534sub load_resource_file($) {
3535 my $guard = lock_acquire "load_resource_file";
3536
3537 my $status = load_resource_file_ $_[0];
3538 get_slot 0.1, 100;
3539 cf::arch::commit_load;
3540
3541 $status
3542}
3111 3543
3112sub reload_regions { 3544sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3545 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3546 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3547 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3561}
3130 3562
3131sub reload_archetypes { 3563sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3564 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3565 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} 3566}
3140 3567
3141sub reload_treasures { 3568sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3144} 3571}
3145 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3146sub reload_resources { 3593sub reload_resources {
3147 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3148 3595
3596 reload_exp_table;
3597 reload_materials;
3598 reload_facedata;
3599 reload_sound;
3600 reload_archetypes;
3149 reload_regions; 3601 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3602 reload_treasures;
3154 3603
3155 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3156}
3157
3158sub init {
3159 reload_resources;
3160} 3605}
3161 3606
3162sub reload_config { 3607sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3164 or return;
3165 3609
3166 local $/; 3610 my $config = load_file "$CONFDIR/config";
3167 *CFG = YAML::Syck::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3168 3613
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3170 3615
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $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}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3173 3618
3174 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3178 }; 3623 };
3179 warn $@ if $@; 3624 warn $@ if $@;
3180 } 3625 }
3181} 3626}
3182 3627
3628sub pidfile() {
3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3630 or die "$PIDFILE: $!";
3631 flock $fh, &Fcntl::LOCK_EX
3632 or die "$PIDFILE: flock: $!";
3633 $fh
3634}
3635
3636# make sure only one server instance is running at any one time
3637sub atomic {
3638 my $fh = pidfile;
3639
3640 my $pid = <$fh>;
3641 kill 9, $pid if $pid > 0;
3642
3643 seek $fh, 0, 0;
3644 print $fh $$;
3645}
3646
3647sub main_loop {
3648 trace "EV::loop starting\n";
3649 if (1) {
3650 EV::loop;
3651 }
3652 trace "EV::loop returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP;
3654}
3655
3183sub main { 3656sub main {
3657 cf::init_globals; # initialise logging
3658
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663
3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665
3184 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3669 (async {
3188 Event::one_event; 3670 $Coro::current->{desc} = "IDLE BUG HANDLER";
3671 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3672 })->prio (Coro::PRIO_MAX);
3190 }; 3673 };
3191 3674
3675 evthread_start IO::AIO::poll_fileno;
3676
3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3686 reload_resources;
3192 reload_config; 3687 reload_config;
3193 db_init; 3688 db_init;
3689
3690 cf::init_uuid;
3691 cf::init_signals;
3692 cf::init_skills;
3693
3694 cf::init_beforeplay;
3695
3696 atomic;
3697
3194 load_extensions; 3698 load_extensions;
3195 3699
3196 $TICK_WATCHER->start; 3700 utime time, time, $RUNTIMEFILE;
3197 Event::loop; 3701
3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3705
3706 cf::_post_init 0;
3707 };
3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3717 goto &main_loop;
3198} 3718}
3199 3719
3200############################################################################# 3720#############################################################################
3201# initialisation and cleanup 3721# initialisation and cleanup
3202 3722
3203# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3204BEGIN { 3724BEGIN {
3725 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3727 $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"; 3728 cf::cleanup "SIG$signal";
3213 },
3214 ); 3729 };
3215 } 3730 }
3216} 3731}
3217 3732
3218sub write_runtime { 3733sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3734 my $t0 = AE::time;
3220 3735
3221 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3223 3738
3224 IO::AIO::aio_utime $runtime, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3225 3740
3226 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3227 3742
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3229 or return; 3744 or return;
3230 3745
3231 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3243 aio_utime $fh, undef, undef; 3758 aio_utime $fh, undef, undef;
3244 3759
3245 close $fh 3760 close $fh
3246 or return; 3761 or return;
3247 3762
3248 aio_rename "$runtime~", $runtime 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3249 and return; 3764 and return;
3250 3765
3251 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3252 3767
3253 1 3768 1
3769}
3770
3771our $uuid_lock;
3772our $uuid_skip;
3773
3774sub write_uuid_sync($) {
3775 $uuid_skip ||= $_[0];
3776
3777 return if $uuid_lock;
3778 local $uuid_lock = 1;
3779
3780 my $uuid = "$LOCALDIR/uuid";
3781
3782 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3783 or return;
3784
3785 my $value = uuid_seq uuid_cur;
3786
3787 unless ($value) {
3788 info "cowardly refusing to write zero uuid value!\n";
3789 return;
3790 }
3791
3792 my $value = uuid_str $value + $uuid_skip;
3793 $uuid_skip = 0;
3794
3795 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3796 and return;
3797
3798 # always fsync - this file is important
3799 aio_fsync $fh
3800 and return;
3801
3802 close $fh
3803 or return;
3804
3805 aio_rename "$uuid~", $uuid
3806 and return;
3807
3808 trace "uuid file written ($value).\n";
3809
3810 1
3811
3812}
3813
3814sub write_uuid($$) {
3815 my ($skip, $sync) = @_;
3816
3817 $sync ? write_uuid_sync $skip
3818 : async { write_uuid_sync $skip };
3254} 3819}
3255 3820
3256sub emergency_save() { 3821sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3258 3823
3259 warn "enter emergency perl save\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3260 3830
3261 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3262 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3263 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3264 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3266 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3840 $pl->valid or next;
3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3842 $pl->save;
3270 } 3843 }
3271 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3272 3845
3273 warn "begin emergency map save\n"; 3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 info "emergency_perl_save: begin map save\n";
3274 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3275 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3276 $map->valid or next; 3851 $map->valid or next;
3277 $map->save; 3852 $map->save;
3278 } 3853 }
3279 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3280 3855
3281 warn "begin emergency database checkpoint\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3861
3862 info "emergency_perl_save: begin write uuid\n";
3863 write_uuid_sync 1;
3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3284 }; 3884 };
3285 3885
3286 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3287} 3887}
3288 3888
3289sub post_cleanup { 3889sub post_cleanup {
3290 my ($make_core) = @_; 3890 my ($make_core) = @_;
3291 3891
3892 IO::AIO::flush;
3893
3292 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3895 if $make_core;
3896
3897 my $fh = pidfile;
3898 unlink $PIDFILE if <$fh> == $$;
3899}
3900
3901# a safer delete_package, copied from Symbol
3902sub clear_package($) {
3903 my $pkg = shift;
3904
3905 # expand to full symbol table name if needed
3906 unless ($pkg =~ /^main::.*::$/) {
3907 $pkg = "main$pkg" if $pkg =~ /^::/;
3908 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3909 $pkg .= '::' unless $pkg =~ /::$/;
3910 }
3911
3912 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3913 my $stem_symtab = *{$stem}{HASH};
3914
3915 defined $stem_symtab and exists $stem_symtab->{$leaf}
3916 or return;
3917
3918 # clear all symbols
3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3920 for my $name (keys %$leaf_symtab) {
3921 _gv_clear *{"$pkg$name"};
3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3923 }
3294} 3924}
3295 3925
3296sub do_reload_perl() { 3926sub do_reload_perl() {
3297 # can/must only be called in main 3927 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3299 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3300 return; 3930 return;
3301 } 3931 }
3302 3932
3303 warn "reloading..."; 3933 return if $RELOAD++;
3304 3934
3305 warn "entering sync_job"; 3935 my $t1 = AE::time;
3306 3936
3937 while ($RELOAD) {
3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3940
3941 trace "perl_reload: entering sync_job";
3942
3307 cf::sync_job { 3943 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark
3309 cf::emergency_save; 3944 #cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark
3311 3945
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"; 3946 trace "perl_reload: cancelling all extension coros";
3334 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3335 %EXT_CORO = (); 3948 %EXT_CORO = ();
3336 3949
3337 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3338 %COMMAND = (); 3951 %COMMAND = ();
3339 3952
3340 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3341 %EXTCMD = (); 3954 %EXTCMD = ();
3342 %EXTICMD = (); 3955 %EXTICMD = ();
3343 3956
3344 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3345 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3346 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3347 3960
3348 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3349 eval { 3962 eval {
3350 $cb->($pkg); 3963 $cb->($pkg);
3351 1 3964 1
3352 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3966 }
3967
3968 trace "... clearing $pkg";
3969 clear_package $pkg;
3353 } 3970 }
3354 3971
3355 warn "... nuking $pkg";
3356 Symbol::delete_package $pkg;
3357 }
3358
3359 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3360 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 3975
3363 warn "... unloading $k"; 3976 trace "... unloading $k";
3364 delete $INC{$k}; 3977 delete $INC{$k};
3365 3978
3366 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3368 3981
3369 if (my $cb = $k->can ("unload_module")) { 3982 if (my $cb = $k->can ("unload_module")) {
3370 $cb->(); 3983 $cb->();
3984 }
3985
3986 clear_package $k;
3371 } 3987 }
3372 3988
3373 Symbol::delete_package $k;
3374 }
3375
3376 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 3990 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 3992
3380 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3383 3996
3384 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3385 # and global variables created in xs 3998 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3387 4000
3388 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3389 4002
3390 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3391 require cf; 4004 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3393 4006
3394 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3395 cf::reload_config; 4008 cf::reload_config;
3396 4009
3397 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3398 cf::load_extensions; 4011 cf::load_extensions;
3399 4012
4013 if ($REATTACH_ON_RELOAD) {
3400 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3403 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3406 4021
3407 warn "leaving sync_job"; 4022 cf::_post_init 1;
3408 4023
4024 trace "perl_reload: leaving sync_job";
4025
3409 1 4026 1
3410 } or do { 4027 } or do {
3411 warn $@; 4028 error $@;
3412 warn "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3413 exit 1; 4030 };
4031
4032 --$RELOAD;
3414 }; 4033 }
3415 4034
3416 warn "reloaded"; 4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3417}; 4037};
3418 4038
3419our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3420 4040
3421sub reload_perl() { 4041sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3424 4044
3425 $RELOAD_WATCHER ||= Event->timer ( 4045 $RELOAD_WATCHER ||= cf::async {
3426 reentrant => 0, 4046 Coro::AIO::aio_wait cache_extensions;
3427 after => 0, 4047
3428 data => WF_AUTOCANCEL, 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3429 cb => sub {
3430 do_reload_perl; 4049 do_reload_perl;
3431 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3432 }, 4051 };
3433 ); 4052 };
3434} 4053}
3435 4054
3436register_command "reload" => sub { 4055register_command "reload" => sub {
3437 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
3438 4057
3439 if ($who->flag (FLAG_WIZ)) { 4058 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 4059 $who->message ("reloading server.");
4060 async {
4061 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 4062 reload_perl;
4063 };
3442 } 4064 }
3443}; 4065};
3444 4066
3445unshift @INC, $LIBDIR; 4067#############################################################################
3446 4068
3447my $bug_warning = 0; 4069my $bug_warning = 0;
3448 4070
3449our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3451 4073
3452sub wait_for_tick { 4074sub wait_for_tick() {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3455 4076
3456 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 4079 $signal->wait;
3459} 4080}
3460 4081
3461sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3464 4084
3465 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 4087 $signal->wait;
3468} 4088}
3469 4089
3470$TICK_WATCHER = Event->timer ( 4090sub 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) { 4091 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4092 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 4093 unless ++$bug_warning > 10;
3480 return; 4094 return;
3481 } 4095 }
3482 4096
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3486 4098
3487 $RUNTIME += $TICK; 4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3488 $NEXT_TICK += $TICK;
3489 4100
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 4103 Coro::async_pool {
4104 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 4105 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3495 };
3496 } 4107 };
4108 }
3497 4109
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 4111 $sig->send;
3500 } 4112 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 4113 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 4114 $sig->send;
3503 } 4115 }
3504 4116
3505 $NOW = Event::time; 4117 $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; 4118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 4119
3516 _post_tick; 4120 if (0) {
4121 if ($NEXT_TICK) {
4122 my $jitter = $TICK_START - $NEXT_TICK;
4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4124 debug "jitter $JITTER\n";#d#
4125 }
3517 }, 4126 }
3518); 4127}
3519 4128
3520{ 4129{
4130 # configure BDB
4131
3521 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3522 BDB::max_poll_time $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 4134 $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 4135
3547 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 4139 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4140 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4141 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4142 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 4143
3554 cf::sync_job { 4144 cf::sync_job {
3555 eval { 4145 eval {
3565 4155
3566 cf::cleanup "db_env_open(db): $@" if $@; 4156 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 4157 };
3568 } 4158 }
3569 4159
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 4160 $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 { }; 4161 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 4162 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4163 $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 { }; 4164 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 4165 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 4166 $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 { }; 4167 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 4168 };
3600} 4169}
3601 4170
3602{ 4171{
4172 # configure IO::AIO
4173
3603 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 4176 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} 4177}
3616 4178
3617my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3618 4181
3619sub _log_backtrace { 4182sub _log_backtrace {
3620 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3621 4184
3622 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3623 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3624 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3626 ++$_log_backtrace; 4193 ++$_log_backtrace;
4194 my $perl_bt = Carp::longmess $msg;
3627 async { 4195 async {
4196 $Coro::current->{desc} = "abt $msg";
4197
3628 my @bt = fork_call { 4198 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 4199 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4200 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4201 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 4202 or die "addr2line: $!";
3640 } 4210 }
3641 4211
3642 @funcs 4212 @funcs
3643 }; 4213 };
3644 4214
3645 LOG llevInfo, "[ABT] $msg\n"; 4215 LOG llevInfo, "[ABT] $perl_bt\n";
4216 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3647 --$_log_backtrace; 4218 --$_log_backtrace;
3648 }; 4219 };
3649 } else { 4220 } else {
3650 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3651 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3652 } 4223 }
3653} 4224}
3654 4225
3655# load additional modules 4226# load additional modules
3656use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3657 4229
3658END { cf::emergency_save } 4230END { cf::emergency_save }
3659 4231
36601 42321
3661 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines