ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.526 by root, Wed Apr 21 05:48:35 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 Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 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.51 (); 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 {
359 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
360 440
361 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
362 443
363 while () { 444 while () {
364 next_job: 445 next_job:
446
365 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 448
367 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 453 $job->[2]->send;
371 Coro::cede; 454 Coro::cede;
372 goto next_job; 455 goto next_job;
373 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 458 }
375 } 459 }
376 460
377 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
378 # 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
379 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 464 $signal->wait;
381 } else { 465 } else {
466 $busy = 0;
382 Coro::schedule; 467 Coro::schedule;
383 } 468 }
384 } 469 }
385}; 470};
386 471
387sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
388 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
389 476
390 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
391 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
392 480
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
406 494
407BEGIN { *async = \&Coro::async_pool } 495BEGIN { *async = \&Coro::async_pool }
408 496
409=item cf::sync_job { BLOCK } 497=item cf::sync_job { BLOCK }
410 498
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 499The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 500is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 501partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 502acceptable.
415 503
416If 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
417the given BLOCK in another coroutine while waiting for the result. The 505the given BLOCK in another coroutine while waiting for the result. The
422 510
423sub sync_job(&) { 511sub sync_job(&) {
424 my ($job) = @_; 512 my ($job) = @_;
425 513
426 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 515 my $time = AE::time;
428 516
429 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
431 519
432 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
433 521
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
437 523
438 my $busy = 1; 524 my $busy = 1;
439 my @res; 525 my @res;
440 526
444 warn $@ if $@; 530 warn $@ if $@;
445 undef $busy; 531 undef $busy;
446 })->prio (Coro::PRIO_MAX); 532 })->prio (Coro::PRIO_MAX);
447 533
448 while ($busy) { 534 while ($busy) {
449 Coro::cede or Event::one_event; 535 if (Coro::nready) {
536 Coro::cede_notself;
537 } else {
538 EV::loop EV::LOOP_ONESHOT;
450 } 539 }
540 }
451 541
452 $time = Event::time - $time; 542 my $time = AE::time - $time;
453 543
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
458 545
459 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
460 } else { 547 } else {
461 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
462 549
487=item fork_call { }, $args 574=item fork_call { }, $args
488 575
489Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
493 580
494=cut 581=cut
495 582
496sub fork_call(&@) { 583sub fork_call(&@) {
497 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
504 reset_signals; 591 reset_signals;
505 &$cb 592 &$cb
506 }, @args; 593 }, @args;
507 594
508 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
509} 634}
510 635
511=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
512 637
513Returns a single value from the environment database. 638Returns a single value from the environment database.
652 777
653############################################################################# 778#############################################################################
654 779
655=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
656 781
657Many 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
658attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
660 785
661In 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>
662C<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
663Crossfire TRT). 788Deliantra).
664 789
665=over 4 790=over 4
666 791
667=item $attachable->attach ($attachment, key => $value...) 792=item $attachable->attach ($attachment, key => $value...)
668 793
712=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
713 838
714Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
716 841
717Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
718that 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.
719 844
720These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
721 846
722=over 4 847=over 4
950 } 1075 }
951 1076
952 0 1077 0
953} 1078}
954 1079
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1081
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1083
959Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
960 1085
966 1091
967=cut 1092=cut
968 1093
969############################################################################# 1094#############################################################################
970# object support 1095# object support
971#
972 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#
973sub _can_merge { 1130sub _can_merge {
974 my ($ob1, $ob2) = @_; 1131 my ($ob1, $ob2) = @_;
975 1132
976 return 1;#d# 1133 ++$SLOW_MERGES;#d#
977 1134
978 #todo#d# kill yourself and do some recursive checking manually without storable 1135 # we do the slow way here
979 sync_job { 1136 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1137}
987 1138
988sub reattach { 1139sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1141 my ($obj) = @_;
991 1142
1143 # no longer needed after getting rid of delete_package?
992 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
993 1145
994 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
995 1147
996 @$registry = (); 1148 @$registry = ();
997 1149
1012cf::attachable->attach ( 1164cf::attachable->attach (
1013 prio => -1000000, 1165 prio => -1000000,
1014 on_instantiate => sub { 1166 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1016 1168
1017 $data = from_json $data; 1169 $data = decode_json $data;
1018 1170
1019 for (@$data) { 1171 for (@$data) {
1020 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1021 1173
1022 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
1043 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1044 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1045 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1046 1198
1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1050 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 }
1051 close $fh; 1206 aio_close $fh;
1052 1207
1053 if (@$objs) { 1208 if (@$objs) {
1054 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) {
1055 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1058 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 }
1059 close $fh; 1217 aio_close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1219 }
1062 } else { 1220 } else {
1063 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1064 } 1222 }
1065 1223
1066 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1067 } else { 1228 } else {
1068 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1069 } 1230 }
1070 } else { 1231 } else {
1071 aio_unlink $filename; 1232 aio_unlink $filename;
1072 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1073 } 1234 }
1092 1253
1093 unless (aio_stat "$filename.pst") { 1254 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1255 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1256 or return;
1096 1257
1097 my $st = eval { Coro::Storable::thaw $av } 1258 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1259 $av = $st->{objs};
1100 } 1260 }
1101 1261
1102 utf8::decode (my $decname = $filename); 1262 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1263 warn sprintf "loading %s (%d,%d)\n",
1165 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1166 1326
1167 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1168} 1328}
1169 1329
1330use File::Glob ();
1331
1170cf::player->attach ( 1332cf::player->attach (
1171 on_command => sub { 1333 on_unknown_command => sub {
1172 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1173 1335
1174 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1175 or return; 1337 or return;
1176 1338
1206 1368
1207 cf::override; 1369 cf::override;
1208 }, 1370 },
1209); 1371);
1210 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
1211sub load_extensions { 1386sub load_extensions {
1212 cf::sync_job { 1387 cf::sync_job {
1213 my %todo; 1388 my %todo;
1214 1389
1215 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1234 1409
1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1237 1412
1238 $ext{source} = 1413 $ext{source} =
1239 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1240 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1241 . $source 1416 . $source
1242 . "\n};\n1"; 1417 . "\n};\n1";
1243 1418
1244 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1245 } 1420 }
1246 1421
1422 my $pass = 0;
1247 my %done; 1423 my %done;
1248 while (%todo) { 1424 while (%todo) {
1249 my $progress; 1425 my $progress;
1250 1426
1427 ++$pass;
1428
1429 ext:
1251 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1252 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1253 goto skip 1432 next ext
1254 unless exists $done{$_}; 1433 unless exists $done{$_};
1255 } 1434 }
1256 1435
1257 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1258 1437
1259 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1260 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1261 : "$v->{base}: extension inactive.\n";
1262 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1263 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1264 warn $msg; 1445
1265 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1266 exit 1; 1447 delete $todo{$k};
1267 } 1448 } else {
1268 1449 $done{$k} = delete $todo{$k};
1269 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1270 } 1455 }
1271
1272 $done{$k} = delete $todo{$k};
1273 push @EXTS, $v->{pkg};
1274 $progress = 1;
1275 } 1456 }
1276 1457
1277 skip: 1458 unless ($progress) {
1278 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1279 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 }
1280 } 1466 }
1281 }; 1467 };
1282} 1468}
1283 1469
1284############################################################################# 1470#############################################################################
1285 1471
1286=back 1472=back
1287 1473
1288=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1289 1475
1290Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1291 1477
1292=cut 1478=cut
1293 1479
1294package cf::player; 1480package cf::player;
1295 1481
1338 1524
1339sub exists($) { 1525sub exists($) {
1340 my ($login) = @_; 1526 my ($login) = @_;
1341 1527
1342 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1343 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1344} 1530}
1345 1531
1346sub find($) { 1532sub find($) {
1347 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1348 my $login = $_[0]; 1534 my $login = $_[0];
1360 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1361 or return; 1547 or return;
1362 1548
1363 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1364 or return; 1550 or return;
1551
1365 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1367 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1368 } 1555 }
1369 } 1556 }
1370} 1557}
1371 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
1372sub save($) { 1572sub save($) {
1373 my ($pl) = @_; 1573 my ($pl) = @_;
1374 1574
1375 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1376 1576
1379 1579
1380 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1381 1581
1382 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1383 $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];
1384 1589
1385 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1386 cf::cede_to_tick; 1591 cf::cede_to_tick;
1387} 1592}
1388 1593
1420 my ($pl) = @_; 1625 my ($pl) = @_;
1421 1626
1422 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1423 1628
1424 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1425 $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
1426 1631
1427 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1428 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1429 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1430 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1431 1638
1432 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1433 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1472 1679
1473 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1474 my $path = path $login; 1681 my $path = path $login;
1475 1682
1476 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1479 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1480 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 } 1689 }
1482 1690
1486 1694
1487 \@logins 1695 \@logins
1488} 1696}
1489 1697
1490=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1491 1701
1492Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1493player. May block. 1703player. May block.
1494 1704
1495=cut 1705=cut
1513 } 1723 }
1514 1724
1515 \@paths 1725 \@paths
1516} 1726}
1517 1727
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1519 1729
1520Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568 1731
1569=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1570 1733
1571Sends an ext reply to the player. 1734Sends an ext reply to the player.
1572 1735
1604 1767
1605=cut 1768=cut
1606 1769
1607sub find_by_path($) { 1770sub find_by_path($) {
1608 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1609 1774
1610 my ($match, $specificity); 1775 my ($match, $specificity);
1611 1776
1612 for my $region (list) { 1777 for my $region (list) {
1613 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1639our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1641 1806
1642sub generate_random_map { 1807sub generate_random_map {
1643 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
1644 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1645 $self->_create_random_map ( 1813 $self->_create_random_map (
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1649 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1650 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1651 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1652 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1674 1842
1675 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1676} 1844}
1677 1845
1678# also paths starting with '/' 1846# also paths starting with '/'
1679$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1680 1848
1681sub thawer_merge { 1849sub thawer_merge {
1682 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1683 1851
1684 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1770 1938
1771# the temporary/swap location 1939# the temporary/swap location
1772sub save_path { 1940sub save_path {
1773 my ($self) = @_; 1941 my ($self) = @_;
1774 1942
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1777} 1945}
1778 1946
1779# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1780sub uniq_path { 1948sub uniq_path {
1781 my ($self) = @_; 1949 my ($self) = @_;
1782 1950
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1785}
1786
1787# and all this just because we cannot iterate over
1788# all maps in C++...
1789sub change_all_map_light {
1790 my ($change) = @_;
1791
1792 $_->change_map_light ($change)
1793 for grep $_->outdoor, values %cf::MAP;
1794} 1953}
1795 1954
1796sub decay_objects { 1955sub decay_objects {
1797 my ($self) = @_; 1956 my ($self) = @_;
1798 1957
1882sub find { 2041sub find {
1883 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1884 2043
1885 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1886 2045
1887 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1888 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1889 2048
1890 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1894 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1895 or return; 2051 or return;
1896 2052
1897 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1898 2054
1900 or return; 2056 or return;
1901 2057
1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1903 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1904 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1905 undef $guard1; 2062 undef $guard1;
1906 undef $guard2;
1907 $map->reset; 2063 $map->reset;
1908 return find $path; 2064 return find $path;
1909 } 2065 }
1910 2066
1911 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1912 } 2068 }
1913} 2069}
1914 2070
1915sub pre_load { } 2071sub pre_load { }
1916sub post_load { } 2072#sub post_load { } # XS
1917 2073
1918sub load { 2074sub load {
1919 my ($self) = @_; 2075 my ($self) = @_;
1920 2076
1921 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
1938 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block; 2095 $f->skip_block;
1940 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
1941 or return; 2097 or return;
1942 2098
1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
1944 if delete $self->{load_original}; 2100 if delete $self->{load_original};
1945 2101
1946 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
1947 utf8::encode $uniq; 2103 utf8::encode $uniq;
1948 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
1966 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
1967 $self->decay_objects; 2123 $self->decay_objects;
1968 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
1969 $self->update_buttons; 2125 $self->update_buttons;
1970 cf::cede_to_tick; 2126 cf::cede_to_tick;
1971 $self->set_darkness_map;
1972 cf::cede_to_tick;
1973 $self->activate; 2127 $self->activate;
1974 } 2128 }
1975 2129
1976 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
1978 2132
1979 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
1980 } 2134 }
1981 2135
1982 $self->post_load; 2136 $self->post_load;
1983} 2137}
1984 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
1985sub customise_for { 2142sub customise_for {
1986 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
1987 2144
1988 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
1989 if $self->per_player; 2146 if $self->per_player;
2042 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2043 2200
2044 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2045 2202
2046 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2048 } 2205 }
2049 2206
2050 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2051 2208
2052 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2066 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2067 2224
2068 () 2225 ()
2069} 2226}
2070 2227
2228# common code, used by both ->save and ->swapout
2071sub save { 2229sub _save {
2072 my ($self) = @_; 2230 my ($self) = @_;
2073
2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
2075 2231
2076 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2077 2233
2078 return unless $self->dirty; 2234 return unless $self->dirty;
2079 2235
2088 2244
2089 cf::async { 2245 cf::async {
2090 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2091 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2092 }; 2248 };
2249
2250 cf::get_slot 0.02;
2093 2251
2094 if ($uniq) { 2252 if ($uniq) {
2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2096 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2097 } else { 2255 } else {
2098 $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);
2099 } 2257 }
2100} 2258}
2101 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2102sub swap_out { 2268sub swap_out {
2103 my ($self) = @_; 2269 my ($self) = @_;
2104 2270
2105 # save first because save cedes
2106 $self->save;
2107
2108 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2109 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2110 return if $self->players; 2275 return if $self->players;
2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
2112 return if $self->{deny_save};
2113 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2114 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2115 2327
2116 $self->deactivate; 2328 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2118 $self->clear; 2330 $self->clear;
2119}
2120
2121sub reset_at {
2122 my ($self) = @_;
2123
2124 # TODO: safety, remove and allow resettable per-player maps
2125 return 1e99 if $self->{deny_reset};
2126
2127 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2128 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2129
2130 $time + $to
2131}
2132
2133sub should_reset {
2134 my ($self) = @_;
2135
2136 $self->reset_at <= $cf::RUNTIME
2137}
2138
2139sub reset {
2140 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143
2144 return if $self->players;
2145
2146 warn "resetting map ", $self->path;
2147
2148 $self->in_memory (cf::MAP_SWAPPED);
2149
2150 # need to save uniques path
2151 unless ($self->{deny_save}) {
2152 my $uniq = $self->uniq_path; utf8::encode $uniq;
2153
2154 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2155 if $uniq;
2156 }
2157
2158 delete $cf::MAP{$self->path};
2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
2162 $self->clear;
2163 2331
2164 $self->unlink_save; 2332 $self->unlink_save;
2165 $self->destroy; 2333 $self->destroy;
2166} 2334}
2167 2335
2175 2343
2176 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2177 2345
2178 $self->unlink_save; 2346 $self->unlink_save;
2179 2347
2180 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2181 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2182 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2183 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2185 2353
2234 2402
2235sub unique_maps() { 2403sub unique_maps() {
2236 [ 2404 [
2237 map { 2405 map {
2238 utf8::decode $_; 2406 utf8::decode $_;
2239 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2240 ? normalise $_ 2410 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2412 ]
2244} 2413}
2245 2414
2246package 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}
2247 2446
2248=back 2447=back
2249 2448
2250=head3 cf::object 2449=head3 cf::object
2251 2450
2255 2454
2256=over 4 2455=over 4
2257 2456
2258=item $ob->inv_recursive 2457=item $ob->inv_recursive
2259 2458
2260Returns 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.
2261 2461
2262=cut 2462=cut
2263 2463
2264sub inv_recursive_; 2464sub inv_recursive_;
2265sub inv_recursive_ { 2465sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2271} 2471}
2272 2472
2273=item $ref = $ob->ref 2473=item $ref = $ob->ref
2274 2474
2275creates 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.
2276 2476
2277=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2278 2478
2279returns 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,
2280even if the object actually exists. May block. 2480even if the object actually exists. May block.
2312can 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
2313dialogue with the given NPC character. 2513dialogue with the given NPC character.
2314 2514
2315=cut 2515=cut
2316 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
2317# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2318# with dialog boxes. 2532# with dialog boxes.
2319#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
2320sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2321 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2332 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2333 $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));
2334 2548
2335 } else { 2549 } else {
2336 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2337 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2338 } 2552 }
2339 } 2553 }
2340} 2554}
2341 2555
2342=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2367 2581
2368=item $player_object->enter_link 2582=item $player_object->enter_link
2369 2583
2370Freezes 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}>).
2371 2585
2372The 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.
2373I<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.
2374 2590
2375Will never block. 2591Will never block.
2376 2592
2377=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2378 2594
2403 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2404 2620
2405 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2406 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2407 2623
2408 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2409} 2625}
2410 2626
2411sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2412 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2413 2629
2430 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2431 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2432 2648
2433 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2434 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2435 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2436 2652
2437 $map->load; 2653 $map->load;
2438 $map->load_neighbours; 2654 $map->load_neighbours;
2439 2655
2440 return unless $self->contr->active; 2656 return unless $self->contr->active;
2441 $self->activate_recursive;
2442 2657
2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2444 $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;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again
2445} 2664}
2446 2665
2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2448 2667
2449Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
2450her, loading and preparing them map, calling the provided $check callback 2669her, loading and preparing them map, calling the provided $check callback
2451that has to return the map if sucecssful, and then unfreezes the player on 2670that has to return the map if sucecssful, and then unfreezes the player on
2452the new (success) or old (failed) map position. In either case, $done will 2671the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process. 2672be called at the end of this process.
2673
2674Note that $check will be called with a potentially non-loaded map, so if
2675it needs a loaded map it has to call C<< ->load >>.
2454 2676
2455=cut 2677=cut
2456 2678
2457our $GOTOGEN; 2679our $GOTOGEN;
2458 2680
2537} 2759}
2538 2760
2539sub prepare_random_map { 2761sub prepare_random_map {
2540 my ($exit) = @_; 2762 my ($exit) = @_;
2541 2763
2542 my $guard = cf::lock_acquire "exit_prepare:$exit";
2543
2544 # all this does is basically replace the /! path by 2764 # all this does is basically replace the /! path by
2545 # a new random map path (?random/...) with a seed 2765 # a new random map path (?random/...) with a seed
2546 # that depends on the exit object 2766 # that depends on the exit object
2547 2767
2548 my $rmp = parse_random_map_params $exit->msg; 2768 my $rmp = parse_random_map_params $exit->msg;
2550 if ($exit->map) { 2770 if ($exit->map) {
2551 $rmp->{region} = $exit->region->name; 2771 $rmp->{region} = $exit->region->name;
2552 $rmp->{origin_map} = $exit->map->path; 2772 $rmp->{origin_map} = $exit->map->path;
2553 $rmp->{origin_x} = $exit->x; 2773 $rmp->{origin_x} = $exit->x;
2554 $rmp->{origin_y} = $exit->y; 2774 $rmp->{origin_y} = $exit->y;
2775
2776 $exit->map->touch;
2555 } 2777 }
2556 2778
2557 $rmp->{random_seed} ||= $exit->random_seed; 2779 $rmp->{random_seed} ||= $exit->random_seed;
2558 2780
2559 my $data = cf::to_json $rmp; 2781 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2560 my $md5 = Digest::MD5::md5_hex $data; 2782 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2783 my $meta = "$RANDOMDIR/$md5.meta";
2562 2784
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2785 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2786 aio_write $fh, 0, (length $data), $data, 0;
2565 undef $fh; 2787 undef $fh;
2566 aio_rename "$meta~", $meta; 2788 aio_rename "$meta~", $meta;
2567 2789
2790 my $slaying = "?random/$md5";
2791
2792 if ($exit->valid) {
2568 $exit->slaying ("?random/$md5"); 2793 $exit->slaying ("?random/$md5");
2569 $exit->msg (undef); 2794 $exit->msg (undef);
2795 }
2570 } 2796 }
2571} 2797}
2572 2798
2573sub cf::object::player::enter_exit { 2799sub cf::object::player::enter_exit {
2574 my ($self, $exit) = @_; 2800 my ($self, $exit) = @_;
2575 2801
2576 return unless $self->type == cf::PLAYER; 2802 return unless $self->type == cf::PLAYER;
2577 2803
2578 if ($exit->slaying eq "/!") {
2579 #TODO: this should de-fi-ni-te-ly not be a sync-job
2580 # the problem is that $exit might not survive long enough
2581 # so it needs to be done right now, right here
2582 cf::sync_job { prepare_random_map $exit };
2583 }
2584
2585 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2586 my $hp = $exit->stats->hp;
2587 my $sp = $exit->stats->sp;
2588
2589 $self->enter_link; 2804 $self->enter_link;
2590 2805
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2595 (async { 2806 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2807 $Coro::current->{desc} = "enter_exit";
2597 2808
2598 $self->deactivate_recursive; # just to be sure
2599 unless (eval { 2809 unless (eval {
2810 $self->deactivate_recursive; # just to be sure
2811
2812 # random map handling
2813 {
2814 my $guard = cf::lock_acquire "exit_prepare:$exit";
2815
2816 prepare_random_map $exit
2817 if $exit->slaying eq "/!";
2818 }
2819
2820 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2821 my $x = $exit->stats->hp;
2822 my $y = $exit->stats->sp;
2823
2600 $self->goto ($slaying, $hp, $sp); 2824 $self->goto ($map, $x, $y);
2601 2825
2826 # if exit is damned, update players death & WoR home-position
2827 $self->contr->savebed ($map, $x, $y)
2828 if $exit->flag (cf::FLAG_DAMNED);
2829
2602 1; 2830 1
2603 }) { 2831 }) {
2604 $self->message ("Something went wrong deep within the crossfire server. " 2832 $self->message ("Something went wrong deep within the deliantra server. "
2605 . "I'll try to bring you back to the map you were before. " 2833 . "I'll try to bring you back to the map you were before. "
2606 . "Please report this to the dungeon master!", 2834 . "Please report this to the dungeon master!",
2607 cf::NDI_UNIQUE | cf::NDI_RED); 2835 cf::NDI_UNIQUE | cf::NDI_RED);
2608 2836
2609 warn "ERROR in enter_exit: $@"; 2837 warn "ERROR in enter_exit: $@";
2626sub cf::client::send_drawinfo { 2854sub cf::client::send_drawinfo {
2627 my ($self, $text, $flags) = @_; 2855 my ($self, $text, $flags) = @_;
2628 2856
2629 utf8::encode $text; 2857 utf8::encode $text;
2630 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2859}
2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2631} 2884}
2632 2885
2633=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2634 2887
2635Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
2637the message, with C<log> being the default. If C<$color> is negative, suppress 2890the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet. 2891the message unless the client supports the msg packet.
2639 2892
2640=cut 2893=cut
2641 2894
2895# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2643 "c/identify" => { 2903 "c/identify" => {
2644 id => "infobox", 2904 id => "infobox",
2645 title => "Identify", 2905 title => "Identify",
2646 reply => undef, 2906 reply => undef,
2647 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
2650 id => "infobox", 2910 id => "infobox",
2651 title => "Examine", 2911 title => "Examine",
2652 reply => undef, 2912 reply => undef,
2653 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2654 }, 2914 },
2915 "c/shopinfo" => {
2916 id => "infobox",
2917 title => "Shop Info",
2918 reply => undef,
2919 tooltip => "What your bargaining skill tells you about the shop",
2920 },
2921 "c/book" => {
2922 id => "infobox",
2923 title => "Book",
2924 reply => undef,
2925 tooltip => "The contents of a note or book",
2926 },
2655 "c/lookat" => { 2927 "c/lookat" => {
2656 id => "infobox", 2928 id => "infobox",
2657 title => "Look", 2929 title => "Look",
2658 reply => undef, 2930 reply => undef,
2659 tooltip => "What you saw there", 2931 tooltip => "What you saw there",
2660 }, 2932 },
2933 "c/who" => {
2934 id => "infobox",
2935 title => "Players",
2936 reply => undef,
2937 tooltip => "Shows players who are currently online",
2938 },
2939 "c/body" => {
2940 id => "infobox",
2941 title => "Body Parts",
2942 reply => undef,
2943 tooltip => "Shows which body parts you posess and are available",
2944 },
2945 "c/statistics" => {
2946 id => "infobox",
2947 title => "Statistics",
2948 reply => undef,
2949 tooltip => "Shows your primary statistics",
2950 },
2951 "c/skills" => {
2952 id => "infobox",
2953 title => "Skills",
2954 reply => undef,
2955 tooltip => "Shows your experience per skill and item power",
2956 },
2957 "c/shopitems" => {
2958 id => "infobox",
2959 title => "Shop Items",
2960 reply => undef,
2961 tooltip => "Shows the items currently for sale in this shop",
2962 },
2963 "c/resistances" => {
2964 id => "infobox",
2965 title => "Resistances",
2966 reply => undef,
2967 tooltip => "Shows your resistances",
2968 },
2969 "c/pets" => {
2970 id => "infobox",
2971 title => "Pets",
2972 reply => undef,
2973 tooltip => "Shows information abotu your pets/a specific pet",
2974 },
2975 "c/perceiveself" => {
2976 id => "infobox",
2977 title => "Perceive Self",
2978 reply => undef,
2979 tooltip => "You gained detailed knowledge about yourself",
2980 },
2981 "c/uptime" => {
2982 id => "infobox",
2983 title => "Uptime",
2984 reply => undef,
2985 tooltip => "How long the server has been running since last restart",
2986 },
2987 "c/mapinfo" => {
2988 id => "infobox",
2989 title => "Map Info",
2990 reply => undef,
2991 tooltip => "Information related to the maps",
2992 },
2993 "c/party" => {
2994 id => "party",
2995 title => "Party",
2996 reply => "gsay ",
2997 tooltip => "Messages and chat related to your party",
2998 },
2999 "c/death" => {
3000 id => "death",
3001 title => "Death",
3002 reply => undef,
3003 tooltip => "Reason for and more info about your most recent death",
3004 },
3005 "c/say" => $SAY_CHANNEL,
3006 "c/chat" => $CHAT_CHANNEL,
2661); 3007);
2662 3008
2663sub cf::client::send_msg { 3009sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2665 3011
2666 $msg = $self->pl->expand_cfpod ($msg); 3012 $msg = $self->pl->expand_cfpod ($msg)
3013 unless $color & cf::NDI_VERBATIM;
2667 3014
2668 $color &= cf::NDI_CLIENT_MASK; # just in case... 3015 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669 3016
2670 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) { 3018 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel}; 3019 $channel = $CHANNEL{$channel};
2673 3020
2674 $self->ext_msg (channel_info => $channel) 3021 $self->ext_msg (channel_info => $channel);
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2678 3023
2679 } elsif (ref $channel) { 3024 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2684 if $self->can_msg;
2685 } 3029 }
2686 3030
2687 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2688 } 3032 }
2689 3033
2690 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2691 3035
2692 if ($self->can_msg) {
2693 # default colour, mask it out 3036 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2696 3039
2697 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3040 my $pkt = "msg "
3041 . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2699 } else { 3043 );
2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710 3044
2711 $color &= cf::NDI_COLOR_MASK; 3045 $self->send_big_packet ($pkt);
2712
2713 utf8::encode $msg;
2714
2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2718 } else {
2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2720 $self->send_packet ("drawinfo $color $msg")
2721 }
2722 }
2723 }
2724} 3046}
2725 3047
2726=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2727 3049
2728Sends an ext event to the client. 3050Sends an ext event to the client.
2731 3053
2732sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2733 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2734 3056
2735 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2738 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 } 3062 }
2741} 3063}
2742 3064
2743=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2744 3066
2748 3070
2749sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2751 3073
2752 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove 3077 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 } 3080 }
2759} 3081}
2760 3082
2761=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2762 3084
2863 3185
2864 $coro 3186 $coro
2865} 3187}
2866 3188
2867cf::client->attach ( 3189cf::client->attach (
2868 on_destroy => sub { 3190 on_client_destroy => sub {
2869 my ($ns) = @_; 3191 my ($ns) = @_;
2870 3192
2871 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2872 }, 3194 },
2873); 3195);
2889our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
2890 3212
2891$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
2892 3214
2893$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
2895 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
2896 sort time 3218 sort time
2897)); 3219));
2898 3220
2899# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
2902 3224
2903The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
2904 3226
2905 cf::object 3227 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy 3228 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr 3229 insert remove name archname title slaying race decrease split
3230 value
2908 3231
2909 cf::object::player 3232 cf::object::player
2910 player 3233 player
2911 3234
2912 cf::player 3235 cf::player
2917 3240
2918=cut 3241=cut
2919 3242
2920for ( 3243for (
2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3244 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race 3245 insert remove inv nrof name archname title slaying race
2923 decrease_ob_nr destroy)], 3246 decrease split destroy change_exp value msg lore send_msg)],
2924 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
2925 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
2926 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
2927) { 3250) {
2928 no strict 'refs'; 3251 no strict 'refs';
2929 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
2930 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2948 3271
2949 my $qcode = $code; 3272 my $qcode = $code;
2950 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2951 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
2952 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
2953 local $_; 3279 local $_;
2954 local @safe::cf::_safe_eval_args = values %vars;
2955 3280
2956 my $eval = 3281 my $eval =
2957 "do {\n" 3282 "do {\n"
2958 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2959 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
2960 . $code 3285 . $code
2961 . "\n}" 3286 . "\n}"
2962 ; 3287 ;
2963 3288
3289 if ($CFG{safe_eval}) {
2964 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
2965 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2966 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
2967 3298
2968 if ($@) { 3299 if ($@) {
2969 warn "$@"; 3300 warn "$@";
2970 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
2971 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
2990=cut 3321=cut
2991 3322
2992sub register_script_function { 3323sub register_script_function {
2993 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
2994 3325
2995 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
2996 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
2997} 3328}
2998 3329
2999=back 3330=back
3000 3331
3001=cut 3332=cut
3022 3353
3023 $facedata->{version} == 2 3354 $facedata->{version} == 2
3024 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3025 3356
3026 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3027 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC, 3360 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3030 }; 3363 };
3031 cf::cede_to_tick; 3364 cf::cede_to_tick;
3032 3365
3033 { 3366 {
3034 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
3035 3368
3036 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3371
3038 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3042 3376
3043 cf::cede_to_tick; 3377 cf::cede_to_tick;
3044 } 3378 }
3045 3379
3046 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3381 next unless $info->{smooth};
3382
3048 my $idx = cf::face::find $face 3383 my $idx = cf::face::find $face
3049 or next; 3384 or next;
3385
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3386 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3387 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3389 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3390 warn "smooth face '$info->{smooth}' not found for face '$face'";
3068 3404
3069 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3070 } 3406 }
3071 3407
3072 { 3408 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3076 3410
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3412 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082 3414
3083 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3084 # prepend meta info 3416 cf::face::set_type $idx, $info->{type};
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else { 3417 } else {
3093 $data = $info->{data}; 3418 $RESOURCE{$name} = $info;
3094 } 3419 }
3095 3420
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3421 cf::cede_to_tick;
3100 } 3422 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3423 }
3424
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3426
3121 1 3427 1
3122} 3428}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3123 3449
3124register_exticmd fx_want => sub { 3450register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3451 my ($ns, $want) = @_;
3126 3452
3127 while (my ($k, $v) = each %$want) { 3453 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v); 3454 $ns->fx_want ($k, $v);
3129 } 3455 }
3130}; 3456};
3457
3458sub load_resource_file($) {
3459 my $guard = lock_acquire "load_resource_file";
3460
3461 my $status = load_resource_file_ $_[0];
3462 get_slot 0.1, 100;
3463 cf::arch::commit_load;
3464
3465 $status
3466}
3131 3467
3132sub reload_regions { 3468sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework 3469 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?) 3470 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = (); 3471 %ext::player_env::MUSIC_FACE_CACHE = ();
3149} 3485}
3150 3486
3151sub reload_archetypes { 3487sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes" 3488 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n"; 3489 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
3159} 3490}
3160 3491
3161sub reload_treasures { 3492sub reload_treasures {
3162 load_resource_file "$DATADIR/treasures" 3493 load_resource_file "$DATADIR/treasures"
3163 or die "unable to load treasurelists\n"; 3494 or die "unable to load treasurelists\n";
3164} 3495}
3165 3496
3166sub reload_resources { 3497sub reload_resources {
3167 warn "reloading resource files...\n"; 3498 warn "reloading resource files...\n";
3168 3499
3500 reload_facedata;
3501 reload_archetypes;
3169 reload_regions; 3502 reload_regions;
3170 reload_facedata;
3171 #reload_archetypes;#d#
3172 reload_archetypes;
3173 reload_treasures; 3503 reload_treasures;
3174 3504
3175 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3176} 3506}
3177 3507
3178sub init {
3179 reload_resources;
3180}
3181
3182sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3512 or return;
3185 3513
3186 local $/; 3514 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3188 3516
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3518
3191 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3192 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3196 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3197 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3198 }; 3526 };
3199 warn $@ if $@; 3527 warn $@ if $@;
3200 } 3528 }
3529
3530 warn "finished reloading resource files\n";
3531}
3532
3533sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!";
3536 flock $fh, &Fcntl::LOCK_EX
3537 or die "$PIDFILE: flock: $!";
3538 $fh
3539}
3540
3541# make sure only one server instance is running at any one time
3542sub atomic {
3543 my $fh = pidfile;
3544
3545 my $pid = <$fh>;
3546 kill 9, $pid if $pid > 0;
3547
3548 seek $fh, 0, 0;
3549 print $fh $$;
3550}
3551
3552sub main_loop {
3553 warn "EV::loop starting\n";
3554 if (1) {
3555 EV::loop;
3556 }
3557 warn "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP;
3201} 3559}
3202 3560
3203sub main { 3561sub main {
3562 cf::init_globals; # initialise logging
3563
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570
3204 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3573 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3207 (async { 3574 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3575 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3576 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3577 })->prio (Coro::PRIO_MAX);
3211 }; 3578 };
3212 3579
3580 evthread_start IO::AIO::poll_fileno;
3581
3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3591 reload_resources;
3213 reload_config; 3592 reload_config;
3214 db_init; 3593 db_init;
3594
3595 cf::init_uuid;
3596 cf::init_signals;
3597 cf::init_skills;
3598
3599 cf::init_beforeplay;
3600
3601 atomic;
3602
3215 load_extensions; 3603 load_extensions;
3216 3604
3217 $TICK_WATCHER->start; 3605 utime time, time, $RUNTIMEFILE;
3218 Event::loop; 3606
3607 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX ();
3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610
3611 (pop @POST_INIT)->(0) while @POST_INIT;
3612 };
3613
3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3616
3617 main_loop;
3219} 3618}
3220 3619
3221############################################################################# 3620#############################################################################
3222# initialisation and cleanup 3621# initialisation and cleanup
3223 3622
3224# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3225BEGIN { 3624BEGIN {
3625 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3234 },
3235 ); 3629 };
3236 } 3630 }
3237} 3631}
3238 3632
3239sub write_runtime { 3633sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime"; 3634 my $t0 = AE::time;
3241 3635
3242 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3244 3638
3245 IO::AIO::aio_utime $runtime, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3246 3640
3247 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3248 3642
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3250 or return; 3644 or return;
3251 3645
3252 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
3264 aio_utime $fh, undef, undef; 3658 aio_utime $fh, undef, undef;
3265 3659
3266 close $fh 3660 close $fh
3267 or return; 3661 or return;
3268 3662
3269 aio_rename "$runtime~", $runtime 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3270 and return; 3664 and return;
3271 3665
3272 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3273 3667
3274 1 3668 1
3669}
3670
3671our $uuid_lock;
3672our $uuid_skip;
3673
3674sub write_uuid_sync($) {
3675 $uuid_skip ||= $_[0];
3676
3677 return if $uuid_lock;
3678 local $uuid_lock = 1;
3679
3680 my $uuid = "$LOCALDIR/uuid";
3681
3682 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3683 or return;
3684
3685 my $value = uuid_seq uuid_cur;
3686
3687 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n";
3689 return;
3690 }
3691
3692 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0;
3694
3695 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3696 and return;
3697
3698 # always fsync - this file is important
3699 aio_fsync $fh
3700 and return;
3701
3702 close $fh
3703 or return;
3704
3705 aio_rename "$uuid~", $uuid
3706 and return;
3707
3708 warn "uuid file written ($value).\n";
3709
3710 1
3711
3712}
3713
3714sub write_uuid($$) {
3715 my ($skip, $sync) = @_;
3716
3717 $sync ? write_uuid_sync $skip
3718 : async { write_uuid_sync $skip };
3275} 3719}
3276 3720
3277sub emergency_save() { 3721sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3722 my $freeze_guard = cf::freeze_mainloop;
3279 3723
3280 warn "enter emergency perl save\n"; 3724 warn "emergency_perl_save: enter\n";
3281 3725
3282 cf::sync_job { 3726 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731
3283 # use a peculiar iteration method to avoid tripping on perl 3732 # use a peculiar iteration method to avoid tripping on perl
3284 # refcount bugs in for. also avoids problems with players 3733 # refcount bugs in for. also avoids problems with players
3285 # and maps saved/destroyed asynchronously. 3734 # and maps saved/destroyed asynchronously.
3286 warn "begin emergency player save\n"; 3735 warn "emergency_perl_save: begin player save\n";
3287 for my $login (keys %cf::PLAYER) { 3736 for my $login (keys %cf::PLAYER) {
3288 my $pl = $cf::PLAYER{$login} or next; 3737 my $pl = $cf::PLAYER{$login} or next;
3289 $pl->valid or next; 3738 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3291 $pl->save; 3740 $pl->save;
3292 } 3741 }
3293 warn "end emergency player save\n"; 3742 warn "emergency_perl_save: end player save\n";
3294 3743
3295 warn "begin emergency map save\n"; 3744 warn "emergency_perl_save: begin map save\n";
3296 for my $path (keys %cf::MAP) { 3745 for my $path (keys %cf::MAP) {
3297 my $map = $cf::MAP{$path} or next; 3746 my $map = $cf::MAP{$path} or next;
3298 $map->valid or next; 3747 $map->valid or next;
3299 $map->save; 3748 $map->save;
3300 } 3749 }
3301 warn "end emergency map save\n"; 3750 warn "emergency_perl_save: end map save\n";
3302 3751
3303 warn "begin emergency database checkpoint\n"; 3752 warn "emergency_perl_save: begin database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3305 warn "end emergency database checkpoint\n"; 3754 warn "emergency_perl_save: end database checkpoint\n";
3755
3756 warn "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n";
3306 }; 3759 };
3307 3760
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3308 warn "leave emergency perl save\n"; 3766 warn "emergency_perl_save: leave\n";
3309} 3767}
3310 3768
3311sub post_cleanup { 3769sub post_cleanup {
3312 my ($make_core) = @_; 3770 my ($make_core) = @_;
3313 3771
3314 warn Carp::longmess "post_cleanup backtrace" 3772 warn Carp::longmess "post_cleanup backtrace"
3315 if $make_core; 3773 if $make_core;
3774
3775 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$;
3777}
3778
3779# a safer delete_package, copied from Symbol
3780sub clear_package($) {
3781 my $pkg = shift;
3782
3783 # expand to full symbol table name if needed
3784 unless ($pkg =~ /^main::.*::$/) {
3785 $pkg = "main$pkg" if $pkg =~ /^::/;
3786 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3787 $pkg .= '::' unless $pkg =~ /::$/;
3788 }
3789
3790 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3791 my $stem_symtab = *{$stem}{HASH};
3792
3793 defined $stem_symtab and exists $stem_symtab->{$leaf}
3794 or return;
3795
3796 # clear all symbols
3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3798 for my $name (keys %$leaf_symtab) {
3799 _gv_clear *{"$pkg$name"};
3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3801 }
3316} 3802}
3317 3803
3318sub do_reload_perl() { 3804sub do_reload_perl() {
3319 # can/must only be called in main 3805 # can/must only be called in main
3320 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3321 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3322 return; 3808 return;
3323 } 3809 }
3324 3810
3811 return if $RELOAD++;
3812
3813 my $t1 = AE::time;
3814
3815 while ($RELOAD) {
3325 warn "reloading..."; 3816 warn "reloading...";
3326 3817
3327 warn "entering sync_job"; 3818 warn "entering sync_job";
3328 3819
3329 cf::sync_job { 3820 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark 3821 cf::write_runtime_sync; # external watchdog should not bark
3331 cf::emergency_save; 3822 cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark 3823 cf::write_runtime_sync; # external watchdog should not bark
3333 3824
3334 warn "syncing database to disk"; 3825 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3827
3337 # if anything goes wrong in here, we should simply crash as we already saved 3828 # if anything goes wrong in here, we should simply crash as we already saved
3338 3829
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests"; 3830 warn "flushing outstanding aio requests";
3345 for (;;) {
3346 BDB::flush;
3347 IO::AIO::flush;
3348 Coro::cede;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3831 while (IO::AIO::nreqs || BDB::nreqs) {
3350 warn "iterate..."; 3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3351 }
3352
3353 ++$RELOAD;
3354
3355 warn "cancelling all extension coros";
3356 $_->cancel for values %EXT_CORO;
3357 %EXT_CORO = ();
3358
3359 warn "removing commands";
3360 %COMMAND = ();
3361
3362 warn "removing ext/exti commands";
3363 %EXTCMD = ();
3364 %EXTICMD = ();
3365
3366 warn "unloading/nuking all extensions";
3367 for my $pkg (@EXTS) {
3368 warn "... unloading $pkg";
3369
3370 if (my $cb = $pkg->can ("unload")) {
3371 eval {
3372 $cb->($pkg);
3373 1
3374 } or warn "$pkg unloaded, but with errors: $@";
3375 } 3833 }
3376 3834
3377 warn "... nuking $pkg"; 3835 warn "cancelling all extension coros";
3378 Symbol::delete_package $pkg; 3836 $_->cancel for values %EXT_CORO;
3379 } 3837 %EXT_CORO = ();
3380 3838
3381 warn "unloading all perl modules loaded from $LIBDIR"; 3839 warn "removing commands";
3382 while (my ($k, $v) = each %INC) { 3840 %COMMAND = ();
3383 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3384 3841
3842 warn "removing ext/exti commands";
3843 %EXTCMD = ();
3844 %EXTICMD = ();
3845
3846 warn "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) {
3385 warn "... unloading $k"; 3848 warn "... unloading $pkg";
3386 delete $INC{$k};
3387 3849
3388 $k =~ s/\.pm$//;
3389 $k =~ s/\//::/g;
3390
3391 if (my $cb = $k->can ("unload_module")) { 3850 if (my $cb = $pkg->can ("unload")) {
3851 eval {
3392 $cb->(); 3852 $cb->($pkg);
3853 1
3854 } or warn "$pkg unloaded, but with errors: $@";
3855 }
3856
3857 warn "... clearing $pkg";
3858 clear_package $pkg;
3393 } 3859 }
3394 3860
3395 Symbol::delete_package $k; 3861 warn "unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864
3865 warn "... unloading $k";
3866 delete $INC{$k};
3867
3868 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g;
3870
3871 if (my $cb = $k->can ("unload_module")) {
3872 $cb->();
3873 }
3874
3875 clear_package $k;
3396 } 3876 }
3397 3877
3398 warn "getting rid of safe::, as good as possible"; 3878 warn "getting rid of safe::, as good as possible";
3399 Symbol::delete_package "safe::$_" 3879 clear_package "safe::$_"
3400 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3401 3881
3402 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3403 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3404 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3405 3885
3406 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3407 # and global variables created in xs 3887 # and global variables created in xs
3408 #Symbol::delete_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3409 3889
3410 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3411 3891
3412 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3413 require cf; 3893 require cf;
3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3415 3895
3416 warn "loading config and database again"; 3896 warn "loading config and database again";
3417 cf::reload_config; 3897 cf::reload_config;
3418 3898
3419 warn "loading extensions"; 3899 warn "loading extensions";
3420 cf::load_extensions; 3900 cf::load_extensions;
3421 3901
3902 if ($REATTACH_ON_RELOAD) {
3422 warn "reattaching attachments to objects/players"; 3903 warn "reattaching attachments to objects/players";
3423 _global_reattach; # objects, sockets 3904 _global_reattach; # objects, sockets
3424 warn "reattaching attachments to maps"; 3905 warn "reattaching attachments to maps";
3425 reattach $_ for values %MAP; 3906 reattach $_ for values %MAP;
3426 warn "reattaching attachments to players"; 3907 warn "reattaching attachments to players";
3427 reattach $_ for values %PLAYER; 3908 reattach $_ for values %PLAYER;
3909 }
3428 3910
3911 warn "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913
3429 warn "leaving sync_job"; 3914 warn "leaving sync_job";
3430 3915
3431 1 3916 1
3432 } or do { 3917 } or do {
3433 warn $@; 3918 warn $@;
3434 warn "error while reloading, exiting."; 3919 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3920 };
3437 3921
3438 warn "reloaded"; 3922 warn "reloaded";
3923 --$RELOAD;
3924 }
3925
3926 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n";
3439}; 3928};
3440 3929
3441our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3442 3931
3443sub reload_perl() { 3932sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3933 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3446 3935
3447 $RELOAD_WATCHER ||= Event->timer ( 3936 $RELOAD_WATCHER ||= cf::async {
3448 reentrant => 0, 3937 Coro::AIO::aio_wait cache_extensions;
3449 after => 0, 3938
3450 data => WF_AUTOCANCEL, 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3451 cb => sub {
3452 do_reload_perl; 3940 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3454 }, 3942 };
3455 ); 3943 };
3456} 3944}
3457 3945
3458register_command "reload" => sub { 3946register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3947 my ($who, $arg) = @_;
3460 3948
3473 3961
3474our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3476 3964
3477sub wait_for_tick { 3965sub wait_for_tick {
3478 return unless $TICK_WATCHER->is_active;
3479 return if $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3480 3967
3481 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 3970 $signal->wait;
3484} 3971}
3485 3972
3486sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3487 return unless $TICK_WATCHER->is_active;
3488 return if $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3489 3975
3490 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3978 $signal->wait;
3493} 3979}
3494 3980
3495$TICK_WATCHER = Event->timer ( 3981sub tick {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3982 if ($Coro::current != $Coro::main) {
3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3983 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3504 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3505 return; 3985 return;
3506 } 3986 }
3507 3987
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3511 3989
3512 $RUNTIME += $TICK; 3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3513 $NEXT_TICK += $TICK;
3514 3991
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3994 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3996 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 3997 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3998 };
3999 }
3523 4000
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 4002 $sig->send;
3526 } 4003 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 4004 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 4005 $sig->send;
3529 } 4006 }
3530 4007
3531 $NOW = Event::time; 4008 $LOAD = ($NOW - $TICK_START) / $TICK;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4009 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 4010
3542 _post_tick; 4011 if (0) {
4012 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d#
4016 }
3543 }, 4017 }
3544); 4018}
3545 4019
3546{ 4020{
4021 # configure BDB
4022
3547 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3548 BDB::max_poll_time $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 4025 $AnyEvent::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 4026
3573 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4029 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3576 | BDB::LOG_AUTOREMOVE, 1); 4030 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4031 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4033 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3579 4034
3580 cf::sync_job { 4035 cf::sync_job {
3581 eval { 4036 eval {
3591 4046
3592 cf::cleanup "db_env_open(db): $@" if $@; 4047 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 4048 };
3594 } 4049 }
3595 4050
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 4051 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4052 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 4053 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4054 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4055 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 4056 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 4057 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4058 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 4059 };
3626} 4060}
3627 4061
3628{ 4062{
4063 # configure IO::AIO
4064
3629 IO::AIO::min_parallel 8; 4065 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 4066 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 4067 undef $AnyEvent::AIO::WATCHER;
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 4068}
3642 4069
3643my $_log_backtrace; 4070my $_log_backtrace;
3644 4071
3645sub _log_backtrace { 4072sub _log_backtrace {
3648 $msg =~ s/\n//; 4075 $msg =~ s/\n//;
3649 4076
3650 # limit the # of concurrent backtraces 4077 # limit the # of concurrent backtraces
3651 if ($_log_backtrace < 2) { 4078 if ($_log_backtrace < 2) {
3652 ++$_log_backtrace; 4079 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg;
3653 async { 4081 async {
3654 $Coro::current->{desc} = "abt $msg"; 4082 $Coro::current->{desc} = "abt $msg";
3655 4083
3656 my @bt = fork_call { 4084 my @bt = fork_call {
3657 @addr = map { sprintf "%x", $_ } @addr; 4085 @addr = map { sprintf "%x", $_ } @addr;
3668 } 4096 }
3669 4097
3670 @funcs 4098 @funcs
3671 }; 4099 };
3672 4100
3673 LOG llevInfo, "[ABT] $msg\n"; 4101 LOG llevInfo, "[ABT] $perl_bt\n";
4102 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3674 LOG llevInfo, "[ABT] $_\n" for @bt; 4103 LOG llevInfo, "[ABT] $_\n" for @bt;
3675 --$_log_backtrace; 4104 --$_log_backtrace;
3676 }; 4105 };
3677 } else { 4106 } else {
3678 LOG llevInfo, "[ABT] $msg\n"; 4107 LOG llevInfo, "[ABT] $msg\n";
3679 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3680 } 4109 }
3681} 4110}
3682 4111
3683# load additional modules 4112# load additional modules
3684use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3685 4115
3686END { cf::emergency_save } 4116END { cf::emergency_save }
3687 4117
36881 41181
3689 4119

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines