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.374 by root, Wed Sep 19 22:07:16 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 Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 184
123############################################################################# 185#############################################################################
124 186
125=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
126 188
… …
162 224
163The raw value load value from the last tick. 225The raw value load value from the last tick.
164 226
165=item %cf::CFG 227=item %cf::CFG
166 228
167Configuration for the server, loaded from C</etc/crossfire/config>, or 229Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 230from wherever your confdir points to.
169 231
170=item cf::wait_for_tick, cf::wait_for_tick_begin 232=item cf::wait_for_tick, cf::wait_for_tick_begin
171 233
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 237
176=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
177 239
178This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 242that call.
181 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
182=back 250=back
183 251
184=cut 252=cut
185 253
186BEGIN { 254$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 255 my $msg = join "", @_;
189 256
190 $msg .= "\n" 257 $msg .= "\n"
191 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
192 259
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 261
195 LOG llevError, $msg; 262 LOG llevError, $msg;
196 }; 263};
197} 264
265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
276 Coro::terminate
277};
198 278
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 289for my $pkg (qw(
210 cf::global cf::attachable 290 cf::global cf::attachable
211 cf::object cf::object::player 291 cf::object cf::object::player
212 cf::client cf::player 292 cf::client cf::player
213 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
214 cf::map cf::party cf::region 295 cf::party cf::region
215)) { 296)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 298}
219 299
220$Event::DIED = sub { 300$EV::DIED = sub {
221 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
222}; 302};
223 303
224############################################################################# 304#############################################################################
225 305
226=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 329 $d
250 } || "[unable to dump $_[0]: '$@']"; 330 } || "[unable to dump $_[0]: '$@']";
251} 331}
252 332
253=item $ref = cf::from_json $json 333=item $ref = cf::decode_json $json
254 334
255Converts a JSON string into the corresponding perl data structure. 335Converts a JSON string into the corresponding perl data structure.
256 336
257=item $json = cf::to_json $ref 337=item $json = cf::encode_json $ref
258 338
259Converts a perl data structure into its JSON representation. 339Converts a perl data structure into its JSON representation.
260 340
261=cut 341=cut
262 342
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 344
265sub to_json ($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
267 361
268=item cf::lock_wait $string 362=item cf::lock_wait $string
269 363
270Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
271 365
272=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
273 367
274Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
277returned. 371returned.
278 372
279Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 374deadlocked coro.
… …
286 380
287Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
288 382
289=cut 383=cut
290 384
291our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 386
294sub lock_wait($) { 387sub lock_wait($) {
295 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 389}
308 390
309sub lock_acquire($) { 391sub lock_acquire($) {
310 my ($key) = @_; 392 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 393}
324 394
325sub lock_active($) { 395sub lock_active($) {
326 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 397}
330 398
331sub freeze_mainloop { 399sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
333 401
334 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 403}
336 }; 404
337 $TICK_WATCHER->stop; 405=item cf::periodic $interval, $cb
338 $guard 406
407Like EV::periodic, but randomly selects a starting point so that the actions
408get spread over time.
409
410=cut
411
412sub periodic($$) {
413 my ($interval, $cb) = @_;
414
415 my $start = rand List::Util::min 180, $interval;
416
417 EV::periodic $start, $interval, 0, $cb
339} 418}
340 419
341=item cf::get_slot $time[, $priority[, $name]] 420=item cf::get_slot $time[, $priority[, $name]]
342 421
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 422Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
351 430
352=cut 431=cut
353 432
354our @SLOT_QUEUE; 433our @SLOT_QUEUE;
355our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
356 436
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
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 # TODO: use suspend/resume instead 520 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 521
434 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
435 523
436 my $busy = 1; 524 my $busy = 1;
437 my @res; 525 my @res;
438 526
… …
442 warn $@ if $@; 530 warn $@ if $@;
443 undef $busy; 531 undef $busy;
444 })->prio (Coro::PRIO_MAX); 532 })->prio (Coro::PRIO_MAX);
445 533
446 while ($busy) { 534 while ($busy) {
447 Coro::cede or Event::one_event; 535 if (Coro::nready) {
536 Coro::cede_notself;
537 } else {
538 EV::loop EV::LOOP_ONESHOT;
448 } 539 }
540 }
449 541
450 $time = Event::time - $time; 542 my $time = AE::time - $time;
451 543
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
456 545
457 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
458 } else { 547 } else {
459 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
460 549
… …
485=item fork_call { }, $args 574=item fork_call { }, $args
486 575
487Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
491 580
492=cut 581=cut
493 582
494sub fork_call(&@) { 583sub fork_call(&@) {
495 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
… …
502 reset_signals; 591 reset_signals;
503 &$cb 592 &$cb
504 }, @args; 593 }, @args;
505 594
506 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
507} 634}
508 635
509=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
510 637
511Returns a single value from the environment database. 638Returns a single value from the environment database.
… …
650 777
651############################################################################# 778#############################################################################
652 779
653=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
654 781
655Many 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
656attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
658 785
659In 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>
660C<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
661Crossfire TRT). 788Deliantra).
662 789
663=over 4 790=over 4
664 791
665=item $attachable->attach ($attachment, key => $value...) 792=item $attachable->attach ($attachment, key => $value...)
666 793
… …
710=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
711 838
712Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
714 841
715Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
716that 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.
717 844
718These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
719 846
720=over 4 847=over 4
… …
948 } 1075 }
949 1076
950 0 1077 0
951} 1078}
952 1079
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1081
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1083
957Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
958 1085
… …
964 1091
965=cut 1092=cut
966 1093
967############################################################################# 1094#############################################################################
968# object support 1095# object support
969#
970 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#
971sub _can_merge { 1130sub _can_merge {
972 my ($ob1, $ob2) = @_; 1131 my ($ob1, $ob2) = @_;
973 1132
974 local $Storable::canonical = 1; 1133 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1134
978 $fob1 eq $fob2 1135 # we do the slow way here
1136 return _object_equal $ob1, $ob2
979} 1137}
980 1138
981sub reattach { 1139sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1141 my ($obj) = @_;
984 1142
1143 # no longer needed after getting rid of delete_package?
985 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
986 1145
987 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
988 1147
989 @$registry = (); 1148 @$registry = ();
990 1149
… …
1005cf::attachable->attach ( 1164cf::attachable->attach (
1006 prio => -1000000, 1165 prio => -1000000,
1007 on_instantiate => sub { 1166 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1009 1168
1010 $data = from_json $data; 1169 $data = decode_json $data;
1011 1170
1012 for (@$data) { 1171 for (@$data) {
1013 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1014 1173
1015 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
… …
1036 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1039 1198
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 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 }
1044 close $fh; 1206 aio_close $fh;
1045 1207
1046 if (@$objs) { 1208 if (@$objs) {
1047 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) {
1048 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1051 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 }
1052 close $fh; 1217 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1219 }
1055 } else { 1220 } else {
1056 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1057 } 1222 }
1058 1223
1059 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1228 } else {
1061 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1062 } 1230 }
1063 } else { 1231 } else {
1064 aio_unlink $filename; 1232 aio_unlink $filename;
1065 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1066 } 1234 }
… …
1085 1253
1086 unless (aio_stat "$filename.pst") { 1254 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1255 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1256 or return;
1089 1257
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1258 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs};
1091 } 1260 }
1092 1261
1093 utf8::decode (my $decname = $filename); 1262 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1263 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1264 $decname, length $data, scalar @{$av || []};
… …
1156 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1157 1326
1158 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1159} 1328}
1160 1329
1330use File::Glob ();
1331
1161cf::player->attach ( 1332cf::player->attach (
1162 on_command => sub { 1333 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1164 1335
1165 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1166 or return; 1337 or return;
1167 1338
… …
1197 1368
1198 cf::override; 1369 cf::override;
1199 }, 1370 },
1200); 1371);
1201 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
1202sub load_extensions { 1386sub load_extensions {
1203 cf::sync_job { 1387 cf::sync_job {
1204 my %todo; 1388 my %todo;
1205 1389
1206 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
… …
1225 1409
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1412
1229 $ext{source} = 1413 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1232 . $source 1416 . $source
1233 . "\n};\n1"; 1417 . "\n};\n1";
1234 1418
1235 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1236 } 1420 }
1237 1421
1422 my $pass = 0;
1238 my %done; 1423 my %done;
1239 while (%todo) { 1424 while (%todo) {
1240 my $progress; 1425 my $progress;
1241 1426
1427 ++$pass;
1428
1429 ext:
1242 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip 1432 next ext
1245 unless exists $done{$_}; 1433 unless exists $done{$_};
1246 } 1434 }
1247 1435
1248 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1249 1437
1250 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1251 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1252 : "$v->{base}: extension inactive.\n";
1253 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1254 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1255 warn $msg; 1445
1256 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1257 exit 1; 1447 delete $todo{$k};
1258 } 1448 } else {
1259 1449 $done{$k} = delete $todo{$k};
1260 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1261 } 1455 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
1266 } 1456 }
1267 1457
1268 skip: 1458 unless ($progress) {
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1270 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 }
1271 } 1466 }
1272 }; 1467 };
1273} 1468}
1274 1469
1275############################################################################# 1470#############################################################################
1276 1471
1277=back 1472=back
1278 1473
1279=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1280 1475
1281Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1282 1477
1283=cut 1478=cut
1284 1479
1285package cf::player; 1480package cf::player;
1286 1481
… …
1329 1524
1330sub exists($) { 1525sub exists($) {
1331 my ($login) = @_; 1526 my ($login) = @_;
1332 1527
1333 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1335} 1530}
1336 1531
1337sub find($) { 1532sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1534 my $login = $_[0];
… …
1351 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1547 or return;
1353 1548
1354 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1355 or return; 1550 or return;
1551
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1359 } 1555 }
1360 } 1556 }
1361} 1557}
1362 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
1363sub save($) { 1572sub save($) {
1364 my ($pl) = @_; 1573 my ($pl) = @_;
1365 1574
1366 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1367 1576
… …
1370 1579
1371 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1372 1581
1373 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1374 $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];
1375 1589
1376 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1591 cf::cede_to_tick;
1378} 1592}
1379 1593
… …
1411 my ($pl) = @_; 1625 my ($pl) = @_;
1412 1626
1413 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1414 1628
1415 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1416 $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
1417 1631
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1422 1638
1423 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1463 1679
1464 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1465 my $path = path $login; 1681 my $path = path $login;
1466 1682
1467 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1689 }
1473 1690
… …
1477 1694
1478 \@logins 1695 \@logins
1479} 1696}
1480 1697
1481=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1482 1701
1483Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1484player. May block. 1703player. May block.
1485 1704
1486=cut 1705=cut
… …
1504 } 1723 }
1505 1724
1506 \@paths 1725 \@paths
1507} 1726}
1508 1727
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1729
1511Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1731
1560=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1561 1733
1562Sends an ext reply to the player. 1734Sends an ext reply to the player.
1563 1735
… …
1595 1767
1596=cut 1768=cut
1597 1769
1598sub find_by_path($) { 1770sub find_by_path($) {
1599 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1600 1774
1601 my ($match, $specificity); 1775 my ($match, $specificity);
1602 1776
1603 for my $region (list) { 1777 for my $region (list) {
1604 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
… …
1630our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1632 1806
1633sub generate_random_map { 1807sub generate_random_map {
1634 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
1635 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1813 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1640 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1641 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1642 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1643 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1665 1842
1666 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1667} 1844}
1668 1845
1669# also paths starting with '/' 1846# also paths starting with '/'
1670$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1671 1848
1672sub thawer_merge { 1849sub thawer_merge {
1673 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1674 1851
1675 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
1761 1938
1762# the temporary/swap location 1939# the temporary/swap location
1763sub save_path { 1940sub save_path {
1764 my ($self) = @_; 1941 my ($self) = @_;
1765 1942
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1768} 1945}
1769 1946
1770# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1771sub uniq_path { 1948sub uniq_path {
1772 my ($self) = @_; 1949 my ($self) = @_;
1773 1950
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1776}
1777
1778# and all this just because we cannot iterate over
1779# all maps in C++...
1780sub change_all_map_light {
1781 my ($change) = @_;
1782
1783 $_->change_map_light ($change)
1784 for grep $_->outdoor, values %cf::MAP;
1785} 1953}
1786 1954
1787sub decay_objects { 1955sub decay_objects {
1788 my ($self) = @_; 1956 my ($self) = @_;
1789 1957
… …
1873sub find { 2041sub find {
1874 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1875 2043
1876 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1877 2045
1878 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1880 2048
1881 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1885 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1886 or return; 2051 or return;
1887 2052
1888 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1889 2054
… …
1891 or return; 2056 or return;
1892 2057
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1896 undef $guard1; 2062 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2063 $map->reset;
1899 return find $path; 2064 return find $path;
1900 } 2065 }
1901 2066
1902 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1903 } 2068 }
1904} 2069}
1905 2070
1906sub pre_load { } 2071sub pre_load { }
1907sub post_load { } 2072#sub post_load { } # XS
1908 2073
1909sub load { 2074sub load {
1910 my ($self) = @_; 2075 my ($self) = @_;
1911 2076
1912 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2095 $f->skip_block;
1931 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
1932 or return; 2097 or return;
1933 2098
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
1935 if delete $self->{load_original}; 2100 if delete $self->{load_original};
1936 2101
1937 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2103 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
… …
1957 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
1958 $self->decay_objects; 2123 $self->decay_objects;
1959 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
1960 $self->update_buttons; 2125 $self->update_buttons;
1961 cf::cede_to_tick; 2126 cf::cede_to_tick;
1962 $self->set_darkness_map;
1963 cf::cede_to_tick;
1964 $self->activate; 2127 $self->activate;
1965 } 2128 }
1966 2129
1967 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
1969 2132
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2134 }
1972 2135
1973 $self->post_load; 2136 $self->post_load;
1974} 2137}
1975 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
1976sub customise_for { 2142sub customise_for {
1977 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
1978 2144
1979 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
1980 if $self->per_player; 2146 if $self->per_player;
… …
2033 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2034 2200
2035 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2036 2202
2037 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2205 }
2040 2206
2041 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2042 2208
2043 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
… …
2057 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2058 2224
2059 () 2225 ()
2060} 2226}
2061 2227
2228# common code, used by both ->save and ->swapout
2062sub save { 2229sub _save {
2063 my ($self) = @_; 2230 my ($self) = @_;
2064
2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2066 2231
2067 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2068 2233
2069 return unless $self->dirty; 2234 return unless $self->dirty;
2070 2235
… …
2079 2244
2080 cf::async { 2245 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2083 }; 2248 };
2249
2250 cf::get_slot 0.02;
2084 2251
2085 if ($uniq) { 2252 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2255 } else {
2089 $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);
2090 } 2257 }
2091} 2258}
2092 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2093sub swap_out { 2268sub swap_out {
2094 my ($self) = @_; 2269 my ($self) = @_;
2095 2270
2096 # save first because save cedes
2097 $self->save;
2098
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2101 return if $self->players; 2275 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2103 return if $self->{deny_save};
2104 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2105 $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};
2106 2327
2107 $self->deactivate; 2328 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2330 $self->clear;
2110}
2111
2112sub reset_at {
2113 my ($self) = @_;
2114
2115 # TODO: safety, remove and allow resettable per-player maps
2116 return 1e99 if $self->{deny_reset};
2117
2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2120
2121 $time + $to
2122}
2123
2124sub should_reset {
2125 my ($self) = @_;
2126
2127 $self->reset_at <= $cf::RUNTIME
2128}
2129
2130sub reset {
2131 my ($self) = @_;
2132
2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
2134
2135 return if $self->players;
2136
2137 warn "resetting map ", $self->path;
2138
2139 $self->in_memory (cf::MAP_SWAPPED);
2140
2141 # need to save uniques path
2142 unless ($self->{deny_save}) {
2143 my $uniq = $self->uniq_path; utf8::encode $uniq;
2144
2145 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2146 if $uniq;
2147 }
2148
2149 delete $cf::MAP{$self->path};
2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2153 $self->clear;
2154 2331
2155 $self->unlink_save; 2332 $self->unlink_save;
2156 $self->destroy; 2333 $self->destroy;
2157} 2334}
2158 2335
… …
2166 2343
2167 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2168 2345
2169 $self->unlink_save; 2346 $self->unlink_save;
2170 2347
2171 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2172 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2173 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2174 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2176 2353
… …
2225 2402
2226sub unique_maps() { 2403sub unique_maps() {
2227 [ 2404 [
2228 map { 2405 map {
2229 utf8::decode $_; 2406 utf8::decode $_;
2230 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2231 ? normalise $_ 2410 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2412 ]
2235} 2413}
2236 2414
2237package 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}
2238 2446
2239=back 2447=back
2240 2448
2241=head3 cf::object 2449=head3 cf::object
2242 2450
… …
2246 2454
2247=over 4 2455=over 4
2248 2456
2249=item $ob->inv_recursive 2457=item $ob->inv_recursive
2250 2458
2251Returns 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.
2252 2461
2253=cut 2462=cut
2254 2463
2255sub inv_recursive_; 2464sub inv_recursive_;
2256sub inv_recursive_ { 2465sub inv_recursive_ {
… …
2261 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2262} 2471}
2263 2472
2264=item $ref = $ob->ref 2473=item $ref = $ob->ref
2265 2474
2266creates 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.
2267 2476
2268=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2269 2478
2270returns 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,
2271even if the object actually exists. May block. 2480even if the object actually exists. May block.
… …
2273=cut 2482=cut
2274 2483
2275sub deref { 2484sub deref {
2276 my ($ref) = @_; 2485 my ($ref) = @_;
2277 2486
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2487 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2488 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2489 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2490 or return;
2285 $pl->ob->uuid eq $uuid 2491 $pl->ob->uuid eq $uuid
2286 or return; 2492 or return;
… …
2306can 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
2307dialogue with the given NPC character. 2513dialogue with the given NPC character.
2308 2514
2309=cut 2515=cut
2310 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
2311# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2532# with dialog boxes.
2313#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
2314sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
… …
2326 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2327 $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));
2328 2548
2329 } else { 2549 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2552 }
2333 } 2553 }
2334} 2554}
2335 2555
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2361 2581
2362=item $player_object->enter_link 2582=item $player_object->enter_link
2363 2583
2364Freezes 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}>).
2365 2585
2366The 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.
2367I<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.
2368 2590
2369Will never block. 2591Will never block.
2370 2592
2371=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2372 2594
… …
2397 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2398 2620
2399 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2400 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2401 2623
2402 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2403} 2625}
2404 2626
2405sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2406 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2407 2629
… …
2424 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2425 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2426 2648
2427 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2428 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2429 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2430 2652
2431 $map->load; 2653 $map->load;
2432 $map->load_neighbours; 2654 $map->load_neighbours;
2433 2655
2434 return unless $self->contr->active; 2656 return unless $self->contr->active;
2435 $self->activate_recursive;
2436 2657
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $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
2439} 2664}
2440 2665
2441=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2442 2667
2443Moves 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
2444her, loading and preparing them map, calling the provided $check callback 2669her, loading and preparing them map, calling the provided $check callback
2445that 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
2446the 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
2447be 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 >>.
2448 2676
2449=cut 2677=cut
2450 2678
2451our $GOTOGEN; 2679our $GOTOGEN;
2452 2680
… …
2531} 2759}
2532 2760
2533sub prepare_random_map { 2761sub prepare_random_map {
2534 my ($exit) = @_; 2762 my ($exit) = @_;
2535 2763
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2764 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2765 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2766 # that depends on the exit object
2541 2767
2542 my $rmp = parse_random_map_params $exit->msg; 2768 my $rmp = parse_random_map_params $exit->msg;
… …
2544 if ($exit->map) { 2770 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2771 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2772 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2773 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2774 $rmp->{origin_y} = $exit->y;
2775
2776 $exit->map->touch;
2549 } 2777 }
2550 2778
2551 $rmp->{random_seed} ||= $exit->random_seed; 2779 $rmp->{random_seed} ||= $exit->random_seed;
2552 2780
2553 my $data = cf::to_json $rmp; 2781 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2782 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2783 my $meta = "$RANDOMDIR/$md5.meta";
2556 2784
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2785 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2786 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2787 undef $fh;
2560 aio_rename "$meta~", $meta; 2788 aio_rename "$meta~", $meta;
2561 2789
2790 my $slaying = "?random/$md5";
2791
2792 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2793 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2794 $exit->msg (undef);
2795 }
2564 } 2796 }
2565} 2797}
2566 2798
2567sub cf::object::player::enter_exit { 2799sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2800 my ($self, $exit) = @_;
2569 2801
2570 return unless $self->type == cf::PLAYER; 2802 return unless $self->type == cf::PLAYER;
2571 2803
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2804 $self->enter_link;
2584 2805
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2806 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2807 $Coro::current->{desc} = "enter_exit";
2591 2808
2592 $self->deactivate_recursive; # just to be sure
2593 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
2594 $self->goto ($slaying, $hp, $sp); 2824 $self->goto ($map, $x, $y);
2595 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
2596 1; 2830 1
2597 }) { 2831 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2832 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "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. "
2600 . "Please report this to the dungeon master!", 2834 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2835 cf::NDI_UNIQUE | cf::NDI_RED);
2602 2836
2603 warn "ERROR in enter_exit: $@"; 2837 warn "ERROR in enter_exit: $@";
… …
2620sub cf::client::send_drawinfo { 2854sub cf::client::send_drawinfo {
2621 my ($self, $text, $flags) = @_; 2855 my ($self, $text, $flags) = @_;
2622 2856
2623 utf8::encode $text; 2857 utf8::encode $text;
2624 $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);
2625} 2884}
2626 2885
2627=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2628 2887
2629Send 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
… …
2631the 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
2632the message unless the client supports the msg packet. 2891the message unless the client supports the msg packet.
2633 2892
2634=cut 2893=cut
2635 2894
2895# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2637 "c/identify" => { 2903 "c/identify" => {
2638 id => "identify", 2904 id => "infobox",
2639 title => "Identify", 2905 title => "Identify",
2640 reply => undef, 2906 reply => undef,
2641 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
2642 }, 2908 },
2643 "c/examine" => { 2909 "c/examine" => {
2644 id => "examine", 2910 id => "infobox",
2645 title => "Examine", 2911 title => "Examine",
2646 reply => undef, 2912 reply => undef,
2647 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2648 }, 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 },
2927 "c/lookat" => {
2928 id => "infobox",
2929 title => "Look",
2930 reply => undef,
2931 tooltip => "What you saw there",
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,
2649); 3007);
2650 3008
2651sub cf::client::send_msg { 3009sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2653 3011
2654 $msg = $self->pl->expand_cfpod ($msg); 3012 $msg = $self->pl->expand_cfpod ($msg)
3013 unless $color & cf::NDI_VERBATIM;
2655 3014
2656 $color &= cf::NDI_CLIENT_MASK; # just in case... 3015 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657 3016
2658 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3018 if ($CHANNEL{$channel}) {
3019 $channel = $CHANNEL{$channel};
2660 3020
3021 $self->ext_msg (channel_info => $channel);
3022 $channel = $channel->{id};
3023
2661 if (ref $channel) { 3024 } elsif (ref $channel) {
2662 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2666 if $self->can_msg;
2667 } 3029 }
2668 3030
2669 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2670 } 3032 }
2671 3033
2672 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2673 3035
2674 if ($self->can_msg) {
2675 # default colour, mask it out 3036 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2678 3039
2679 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3040 my $pkt = "msg "
3041 . $self->{json_coder}->encode (
2680 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2681 } else { 3043 );
2682 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones
2684 for ($msg) {
2685 1 while
2686 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2687 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2688 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2689 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2690 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2691 }
2692 3044
2693 $color &= cf::NDI_COLOR_MASK; 3045 $self->send_big_packet ($pkt);
2694
2695 utf8::encode $msg;
2696
2697 if (0 && $msg =~ /\[/) {
2698 # COMMAND/INFO
2699 $self->send_packet ("drawextinfo $color 10 8 $msg")
2700 } else {
2701 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2702 $self->send_packet ("drawinfo $color $msg")
2703 }
2704 }
2705 }
2706} 3046}
2707 3047
2708=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2709 3049
2710Sends an ext event to the client. 3050Sends an ext event to the client.
… …
2713 3053
2714sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2715 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2716 3056
2717 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2719 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2720 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2721 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2722 } 3062 }
2723} 3063}
2724 3064
2725=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2726 3066
… …
2730 3070
2731sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2732 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2733 3073
2734 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2735 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2736 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2737 #TODO: version 1, remove 3077 #TODO: version 1, remove
2738 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 } 3080 }
2741} 3081}
2742 3082
2743=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2744 3084
… …
2845 3185
2846 $coro 3186 $coro
2847} 3187}
2848 3188
2849cf::client->attach ( 3189cf::client->attach (
2850 on_destroy => sub { 3190 on_client_destroy => sub {
2851 my ($ns) = @_; 3191 my ($ns) = @_;
2852 3192
2853 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2854 }, 3194 },
2855); 3195);
… …
2871our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
2872 3212
2873$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
2874 3214
2875$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
2876 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
2877 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
2878 sort time 3218 sort time
2879)); 3219));
2880 3220
2881# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
… …
2883=pod 3223=pod
2884 3224
2885The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
2886 3226
2887 cf::object 3227 cf::object
2888 contr pay_amount pay_player map x y force_find force_add 3228 contr pay_amount pay_player map x y force_find force_add destroy
2889 insert remove name archname title slaying race decrease_ob_nr 3229 insert remove name archname title slaying race decrease split
3230 value
2890 3231
2891 cf::object::player 3232 cf::object::player
2892 player 3233 player
2893 3234
2894 cf::player 3235 cf::player
… …
2899 3240
2900=cut 3241=cut
2901 3242
2902for ( 3243for (
2903 ["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
2904 insert remove inv name archname title slaying race 3245 insert remove inv nrof name archname title slaying race
2905 decrease_ob_nr)], 3246 decrease split destroy change_exp value msg lore send_msg)],
2906 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
2907 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
2908 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
2909) { 3250) {
2910 no strict 'refs'; 3251 no strict 'refs';
2911 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
2912 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2930 3271
2931 my $qcode = $code; 3272 my $qcode = $code;
2932 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2933 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
2934 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
2935 local $_; 3279 local $_;
2936 local @safe::cf::_safe_eval_args = values %vars;
2937 3280
2938 my $eval = 3281 my $eval =
2939 "do {\n" 3282 "do {\n"
2940 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2941 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
2942 . $code 3285 . $code
2943 . "\n}" 3286 . "\n}"
2944 ; 3287 ;
2945 3288
3289 if ($CFG{safe_eval}) {
2946 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
2947 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2948 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 }
2949 3298
2950 if ($@) { 3299 if ($@) {
2951 warn "$@"; 3300 warn "$@";
2952 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
2953 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
… …
2972=cut 3321=cut
2973 3322
2974sub register_script_function { 3323sub register_script_function {
2975 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
2976 3325
2977 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
2978 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
2979} 3328}
2980 3329
2981=back 3330=back
2982 3331
2983=cut 3332=cut
… …
3004 3353
3005 $facedata->{version} == 2 3354 $facedata->{version} == 2
3006 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3007 3356
3008 # 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]);
3009 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3010 type => FT_RSRC, 3360 type => FT_RSRC,
3011 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),
3012 }; 3363 };
3013 cf::cede_to_tick; 3364 cf::cede_to_tick;
3014 3365
3015 { 3366 {
3016 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
3017 3368
3018 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3019 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3371
3020 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3023 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3024 3376
3025 cf::cede_to_tick; 3377 cf::cede_to_tick;
3026 } 3378 }
3027 3379
3028 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
3029 next unless $info->{smooth}; 3381 next unless $info->{smooth};
3382
3030 my $idx = cf::face::find $face 3383 my $idx = cf::face::find $face
3031 or next; 3384 or next;
3385
3032 if (my $smooth = cf::face::find $info->{smooth}) { 3386 if (my $smooth = cf::face::find $info->{smooth}) {
3033 cf::face::set_smooth $idx, $smooth; 3387 cf::face::set_smooth $idx, $smooth;
3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3035 } else { 3389 } else {
3036 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3390 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3050 3404
3051 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3052 } 3406 }
3053 3407
3054 { 3408 {
3055 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3058 3410
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3412 if (defined $info->{type}) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data;
3064 3414
3065 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3066 # prepend meta info 3416 cf::face::set_type $idx, $info->{type};
3067
3068 my $meta = $enc->encode ({
3069 name => $name,
3070 %{ $info->{meta} || {} },
3071 });
3072
3073 $data = pack "(w/a*)*", $meta, $info->{data};
3074 } else { 3417 } else {
3075 $data = $info->{data}; 3418 $RESOURCE{$name} = $info;
3076 } 3419 }
3077 3420
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3079 cf::face::set_type $idx, $info->{type};
3080
3081 cf::cede_to_tick; 3421 cf::cede_to_tick;
3082 } 3422 }
3083
3084 if ($soundconf) {
3085 $soundconf = $enc->decode (delete $soundconf->{data});
3086
3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3088 my $sound = $soundconf->{compat}[$_]
3089 or next;
3090
3091 my $face = cf::face::find "sound/$sound->[1]";
3092 cf::sound::set $sound->[0] => $face;
3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3094 }
3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
3099 }
3100 }
3101 } 3423 }
3424
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3102 3426
3103 1 3427 1
3104} 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});
3105 3449
3106register_exticmd fx_want => sub { 3450register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_; 3451 my ($ns, $want) = @_;
3108 3452
3109 while (my ($k, $v) = each %$want) { 3453 while (my ($k, $v) = each %$want) {
3110 $ns->fx_want ($k, $v); 3454 $ns->fx_want ($k, $v);
3111 } 3455 }
3112}; 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}
3113 3467
3114sub reload_regions { 3468sub reload_regions {
3115 # 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
3116 # for this (global event?) 3470 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = (); 3471 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3131} 3485}
3132 3486
3133sub reload_archetypes { 3487sub reload_archetypes {
3134 load_resource_file "$DATADIR/archetypes" 3488 load_resource_file "$DATADIR/archetypes"
3135 or die "unable to load archetypes\n"; 3489 or die "unable to load archetypes\n";
3136 #d# NEED to laod twice to resolve forward references
3137 # this really needs to be done in an extra post-pass
3138 # (which needs to be synchronous, so solve it differently)
3139 load_resource_file "$DATADIR/archetypes"
3140 or die "unable to load archetypes\n";
3141} 3490}
3142 3491
3143sub reload_treasures { 3492sub reload_treasures {
3144 load_resource_file "$DATADIR/treasures" 3493 load_resource_file "$DATADIR/treasures"
3145 or die "unable to load treasurelists\n"; 3494 or die "unable to load treasurelists\n";
3146} 3495}
3147 3496
3148sub reload_resources { 3497sub reload_resources {
3149 warn "reloading resource files...\n"; 3498 warn "reloading resource files...\n";
3150 3499
3500 reload_facedata;
3501 reload_archetypes;
3151 reload_regions; 3502 reload_regions;
3152 reload_facedata;
3153 #reload_archetypes;#d#
3154 reload_archetypes;
3155 reload_treasures; 3503 reload_treasures;
3156 3504
3157 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3158} 3506}
3159 3507
3160sub init {
3161 reload_resources;
3162}
3163
3164sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3165 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3166 or return; 3512 or return;
3167 3513
3168 local $/; 3514 local $/;
3169 *CFG = YAML::Syck::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3170 3516
3171 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3172 3518
3173 $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};
3174 $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};
… …
3178 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3179 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3180 }; 3526 };
3181 warn $@ if $@; 3527 warn $@ if $@;
3182 } 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;
3183} 3559}
3184 3560
3185sub 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
3186 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3187 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3188 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#
3189 (async { 3574 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3575 $Coro::current->{desc} = "IDLE BUG HANDLER";
3191 Event::one_event; 3576 EV::loop EV::LOOP_ONESHOT;
3192 })->prio (Coro::PRIO_MAX); 3577 })->prio (Coro::PRIO_MAX);
3193 }; 3578 };
3194 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;
3195 reload_config; 3592 reload_config;
3196 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
3197 load_extensions; 3603 load_extensions;
3198 3604
3199 $TICK_WATCHER->start; 3605 utime time, time, $RUNTIMEFILE;
3200 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;
3201} 3618}
3202 3619
3203############################################################################# 3620#############################################################################
3204# initialisation and cleanup 3621# initialisation and cleanup
3205 3622
3206# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3207BEGIN { 3624BEGIN {
3625 our %SIGWATCHER = ();
3208 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3209 Event->signal ( 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3210 reentrant => 0,
3211 data => WF_AUTOCANCEL,
3212 signal => $signal,
3213 prio => 0,
3214 cb => sub {
3215 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3216 },
3217 ); 3629 };
3218 } 3630 }
3219} 3631}
3220 3632
3221sub write_runtime { 3633sub write_runtime_sync {
3222 my $runtime = "$LOCALDIR/runtime"; 3634 my $t0 = AE::time;
3223 3635
3224 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3225 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3226 3638
3227 IO::AIO::aio_utime $runtime, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3228 3640
3229 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3230 3642
3231 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3232 or return; 3644 or return;
3233 3645
3234 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3235 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3236 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
… …
3246 aio_utime $fh, undef, undef; 3658 aio_utime $fh, undef, undef;
3247 3659
3248 close $fh 3660 close $fh
3249 or return; 3661 or return;
3250 3662
3251 aio_rename "$runtime~", $runtime 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3252 and return; 3664 and return;
3253 3665
3254 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3255 3667
3256 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 };
3257} 3719}
3258 3720
3259sub emergency_save() { 3721sub emergency_save() {
3260 my $freeze_guard = cf::freeze_mainloop; 3722 my $freeze_guard = cf::freeze_mainloop;
3261 3723
3262 warn "enter emergency perl save\n"; 3724 warn "emergency_perl_save: enter\n";
3263 3725
3264 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
3265 # use a peculiar iteration method to avoid tripping on perl 3732 # use a peculiar iteration method to avoid tripping on perl
3266 # refcount bugs in for. also avoids problems with players 3733 # refcount bugs in for. also avoids problems with players
3267 # and maps saved/destroyed asynchronously. 3734 # and maps saved/destroyed asynchronously.
3268 warn "begin emergency player save\n"; 3735 warn "emergency_perl_save: begin player save\n";
3269 for my $login (keys %cf::PLAYER) { 3736 for my $login (keys %cf::PLAYER) {
3270 my $pl = $cf::PLAYER{$login} or next; 3737 my $pl = $cf::PLAYER{$login} or next;
3271 $pl->valid or next; 3738 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3272 $pl->save; 3740 $pl->save;
3273 } 3741 }
3274 warn "end emergency player save\n"; 3742 warn "emergency_perl_save: end player save\n";
3275 3743
3276 warn "begin emergency map save\n"; 3744 warn "emergency_perl_save: begin map save\n";
3277 for my $path (keys %cf::MAP) { 3745 for my $path (keys %cf::MAP) {
3278 my $map = $cf::MAP{$path} or next; 3746 my $map = $cf::MAP{$path} or next;
3279 $map->valid or next; 3747 $map->valid or next;
3280 $map->save; 3748 $map->save;
3281 } 3749 }
3282 warn "end emergency map save\n"; 3750 warn "emergency_perl_save: end map save\n";
3283 3751
3284 warn "begin emergency database checkpoint\n"; 3752 warn "emergency_perl_save: begin database checkpoint\n";
3285 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3286 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";
3287 }; 3759 };
3288 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
3289 warn "leave emergency perl save\n"; 3766 warn "emergency_perl_save: leave\n";
3290} 3767}
3291 3768
3292sub post_cleanup { 3769sub post_cleanup {
3293 my ($make_core) = @_; 3770 my ($make_core) = @_;
3294 3771
3295 warn Carp::longmess "post_cleanup backtrace" 3772 warn Carp::longmess "post_cleanup backtrace"
3296 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 }
3297} 3802}
3298 3803
3299sub do_reload_perl() { 3804sub do_reload_perl() {
3300 # can/must only be called in main 3805 # can/must only be called in main
3301 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3302 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3303 return; 3808 return;
3304 } 3809 }
3305 3810
3811 return if $RELOAD++;
3812
3813 my $t1 = AE::time;
3814
3815 while ($RELOAD) {
3306 warn "reloading..."; 3816 warn "reloading...";
3307 3817
3308 warn "entering sync_job"; 3818 warn "entering sync_job";
3309 3819
3310 cf::sync_job { 3820 cf::sync_job {
3311 cf::write_runtime; # external watchdog should not bark 3821 cf::write_runtime_sync; # external watchdog should not bark
3312 cf::emergency_save; 3822 cf::emergency_save;
3313 cf::write_runtime; # external watchdog should not bark 3823 cf::write_runtime_sync; # external watchdog should not bark
3314 3824
3315 warn "syncing database to disk"; 3825 warn "syncing database to disk";
3316 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3317 3827
3318 # 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
3319 3829
3320 warn "cancelling all WF_AUTOCANCEL watchers";
3321 for (Event::all_watchers) {
3322 $_->cancel if $_->data & WF_AUTOCANCEL;
3323 }
3324
3325 warn "flushing outstanding aio requests"; 3830 warn "flushing outstanding aio requests";
3326 for (;;) {
3327 BDB::flush;
3328 IO::AIO::flush;
3329 Coro::cede;
3330 last unless IO::AIO::nreqs || BDB::nreqs; 3831 while (IO::AIO::nreqs || BDB::nreqs) {
3331 warn "iterate..."; 3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3332 }
3333
3334 ++$RELOAD;
3335
3336 warn "cancelling all extension coros";
3337 $_->cancel for values %EXT_CORO;
3338 %EXT_CORO = ();
3339
3340 warn "removing commands";
3341 %COMMAND = ();
3342
3343 warn "removing ext/exti commands";
3344 %EXTCMD = ();
3345 %EXTICMD = ();
3346
3347 warn "unloading/nuking all extensions";
3348 for my $pkg (@EXTS) {
3349 warn "... unloading $pkg";
3350
3351 if (my $cb = $pkg->can ("unload")) {
3352 eval {
3353 $cb->($pkg);
3354 1
3355 } or warn "$pkg unloaded, but with errors: $@";
3356 } 3833 }
3357 3834
3358 warn "... nuking $pkg"; 3835 warn "cancelling all extension coros";
3359 Symbol::delete_package $pkg; 3836 $_->cancel for values %EXT_CORO;
3360 } 3837 %EXT_CORO = ();
3361 3838
3362 warn "unloading all perl modules loaded from $LIBDIR"; 3839 warn "removing commands";
3363 while (my ($k, $v) = each %INC) { 3840 %COMMAND = ();
3364 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3365 3841
3842 warn "removing ext/exti commands";
3843 %EXTCMD = ();
3844 %EXTICMD = ();
3845
3846 warn "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) {
3366 warn "... unloading $k"; 3848 warn "... unloading $pkg";
3367 delete $INC{$k};
3368 3849
3369 $k =~ s/\.pm$//;
3370 $k =~ s/\//::/g;
3371
3372 if (my $cb = $k->can ("unload_module")) { 3850 if (my $cb = $pkg->can ("unload")) {
3851 eval {
3373 $cb->(); 3852 $cb->($pkg);
3853 1
3854 } or warn "$pkg unloaded, but with errors: $@";
3855 }
3856
3857 warn "... clearing $pkg";
3858 clear_package $pkg;
3374 } 3859 }
3375 3860
3376 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;
3377 } 3876 }
3378 3877
3379 warn "getting rid of safe::, as good as possible"; 3878 warn "getting rid of safe::, as good as possible";
3380 Symbol::delete_package "safe::$_" 3879 clear_package "safe::$_"
3381 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);
3382 3881
3383 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3384 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3385 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3386 3885
3387 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3388 # and global variables created in xs 3887 # and global variables created in xs
3389 #Symbol::delete_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3390 3889
3391 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3392 3891
3393 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3394 require cf; 3893 require cf;
3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3396 3895
3397 warn "loading config and database again"; 3896 warn "loading config and database again";
3398 cf::reload_config; 3897 cf::reload_config;
3399 3898
3400 warn "loading extensions"; 3899 warn "loading extensions";
3401 cf::load_extensions; 3900 cf::load_extensions;
3402 3901
3902 if ($REATTACH_ON_RELOAD) {
3403 warn "reattaching attachments to objects/players"; 3903 warn "reattaching attachments to objects/players";
3404 _global_reattach; # objects, sockets 3904 _global_reattach; # objects, sockets
3405 warn "reattaching attachments to maps"; 3905 warn "reattaching attachments to maps";
3406 reattach $_ for values %MAP; 3906 reattach $_ for values %MAP;
3407 warn "reattaching attachments to players"; 3907 warn "reattaching attachments to players";
3408 reattach $_ for values %PLAYER; 3908 reattach $_ for values %PLAYER;
3909 }
3409 3910
3911 warn "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913
3410 warn "leaving sync_job"; 3914 warn "leaving sync_job";
3411 3915
3412 1 3916 1
3413 } or do { 3917 } or do {
3414 warn $@; 3918 warn $@;
3415 warn "error while reloading, exiting."; 3919 cf::cleanup "error while reloading, exiting.";
3416 exit 1;
3417 }; 3920 };
3418 3921
3419 warn "reloaded"; 3922 warn "reloaded";
3923 --$RELOAD;
3924 }
3925
3926 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n";
3420}; 3928};
3421 3929
3422our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3423 3931
3424sub reload_perl() { 3932sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back, 3933 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3427 3935
3428 $RELOAD_WATCHER ||= Event->timer ( 3936 $RELOAD_WATCHER ||= cf::async {
3429 reentrant => 0, 3937 Coro::AIO::aio_wait cache_extensions;
3430 after => 0, 3938
3431 data => WF_AUTOCANCEL, 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3432 cb => sub {
3433 do_reload_perl; 3940 do_reload_perl;
3434 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3435 }, 3942 };
3436 ); 3943 };
3437} 3944}
3438 3945
3439register_command "reload" => sub { 3946register_command "reload" => sub {
3440 my ($who, $arg) = @_; 3947 my ($who, $arg) = @_;
3441 3948
… …
3454 3961
3455our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3456our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3457 3964
3458sub wait_for_tick { 3965sub wait_for_tick {
3459 return unless $TICK_WATCHER->is_active;
3460 return if $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3461 3967
3462 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3463 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3464 $signal->wait; 3970 $signal->wait;
3465} 3971}
3466 3972
3467sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3470 3975
3471 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait; 3978 $signal->wait;
3474} 3979}
3475 3980
3476$TICK_WATCHER = Event->timer ( 3981sub tick {
3477 reentrant => 0,
3478 parked => 1,
3479 prio => 0,
3480 at => $NEXT_TICK || $TICK,
3481 data => WF_AUTOCANCEL,
3482 cb => sub {
3483 if ($Coro::current != $Coro::main) { 3982 if ($Coro::current != $Coro::main) {
3484 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"
3485 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3486 return; 3985 return;
3487 } 3986 }
3488 3987
3489 $NOW = $tick_start = Event::time;
3490
3491 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3492 3989
3493 $RUNTIME += $TICK; 3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3494 $NEXT_TICK += $TICK;
3495 3991
3496 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3497 $NEXT_RUNTIME_WRITE = $NOW + 10; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3498 Coro::async_pool { 3994 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
3500 write_runtime 3996 write_runtime_sync
3501 or warn "ERROR: unable to write runtime file: $!"; 3997 or warn "ERROR: unable to write runtime file: $!";
3502 };
3503 } 3998 };
3999 }
3504 4000
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 4002 $sig->send;
3507 } 4003 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 4004 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 4005 $sig->send;
3510 } 4006 }
3511 4007
3512 $NOW = Event::time; 4008 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4009 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 4010
3523 _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 }
3524 }, 4017 }
3525); 4018}
3526 4019
3527{ 4020{
4021 # configure BDB
4022
3528 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3529 BDB::max_poll_time $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 4025 $AnyEvent::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 4026
3554 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4029 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3557 | 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;
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4033 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 4034
3561 cf::sync_job { 4035 cf::sync_job {
3562 eval { 4036 eval {
… …
3572 4046
3573 cf::cleanup "db_env_open(db): $@" if $@; 4047 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 4048 };
3575 } 4049 }
3576 4050
3577 $BDB_DEADLOCK_WATCHER = Event->timer ( 4051 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 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 { };
3585 },
3586 ); 4053 };
3587 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4054 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4055 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 ); 4056 };
3597 $BDB_TRICKLE_WATCHER = Event->timer ( 4057 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4058 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 ); 4059 };
3607} 4060}
3608 4061
3609{ 4062{
4063 # configure IO::AIO
4064
3610 IO::AIO::min_parallel 8; 4065 IO::AIO::min_parallel 8;
3611
3612 undef $Coro::AIO::WATCHER;
3613 IO::AIO::max_poll_time $TICK * 0.1; 4066 IO::AIO::max_poll_time $TICK * 0.1;
3614 $AIO_POLL_WATCHER = Event->io ( 4067 undef $AnyEvent::AIO::WATCHER;
3615 reentrant => 0,
3616 data => WF_AUTOCANCEL,
3617 fd => IO::AIO::poll_fileno,
3618 poll => 'r',
3619 prio => 6,
3620 cb => \&IO::AIO::poll_cb,
3621 );
3622} 4068}
3623 4069
3624my $_log_backtrace; 4070my $_log_backtrace;
3625 4071
3626sub _log_backtrace { 4072sub _log_backtrace {
… …
3629 $msg =~ s/\n//; 4075 $msg =~ s/\n//;
3630 4076
3631 # limit the # of concurrent backtraces 4077 # limit the # of concurrent backtraces
3632 if ($_log_backtrace < 2) { 4078 if ($_log_backtrace < 2) {
3633 ++$_log_backtrace; 4079 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg;
3634 async { 4081 async {
3635 $Coro::current->{desc} = "abt $msg"; 4082 $Coro::current->{desc} = "abt $msg";
3636 4083
3637 my @bt = fork_call { 4084 my @bt = fork_call {
3638 @addr = map { sprintf "%x", $_ } @addr; 4085 @addr = map { sprintf "%x", $_ } @addr;
… …
3649 } 4096 }
3650 4097
3651 @funcs 4098 @funcs
3652 }; 4099 };
3653 4100
3654 LOG llevInfo, "[ABT] $msg\n"; 4101 LOG llevInfo, "[ABT] $perl_bt\n";
4102 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3655 LOG llevInfo, "[ABT] $_\n" for @bt; 4103 LOG llevInfo, "[ABT] $_\n" for @bt;
3656 --$_log_backtrace; 4104 --$_log_backtrace;
3657 }; 4105 };
3658 } else { 4106 } else {
3659 LOG llevInfo, "[ABT] $msg\n"; 4107 LOG llevInfo, "[ABT] $msg\n";
3660 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3661 } 4109 }
3662} 4110}
3663 4111
3664# load additional modules 4112# load additional modules
3665use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3666 4115
3667END { cf::emergency_save } 4116END { cf::emergency_save }
3668 4117
36691 41181
3670 4119

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines