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.523 by root, Sat Apr 17 02:39:46 2010 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$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 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $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 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 184
123############################################################################# 185#############################################################################
124 186
125=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
126 188
162 224
163The raw value load value from the last tick. 225The raw value load value from the last tick.
164 226
165=item %cf::CFG 227=item %cf::CFG
166 228
167Configuration for the server, loaded from C</etc/crossfire/config>, or 229Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 230from wherever your confdir points to.
169 231
170=item cf::wait_for_tick, cf::wait_for_tick_begin 232=item cf::wait_for_tick, cf::wait_for_tick_begin
171 233
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 234These 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 235returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 237
176=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
177 239
178This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 242that call.
181 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
182=back 250=back
183 251
184=cut 252=cut
185 253
186BEGIN { 254$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 255 my $msg = join "", @_;
189 256
190 $msg .= "\n" 257 $msg .= "\n"
191 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
192 259
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 261
195 LOG llevError, $msg; 262 LOG llevError, $msg;
196 }; 263};
197} 264
265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
276 Coro::terminate
277};
198 278
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 289for my $pkg (qw(
210 cf::global cf::attachable 290 cf::global cf::attachable
211 cf::object cf::object::player 291 cf::object cf::object::player
212 cf::client cf::player 292 cf::client cf::player
213 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
214 cf::map cf::party cf::region 295 cf::party cf::region
215)) { 296)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 298}
219 299
220$Event::DIED = sub { 300$EV::DIED = sub {
221 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
222}; 302};
223 303
224############################################################################# 304#############################################################################
225 305
226=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 329 $d
250 } || "[unable to dump $_[0]: '$@']"; 330 } || "[unable to dump $_[0]: '$@']";
251} 331}
252 332
253=item $ref = cf::from_json $json 333=item $ref = cf::decode_json $json
254 334
255Converts a JSON string into the corresponding perl data structure. 335Converts a JSON string into the corresponding perl data structure.
256 336
257=item $json = cf::to_json $ref 337=item $json = cf::encode_json $ref
258 338
259Converts a perl data structure into its JSON representation. 339Converts a perl data structure into its JSON representation.
260 340
261=cut 341=cut
262 342
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 344
265sub to_json ($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
267 361
268=item cf::lock_wait $string 362=item cf::lock_wait $string
269 363
270Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
271 365
272=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
273 367
274Wait until the given lock is available and then acquires it and returns 368Wait 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, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
277returned. 371returned.
278 372
279Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 374deadlocked coro.
286 380
287Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
288 382
289=cut 383=cut
290 384
291our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 386
294sub lock_wait($) { 387sub lock_wait($) {
295 my ($key) = @_; 388 $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} 389}
308 390
309sub lock_acquire($) { 391sub lock_acquire($) {
310 my ($key) = @_; 392 $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} 393}
324 394
325sub lock_active($) { 395sub lock_active($) {
326 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 397}
330 398
331sub freeze_mainloop { 399sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
333 401
334 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 403}
336 }; 404
337 $TICK_WATCHER->stop; 405=item cf::periodic $interval, $cb
338 $guard 406
407Like EV::periodic, but randomly selects a starting point so that the actions
408get spread over time.
409
410=cut
411
412sub periodic($$) {
413 my ($interval, $cb) = @_;
414
415 my $start = rand List::Util::min 180, $interval;
416
417 EV::periodic $start, $interval, 0, $cb
339} 418}
340 419
341=item cf::get_slot $time[, $priority[, $name]] 420=item cf::get_slot $time[, $priority[, $name]]
342 421
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 422Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 430
352=cut 431=cut
353 432
354our @SLOT_QUEUE; 433our @SLOT_QUEUE;
355our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
356 436
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
439 $Coro::current->desc ("timeslot manager");
440
359 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
360 443
361 while () { 444 while () {
362 next_job: 445 next_job:
446
363 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
364 if ($avail > 0.01) { 448
365 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
367 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send; 453 $job->[2]->send;
369 Coro::cede; 454 Coro::cede;
370 goto next_job; 455 goto next_job;
371 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
372 } 458 }
373 } 459 }
374 460
375 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 464 $signal->wait;
379 } else { 465 } else {
466 $busy = 0;
380 Coro::schedule; 467 Coro::schedule;
381 } 468 }
382 } 469 }
383}; 470};
384 471
385sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
386 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
387 476
388 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
389 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
390 480
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
404 494
405BEGIN { *async = \&Coro::async_pool } 495BEGIN { *async = \&Coro::async_pool }
406 496
407=item cf::sync_job { BLOCK } 497=item cf::sync_job { BLOCK }
408 498
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 499The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 500is 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 501partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 502acceptable.
413 503
414If it must be done, put the blocking parts into C<sync_job>. This will run 504If 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 505the given BLOCK in another coroutine while waiting for the result. The
420 510
421sub sync_job(&) { 511sub sync_job(&) {
422 my ($job) = @_; 512 my ($job) = @_;
423 513
424 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 515 my $time = AE::time;
426 516
427 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
429 519
430 # TODO: use suspend/resume instead 520 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 521
432 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
433 523
434 my $busy = 1; 524 my $busy = 1;
435 my @res; 525 my @res;
436 526
437 (async { 527 (async {
528 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 529 @res = eval { $job->() };
439 warn $@ if $@; 530 warn $@ if $@;
440 undef $busy; 531 undef $busy;
441 })->prio (Coro::PRIO_MAX); 532 })->prio (Coro::PRIO_MAX);
442 533
443 while ($busy) { 534 while ($busy) {
444 Coro::cede or Event::one_event; 535 if (Coro::nready) {
536 Coro::cede_notself;
537 } else {
538 EV::loop EV::LOOP_ONESHOT;
445 } 539 }
540 }
446 541
447 $time = Event::time - $time; 542 my $time = AE::time - $time;
448 543
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 544 $TICK_START += $time; # do not account sync jobs to server load
453 545
454 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
455 } else { 547 } else {
456 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
457 549
482=item fork_call { }, $args 574=item fork_call { }, $args
483 575
484Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
488 580
489=cut 581=cut
490 582
491sub fork_call(&@) { 583sub fork_call(&@) {
492 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
499 reset_signals; 591 reset_signals;
500 &$cb 592 &$cb
501 }, @args; 593 }, @args;
502 594
503 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
504} 634}
505 635
506=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
507 637
508Returns a single value from the environment database. 638Returns a single value from the environment database.
647 777
648############################################################################# 778#############################################################################
649 779
650=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
651 781
652Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
655 785
656In the following description, CLASS can be any of C<global>, C<object> 786In 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 787C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 788Deliantra).
659 789
660=over 4 790=over 4
661 791
662=item $attachable->attach ($attachment, key => $value...) 792=item $attachable->attach ($attachment, key => $value...)
663 793
707=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
708 838
709Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
711 841
712Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
714 844
715These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
716 846
717=over 4 847=over 4
945 } 1075 }
946 1076
947 0 1077 0
948} 1078}
949 1079
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1081
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1083
954Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
955 1085
961 1091
962=cut 1092=cut
963 1093
964############################################################################# 1094#############################################################################
965# object support 1095# object support
966#
967 1096
1097sub _object_equal($$);
1098sub _object_equal($$) {
1099 my ($a, $b) = @_;
1100
1101 return 0 unless (ref $a) eq (ref $b);
1102
1103 if ("HASH" eq ref $a) {
1104 my @ka = keys %$a;
1105 my @kb = keys %$b;
1106
1107 return 0 if @ka != @kb;
1108
1109 for (0 .. $#ka) {
1110 return 0 unless $ka[$_] eq $kb[$_];
1111 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1112 }
1113
1114 } elsif ("ARRAY" eq ref $a) {
1115
1116 return 0 if @$a != @$b;
1117
1118 for (0 .. $#$a) {
1119 return 0 unless _object_equal $a->[$_], $b->[$_];
1120 }
1121
1122 } elsif ($a ne $b) {
1123 return 0;
1124 }
1125
1126 1
1127}
1128
1129our $SLOW_MERGES;#d#
968sub _can_merge { 1130sub _can_merge {
969 my ($ob1, $ob2) = @_; 1131 my ($ob1, $ob2) = @_;
970 1132
971 local $Storable::canonical = 1; 1133 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1134
975 $fob1 eq $fob2 1135 # we do the slow way here
1136 return _object_equal $ob1, $ob2
976} 1137}
977 1138
978sub reattach { 1139sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1141 my ($obj) = @_;
981 1142
1143 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1145
984 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
985 1147
986 @$registry = (); 1148 @$registry = ();
987 1149
1002cf::attachable->attach ( 1164cf::attachable->attach (
1003 prio => -1000000, 1165 prio => -1000000,
1004 on_instantiate => sub { 1166 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1006 1168
1007 $data = from_json $data; 1169 $data = decode_json $data;
1008 1170
1009 for (@$data) { 1171 for (@$data) {
1010 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1011 1173
1012 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
1025 }, 1187 },
1026); 1188);
1027 1189
1028sub object_freezer_save { 1190sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1191 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1192
1033 sync_job { 1193 sync_job {
1034 if (length $$rdata) { 1194 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1038 1198
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1043 close $fh; 1206 aio_close $fh;
1044 1207
1045 if (@$objs) { 1208 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1051 close $fh; 1217 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1219 }
1054 } else { 1220 } else {
1055 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1056 } 1222 }
1057 1223
1058 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1059 } else { 1228 } else {
1060 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1061 } 1230 }
1062 } else { 1231 } else {
1063 aio_unlink $filename; 1232 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1065 } 1234 }
1066 }; 1235 };
1067
1068 undef $guard;
1069} 1236}
1070 1237
1071sub object_freezer_as_string { 1238sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1239 my ($rdata, $objs) = @_;
1073 1240
1078 1245
1079sub object_thawer_load { 1246sub object_thawer_load {
1080 my ($filename) = @_; 1247 my ($filename) = @_;
1081 1248
1082 my ($data, $av); 1249 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1250
1086 (aio_load $filename, $data) >= 0 1251 (aio_load $filename, $data) >= 0
1087 or return; 1252 or return;
1088 1253
1089 unless (aio_stat "$filename.pst") { 1254 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1255 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1256 or return;
1092 1257
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1258 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs};
1095 } 1260 }
1096 1261
1097 utf8::decode (my $decname = $filename); 1262 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1263 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1264 $decname, length $data, scalar @{$av || []};
1160 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1161 1326
1162 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1163} 1328}
1164 1329
1330use File::Glob ();
1331
1165cf::player->attach ( 1332cf::player->attach (
1166 on_command => sub { 1333 on_unknown_command => sub {
1167 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1168 1335
1169 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1170 or return; 1337 or return;
1171 1338
1201 1368
1202 cf::override; 1369 cf::override;
1203 }, 1370 },
1204); 1371);
1205 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1206sub load_extensions { 1386sub load_extensions {
1207 cf::sync_job { 1387 cf::sync_job {
1208 my %todo; 1388 my %todo;
1209 1389
1210 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1229 1409
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1412
1233 $ext{source} = 1413 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1236 . $source 1416 . $source
1237 . "\n};\n1"; 1417 . "\n};\n1";
1238 1418
1239 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1240 } 1420 }
1241 1421
1422 my $pass = 0;
1242 my %done; 1423 my %done;
1243 while (%todo) { 1424 while (%todo) {
1244 my $progress; 1425 my $progress;
1245 1426
1427 ++$pass;
1428
1429 ext:
1246 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip 1432 next ext
1249 unless exists $done{$_}; 1433 unless exists $done{$_};
1250 } 1434 }
1251 1435
1252 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1253 1437
1254 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1255 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1256 : "$v->{base}: extension inactive.\n";
1257 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1258 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1259 warn $msg; 1445
1260 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1261 exit 1; 1447 delete $todo{$k};
1262 } 1448 } else {
1263 1449 $done{$k} = delete $todo{$k};
1264 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1265 } 1455 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1456 }
1271 1457
1272 skip: 1458 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1275 } 1466 }
1276 }; 1467 };
1277} 1468}
1278 1469
1279############################################################################# 1470#############################################################################
1280 1471
1281=back 1472=back
1282 1473
1283=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1284 1475
1285Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1286 1477
1287=cut 1478=cut
1288 1479
1289package cf::player; 1480package cf::player;
1290 1481
1333 1524
1334sub exists($) { 1525sub exists($) {
1335 my ($login) = @_; 1526 my ($login) = @_;
1336 1527
1337 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1339} 1530}
1340 1531
1341sub find($) { 1532sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1534 my $login = $_[0];
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1544 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1545
1355 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1547 or return;
1357 1548
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1360 or return; 1550 or return;
1551
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1364 } 1555 }
1365 } 1556 }
1366} 1557}
1367 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1368sub save($) { 1572sub save($) {
1369 my ($pl) = @_; 1573 my ($pl) = @_;
1370 1574
1371 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1372 1576
1375 1579
1376 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1377 1581
1378 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1379 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1380 1589
1381 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1591 cf::cede_to_tick;
1383} 1592}
1384 1593
1416 my ($pl) = @_; 1625 my ($pl) = @_;
1417 1626
1418 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1419 1628
1420 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1421 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1422 1631
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1424 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1426 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1427 1638
1428 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1468 1679
1469 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1470 my $path = path $login; 1681 my $path = path $login;
1471 1682
1472 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1689 }
1478 1690
1482 1694
1483 \@logins 1695 \@logins
1484} 1696}
1485 1697
1486=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1487 1701
1488Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1489player. May block. 1703player. May block.
1490 1704
1491=cut 1705=cut
1509 } 1723 }
1510 1724
1511 \@paths 1725 \@paths
1512} 1726}
1513 1727
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1515 1729
1516Expand crossfire pod fragments into protocol xml. 1730Expand 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 1731
1565=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1566 1733
1567Sends an ext reply to the player. 1734Sends an ext reply to the player.
1568 1735
1600 1767
1601=cut 1768=cut
1602 1769
1603sub find_by_path($) { 1770sub find_by_path($) {
1604 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1605 1774
1606 my ($match, $specificity); 1775 my ($match, $specificity);
1607 1776
1608 for my $region (list) { 1777 for my $region (list) {
1609 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1635our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1637 1806
1638sub generate_random_map { 1807sub generate_random_map {
1639 my ($self, $rmp) = @_; 1808 my ($self, $rmp) = @_;
1809
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811
1640 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1641 $self->_create_random_map ( 1813 $self->_create_random_map (
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1645 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1646 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1647 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1648 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1766 1938
1767# the temporary/swap location 1939# the temporary/swap location
1768sub save_path { 1940sub save_path {
1769 my ($self) = @_; 1941 my ($self) = @_;
1770 1942
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1773} 1945}
1774 1946
1775# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1776sub uniq_path { 1948sub uniq_path {
1777 my ($self) = @_; 1949 my ($self) = @_;
1778 1950
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 1952 "$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} 1953}
1791 1954
1792sub decay_objects { 1955sub decay_objects {
1793 my ($self) = @_; 1956 my ($self) = @_;
1794 1957
1878sub find { 2041sub find {
1879 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1880 2043
1881 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1882 2045
1883 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1885 2048
1886 $cf::MAP{$path} || do { 2049 $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 2050 my $map = new_from_path cf::map $path
1891 or return; 2051 or return;
1892 2052
1893 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1894 2054
1896 or return; 2056 or return;
1897 2057
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1901 undef $guard1; 2062 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2063 $map->reset;
1904 return find $path; 2064 return find $path;
1905 } 2065 }
1906 2066
1907 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1908 } 2068 }
1909} 2069}
1910 2070
1911sub pre_load { } 2071sub pre_load { }
1912sub post_load { } 2072#sub post_load { } # XS
1913 2073
1914sub load { 2074sub load {
1915 my ($self) = @_; 2075 my ($self) = @_;
1916 2076
1917 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2095 $f->skip_block;
1936 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
1937 or return; 2097 or return;
1938 2098
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
1940 if delete $self->{load_original}; 2100 if delete $self->{load_original};
1941 2101
1942 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2103 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
1962 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
1963 $self->decay_objects; 2123 $self->decay_objects;
1964 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
1965 $self->update_buttons; 2125 $self->update_buttons;
1966 cf::cede_to_tick; 2126 cf::cede_to_tick;
1967 $self->set_darkness_map;
1968 cf::cede_to_tick;
1969 $self->activate; 2127 $self->activate;
1970 } 2128 }
1971 2129
1972 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
1974 2132
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2134 }
1977 2135
1978 $self->post_load; 2136 $self->post_load;
1979} 2137}
1980 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
1981sub customise_for { 2142sub customise_for {
1982 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
1983 2144
1984 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
1985 if $self->per_player; 2146 if $self->per_player;
2038 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2039 2200
2040 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2041 2202
2042 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2205 }
2045 2206
2046 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2047 2208
2048 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2210 $Coro::current->{desc} = "map prefetcher";
2211
2049 while (%MAP_PREFETCH) { 2212 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2213 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2214 if (my $map = find $k) {
2052 $map->load if $v; 2215 $map->load if $v;
2053 } 2216 }
2060 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2061 2224
2062 () 2225 ()
2063} 2226}
2064 2227
2228# common code, used by both ->save and ->swapout
2065sub save { 2229sub _save {
2066 my ($self) = @_; 2230 my ($self) = @_;
2067
2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
2069 2231
2070 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2071 2233
2072 return unless $self->dirty; 2234 return unless $self->dirty;
2073 2235
2079 return if $self->{deny_save}; 2241 return if $self->{deny_save};
2080 2242
2081 local $self->{last_access} = $self->last_access;#d# 2243 local $self->{last_access} = $self->last_access;#d#
2082 2244
2083 cf::async { 2245 cf::async {
2246 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2085 }; 2248 };
2249
2250 cf::get_slot 0.02;
2086 2251
2087 if ($uniq) { 2252 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2255 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2092 } 2257 }
2093} 2258}
2094 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2095sub swap_out { 2268sub swap_out {
2096 my ($self) = @_; 2269 my ($self) = @_;
2097 2270
2098 # save first because save cedes
2099 $self->save;
2100
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2103 return if $self->players; 2275 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2105 return if $self->{deny_save};
2106 2276
2107 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2108
2109 $self->deactivate; 2278 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2111 $self->clear; 2286 $self->clear;
2112} 2287}
2113 2288
2114sub reset_at { 2289sub reset_at {
2115 my ($self) = @_; 2290 my ($self) = @_;
2134 2309
2135 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136 2311
2137 return if $self->players; 2312 return if $self->players;
2138 2313
2139 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2140 2315
2141 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2142 2317
2143 # need to save uniques path 2318 # need to save uniques path
2144 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2227 2402
2228sub unique_maps() { 2403sub unique_maps() {
2229 [ 2404 [
2230 map { 2405 map {
2231 utf8::decode $_; 2406 utf8::decode $_;
2232 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2233 ? normalise $_ 2410 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2412 ]
2237} 2413}
2238 2414
2239package cf; 2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2240 2446
2241=back 2447=back
2242 2448
2243=head3 cf::object 2449=head3 cf::object
2244 2450
2248 2454
2249=over 4 2455=over 4
2250 2456
2251=item $ob->inv_recursive 2457=item $ob->inv_recursive
2252 2458
2253Returns the inventory of the object _and_ their inventories, recursively. 2459Returns the inventory of the object I<and> their inventories, recursively,
2460but I<not> the object itself.
2254 2461
2255=cut 2462=cut
2256 2463
2257sub inv_recursive_; 2464sub inv_recursive_;
2258sub inv_recursive_ { 2465sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2264} 2471}
2265 2472
2266=item $ref = $ob->ref 2473=item $ref = $ob->ref
2267 2474
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2475Creates and returns a persistent reference to an object that can be stored as a string.
2269 2476
2270=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2271 2478
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2479returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2480even if the object actually exists. May block.
2275=cut 2482=cut
2276 2483
2277sub deref { 2484sub deref {
2278 my ($ref) = @_; 2485 my ($ref) = @_;
2279 2486
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2487 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2488 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2489 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2490 or return;
2287 $pl->ob->uuid eq $uuid 2491 $pl->ob->uuid eq $uuid
2288 or return; 2492 or return;
2308can be C<undef>. Does the right thing when the player is currently in a 2512can be C<undef>. Does the right thing when the player is currently in a
2309dialogue with the given NPC character. 2513dialogue with the given NPC character.
2310 2514
2311=cut 2515=cut
2312 2516
2517our $SAY_CHANNEL = {
2518 id => "say",
2519 title => "Map",
2520 reply => "say ",
2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2522};
2523
2524our $CHAT_CHANNEL = {
2525 id => "chat",
2526 title => "Chat",
2527 reply => "chat ",
2528 tooltip => "Player chat and shouts, global to the server.",
2529};
2530
2313# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2532# with dialog boxes.
2315#TODO: the first argument must go, split into a $npc->reply_to ( method 2533#TODO: the first argument must go, split into a $npc->reply_to ( method
2316sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2547 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330 2548
2331 } else { 2549 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2552 }
2335 } 2553 }
2336} 2554}
2337 2555
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2363 2581
2364=item $player_object->enter_link 2582=item $player_object->enter_link
2365 2583
2366Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2367 2585
2368The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2369I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2370 2590
2371Will never block. 2591Will never block.
2372 2592
2373=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2374 2594
2399 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2400 2620
2401 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2402 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2403 2623
2404 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2405} 2625}
2406 2626
2407sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2408 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2409 2629
2426 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2427 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2428 2648
2429 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2430 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2431 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2432 2652
2433 $map->load; 2653 $map->load;
2434 $map->load_neighbours; 2654 $map->load_neighbours;
2435 2655
2436 return unless $self->contr->active; 2656 return unless $self->contr->active;
2437 $self->activate_recursive;
2438 2657
2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2440 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2441} 2663}
2442 2664
2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2444 2666
2445Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2446her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2447that has to return the map if sucecssful, and then unfreezes the player on 2669that 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 2670the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process. 2671be called at the end of this process.
2450 2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2675
2451=cut 2676=cut
2452 2677
2453our $GOTOGEN; 2678our $GOTOGEN;
2454 2679
2455sub cf::object::player::goto { 2680sub cf::object::player::goto {
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2685
2461 $self->enter_link; 2686 $self->enter_link;
2462 2687
2463 (async { 2688 (async {
2689 $Coro::current->{desc} = "player::goto $path $x $y";
2690
2464 # *tag paths override both path and x|y 2691 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2692 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2693 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2694 my $ob = $obs[rand @obs];
2468 2695
2531} 2758}
2532 2759
2533sub prepare_random_map { 2760sub prepare_random_map {
2534 my ($exit) = @_; 2761 my ($exit) = @_;
2535 2762
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2763 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2764 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2765 # that depends on the exit object
2541 2766
2542 my $rmp = parse_random_map_params $exit->msg; 2767 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2769 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2770 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2771 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2772 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2773 $rmp->{origin_y} = $exit->y;
2774
2775 $exit->map->touch;
2549 } 2776 }
2550 2777
2551 $rmp->{random_seed} ||= $exit->random_seed; 2778 $rmp->{random_seed} ||= $exit->random_seed;
2552 2779
2553 my $data = cf::to_json $rmp; 2780 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2781 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2782 my $meta = "$RANDOMDIR/$md5.meta";
2556 2783
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2784 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2785 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2786 undef $fh;
2560 aio_rename "$meta~", $meta; 2787 aio_rename "$meta~", $meta;
2561 2788
2789 my $slaying = "?random/$md5";
2790
2791 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2792 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2793 $exit->msg (undef);
2794 }
2564 } 2795 }
2565} 2796}
2566 2797
2567sub cf::object::player::enter_exit { 2798sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2799 my ($self, $exit) = @_;
2569 2800
2570 return unless $self->type == cf::PLAYER; 2801 return unless $self->type == cf::PLAYER;
2571 2802
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; 2803 $self->enter_link;
2584 2804
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 { 2805 (async {
2590 $self->deactivate_recursive; # just to be sure 2806 $Coro::current->{desc} = "enter_exit";
2807
2591 unless (eval { 2808 unless (eval {
2809 $self->deactivate_recursive; # just to be sure
2810
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2820 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp;
2822
2592 $self->goto ($slaying, $hp, $sp); 2823 $self->goto ($map, $x, $y);
2593 2824
2825 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y)
2827 if $exit->flag (cf::FLAG_DAMNED);
2828
2594 1; 2829 1
2595 }) { 2830 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2597 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2600 2835
2601 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
2618sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2619 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2620 2855
2621 utf8::encode $text; 2856 utf8::encode $text;
2622 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2623} 2883}
2624 2884
2625=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2626 2886
2627Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send 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 2889the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2890the message unless the client supports the msg packet.
2631 2891
2632=cut 2892=cut
2633 2893
2894# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2635 "c/identify" => { 2902 "c/identify" => {
2636 id => "identify", 2903 id => "infobox",
2637 title => "Identify", 2904 title => "Identify",
2638 reply => undef, 2905 reply => undef,
2639 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2640 }, 2907 },
2641 "c/examine" => { 2908 "c/examine" => {
2642 id => "examine", 2909 id => "infobox",
2643 title => "Examine", 2910 title => "Examine",
2644 reply => undef, 2911 reply => undef,
2645 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2646 }, 2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2919 },
2920 "c/book" => {
2921 id => "infobox",
2922 title => "Book",
2923 reply => undef,
2924 tooltip => "The contents of a note or book",
2925 },
2926 "c/lookat" => {
2927 id => "infobox",
2928 title => "Look",
2929 reply => undef,
2930 tooltip => "What you saw there",
2931 },
2932 "c/who" => {
2933 id => "infobox",
2934 title => "Players",
2935 reply => undef,
2936 tooltip => "Shows players who are currently online",
2937 },
2938 "c/body" => {
2939 id => "infobox",
2940 title => "Body Parts",
2941 reply => undef,
2942 tooltip => "Shows which body parts you posess and are available",
2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2980 "c/uptime" => {
2981 id => "infobox",
2982 title => "Uptime",
2983 reply => undef,
2984 tooltip => "How long the server has been running since last restart",
2985 },
2986 "c/mapinfo" => {
2987 id => "infobox",
2988 title => "Map Info",
2989 reply => undef,
2990 tooltip => "Information related to the maps",
2991 },
2992 "c/party" => {
2993 id => "party",
2994 title => "Party",
2995 reply => "gsay ",
2996 tooltip => "Messages and chat related to your party",
2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2647); 3006);
2648 3007
2649sub cf::client::send_msg { 3008sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2651 3010
2652 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2653 3013
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 3015
2656 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3017 if ($CHANNEL{$channel}) {
3018 $channel = $CHANNEL{$channel};
2658 3019
3020 $self->ext_msg (channel_info => $channel);
3021 $channel = $channel->{id};
3022
2659 if (ref $channel) { 3023 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2664 if $self->can_msg;
2665 } 3028 }
2666 3029
2667 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2668 } 3031 }
2669 3032
2670 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2671 3034
2672 if ($self->can_msg) {
2673 # default colour, mask it out 3035 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2676 3038
2677 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3039 my $pkt = "msg "
3040 . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2679 } else { 3042 );
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 3043
2691 $color &= cf::NDI_COLOR_MASK; 3044 $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} 3045}
2705 3046
2706=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2707 3048
2708Sends an ext event to the client. 3049Sends an ext event to the client.
2711 3052
2712sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2713 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2714 3055
2715 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2718 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 } 3061 }
2721} 3062}
2722 3063
2723=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2724 3065
2728 3069
2729sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2731 3072
2732 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove 3076 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 } 3079 }
2739} 3080}
2740 3081
2741=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2742 3083
2843 3184
2844 $coro 3185 $coro
2845} 3186}
2846 3187
2847cf::client->attach ( 3188cf::client->attach (
2848 on_destroy => sub { 3189 on_client_destroy => sub {
2849 my ($ns) = @_; 3190 my ($ns) = @_;
2850 3191
2851 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2852 }, 3193 },
2853); 3194);
2869our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
2870 3211
2871$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
2872 3213
2873$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
2875 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
2876 sort time 3217 sort time
2877)); 3218));
2878 3219
2879# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
2881=pod 3222=pod
2882 3223
2883The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
2884 3225
2885 cf::object 3226 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3227 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3228 insert remove name archname title slaying race decrease split
3229 value
2888 3230
2889 cf::object::player 3231 cf::object::player
2890 player 3232 player
2891 3233
2892 cf::player 3234 cf::player
2897 3239
2898=cut 3240=cut
2899 3241
2900for ( 3242for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3245 decrease split destroy change_exp value msg lore send_msg)],
2904 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
2906 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
2907) { 3249) {
2908 no strict 'refs'; 3250 no strict 'refs';
2909 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
2910 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2928 3270
2929 my $qcode = $code; 3271 my $qcode = $code;
2930 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2931 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
2932 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
2933 local $_; 3278 local $_;
2934 local @safe::cf::_safe_eval_args = values %vars;
2935 3279
2936 my $eval = 3280 my $eval =
2937 "do {\n" 3281 "do {\n"
2938 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2939 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
2940 . $code 3284 . $code
2941 . "\n}" 3285 . "\n}"
2942 ; 3286 ;
2943 3287
3288 if ($CFG{safe_eval}) {
2944 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
2945 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2946 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
2947 3297
2948 if ($@) { 3298 if ($@) {
2949 warn "$@"; 3299 warn "$@";
2950 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
2951 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
2970=cut 3320=cut
2971 3321
2972sub register_script_function { 3322sub register_script_function {
2973 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
2974 3324
2975 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
2976 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
2977} 3327}
2978 3328
2979=back 3329=back
2980 3330
2981=cut 3331=cut
3002 3352
3003 $facedata->{version} == 2 3353 $facedata->{version} == 2
3004 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005 3355
3006 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3007 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC, 3359 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3010 }; 3362 };
3011 cf::cede_to_tick; 3363 cf::cede_to_tick;
3012 3364
3013 { 3365 {
3014 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3015 3367
3016 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370
3018 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3022 3375
3023 cf::cede_to_tick; 3376 cf::cede_to_tick;
3024 } 3377 }
3025 3378
3026 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3380 next unless $info->{smooth};
3381
3028 my $idx = cf::face::find $face 3382 my $idx = cf::face::find $face
3029 or next; 3383 or next;
3384
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3385 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3386 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3388 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3389 warn "smooth face '$info->{smooth}' not found for face '$face'";
3048 3403
3049 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3050 } 3405 }
3051 3406
3052 { 3407 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3056 3409
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3411 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062 3413
3063 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3064 # prepend meta info 3415 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 { 3416 } else {
3073 $data = $info->{data}; 3417 $RESOURCE{$name} = $info;
3074 } 3418 }
3075 3419
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; 3420 cf::cede_to_tick;
3080 } 3421 }
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 } 3422 }
3423
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3425
3101 1 3426 1
3102} 3427}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3103 3448
3104register_exticmd fx_want => sub { 3449register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3450 my ($ns, $want) = @_;
3106 3451
3107 while (my ($k, $v) = each %$want) { 3452 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3453 $ns->fx_want ($k, $v);
3109 } 3454 }
3110}; 3455};
3456
3457sub load_resource_file($) {
3458 my $guard = lock_acquire "load_resource_file";
3459
3460 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100;
3462 cf::arch::commit_load;
3463
3464 $status
3465}
3111 3466
3112sub reload_regions { 3467sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3468 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3469 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3470 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3484}
3130 3485
3131sub reload_archetypes { 3486sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3487 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3488 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} 3489}
3140 3490
3141sub reload_treasures { 3491sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3492 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3493 or die "unable to load treasurelists\n";
3144} 3494}
3145 3495
3146sub reload_resources { 3496sub reload_resources {
3147 warn "reloading resource files...\n"; 3497 warn "reloading resource files...\n";
3148 3498
3499 reload_facedata;
3500 reload_archetypes;
3149 reload_regions; 3501 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3502 reload_treasures;
3154 3503
3155 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3156} 3505}
3157 3506
3158sub init {
3159 reload_resources;
3160}
3161
3162sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3511 or return;
3165 3512
3166 local $/; 3513 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3168 3515
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3517
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $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}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3176 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3177 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3178 }; 3525 };
3179 warn $@ if $@; 3526 warn $@ if $@;
3180 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3181} 3558}
3182 3559
3183sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3184 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3573 (async {
3188 Event::one_event; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3575 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3190 }; 3577 };
3191 3578
3579 evthread_start IO::AIO::poll_fileno;
3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3192 reload_config; 3591 reload_config;
3193 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3194 load_extensions; 3602 load_extensions;
3195 3603
3196 $TICK_WATCHER->start; 3604 utime time, time, $RUNTIMEFILE;
3197 Event::loop; 3605
3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3198} 3617}
3199 3618
3200############################################################################# 3619#############################################################################
3201# initialisation and cleanup 3620# initialisation and cleanup
3202 3621
3203# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3204BEGIN { 3623BEGIN {
3624 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3626 $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"; 3627 cf::cleanup "SIG$signal";
3213 },
3214 ); 3628 };
3215 } 3629 }
3216} 3630}
3217 3631
3218sub write_runtime { 3632sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3220 3634
3221 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3223 3637
3224 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3225 3639
3226 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3227 3641
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3229 or return; 3643 or return;
3230 3644
3231 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3243 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3244 3658
3245 close $fh 3659 close $fh
3246 or return; 3660 or return;
3247 3661
3248 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3249 and return; 3663 and return;
3250 3664
3251 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3252 3666
3253 1 3667 1
3668}
3669
3670our $uuid_lock;
3671our $uuid_skip;
3672
3673sub write_uuid_sync($) {
3674 $uuid_skip ||= $_[0];
3675
3676 return if $uuid_lock;
3677 local $uuid_lock = 1;
3678
3679 my $uuid = "$LOCALDIR/uuid";
3680
3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3682 or return;
3683
3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0;
3693
3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3695 and return;
3696
3697 # always fsync - this file is important
3698 aio_fsync $fh
3699 and return;
3700
3701 close $fh
3702 or return;
3703
3704 aio_rename "$uuid~", $uuid
3705 and return;
3706
3707 warn "uuid file written ($value).\n";
3708
3709 1
3710
3711}
3712
3713sub write_uuid($$) {
3714 my ($skip, $sync) = @_;
3715
3716 $sync ? write_uuid_sync $skip
3717 : async { write_uuid_sync $skip };
3254} 3718}
3255 3719
3256sub emergency_save() { 3720sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3258 3722
3259 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3260 3724
3261 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3262 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3263 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3264 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3266 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3737 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3739 $pl->save;
3270 } 3740 }
3271 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3272 3742
3273 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3274 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3275 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3276 $map->valid or next; 3746 $map->valid or next;
3277 $map->save; 3747 $map->save;
3278 } 3748 }
3279 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3280 3750
3281 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3754
3755 warn "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n";
3284 }; 3758 };
3285 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3286 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3287} 3766}
3288 3767
3289sub post_cleanup { 3768sub post_cleanup {
3290 my ($make_core) = @_; 3769 my ($make_core) = @_;
3291 3770
3292 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3294} 3801}
3295 3802
3296sub do_reload_perl() { 3803sub do_reload_perl() {
3297 # can/must only be called in main 3804 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3299 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3300 return; 3807 return;
3301 } 3808 }
3302 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3303 warn "reloading..."; 3815 warn "reloading...";
3304 3816
3305 warn "entering sync_job"; 3817 warn "entering sync_job";
3306 3818
3307 cf::sync_job { 3819 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3309 cf::emergency_save; 3821 cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3311 3823
3312 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3826
3315 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3316 3828
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"; 3829 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; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3328 warn "iterate..."; 3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3329 }
3330
3331 ++$RELOAD;
3332
3333 warn "cancelling all extension coros";
3334 $_->cancel for values %EXT_CORO;
3335 %EXT_CORO = ();
3336
3337 warn "removing commands";
3338 %COMMAND = ();
3339
3340 warn "removing ext/exti commands";
3341 %EXTCMD = ();
3342 %EXTICMD = ();
3343
3344 warn "unloading/nuking all extensions";
3345 for my $pkg (@EXTS) {
3346 warn "... unloading $pkg";
3347
3348 if (my $cb = $pkg->can ("unload")) {
3349 eval {
3350 $cb->($pkg);
3351 1
3352 } or warn "$pkg unloaded, but with errors: $@";
3353 } 3832 }
3354 3833
3355 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3356 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3357 } 3836 %EXT_CORO = ();
3358 3837
3359 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3360 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3363 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3364 delete $INC{$k};
3365 3848
3366 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g;
3368
3369 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3370 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3371 } 3858 }
3372 3859
3373 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3374 } 3875 }
3375 3876
3376 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 3880
3380 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3383 3884
3384 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3385 # and global variables created in xs 3886 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3387 3888
3388 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3389 3890
3390 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3391 require cf; 3892 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3393 3894
3394 warn "loading config and database again"; 3895 warn "loading config and database again";
3395 cf::reload_config; 3896 cf::reload_config;
3396 3897
3397 warn "loading extensions"; 3898 warn "loading extensions";
3398 cf::load_extensions; 3899 cf::load_extensions;
3399 3900
3901 if ($REATTACH_ON_RELOAD) {
3400 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3403 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3406 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3407 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3408 3914
3409 1 3915 1
3410 } or do { 3916 } or do {
3411 warn $@; 3917 warn $@;
3412 warn "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3919 };
3415 3920
3416 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3417}; 3927};
3418 3928
3419our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3420 3930
3421sub reload_perl() { 3931sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3424 3934
3425 $RELOAD_WATCHER ||= Event->timer ( 3935 $RELOAD_WATCHER ||= cf::async {
3426 reentrant => 0, 3936 Coro::AIO::aio_wait cache_extensions;
3427 after => 0, 3937
3428 data => WF_AUTOCANCEL, 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3429 cb => sub {
3430 do_reload_perl; 3939 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3432 }, 3941 };
3433 ); 3942 };
3434} 3943}
3435 3944
3436register_command "reload" => sub { 3945register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3438 3947
3439 if ($who->flag (FLAG_WIZ)) { 3948 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3949 $who->message ("reloading server.");
3950 async {
3951 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3952 reload_perl;
3953 };
3442 } 3954 }
3443}; 3955};
3444 3956
3445unshift @INC, $LIBDIR; 3957unshift @INC, $LIBDIR;
3446 3958
3448 3960
3449our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3451 3963
3452sub wait_for_tick { 3964sub wait_for_tick {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3455 3966
3456 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 3969 $signal->wait;
3459} 3970}
3460 3971
3461sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3464 3974
3465 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3977 $signal->wait;
3468} 3978}
3469 3979
3470$TICK_WATCHER = Event->timer ( 3980sub 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) { 3981 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3480 return; 3984 return;
3481 } 3985 }
3482 3986
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3486 3988
3487 $RUNTIME += $TICK; 3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3488 $NEXT_TICK += $TICK;
3489 3990
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3993 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3995 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3996 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3997 };
3998 }
3497 3999
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 4001 $sig->send;
3500 } 4002 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 4003 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 4004 $sig->send;
3503 } 4005 }
3504 4006
3505 $NOW = Event::time; 4007 $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; 4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 4009
3516 _post_tick; 4010 if (0) {
4011 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d#
4015 }
3517 }, 4016 }
3518); 4017}
3519 4018
3520{ 4019{
4020 # configure BDB
4021
3521 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3522 BDB::max_poll_time $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 4024 $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 4025
3547 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 4033
3554 cf::sync_job { 4034 cf::sync_job {
3555 eval { 4035 eval {
3565 4045
3566 cf::cleanup "db_env_open(db): $@" if $@; 4046 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 4047 };
3568 } 4048 }
3569 4049
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 4050 $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 { }; 4051 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 4052 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4053 $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 { }; 4054 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 4055 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 4056 $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 { }; 4057 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 4058 };
3600} 4059}
3601 4060
3602{ 4061{
4062 # configure IO::AIO
4063
3603 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 4066 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} 4067}
3616 4068
3617my $_log_backtrace; 4069my $_log_backtrace;
3618 4070
3619sub _log_backtrace { 4071sub _log_backtrace {
3622 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3623 4075
3624 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3627 async { 4080 async {
4081 $Coro::current->{desc} = "abt $msg";
4082
3628 my @bt = fork_call { 4083 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4085 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4086 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 4087 or die "addr2line: $!";
3640 } 4095 }
3641 4096
3642 @funcs 4097 @funcs
3643 }; 4098 };
3644 4099
3645 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3647 --$_log_backtrace; 4103 --$_log_backtrace;
3648 }; 4104 };
3649 } else { 4105 } else {
3650 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3651 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3652 } 4108 }
3653} 4109}
3654 4110
3655# load additional modules 4111# load additional modules
3656use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3657 4114
3658END { cf::emergency_save } 4115END { cf::emergency_save }
3659 4116
36601 41171
3661 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines