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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 184
123############################################################################# 185#############################################################################
124 186
125=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
126 188
162 224
163The raw value load value from the last tick. 225The raw value load value from the last tick.
164 226
165=item %cf::CFG 227=item %cf::CFG
166 228
167Configuration for the server, loaded from C</etc/crossfire/config>, or 229Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 230from wherever your confdir points to.
169 231
170=item cf::wait_for_tick, cf::wait_for_tick_begin 232=item cf::wait_for_tick, cf::wait_for_tick_begin
171 233
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 237
176=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
177 239
178This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 242that call.
181 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
182=back 250=back
183 251
184=cut 252=cut
185 253
186BEGIN { 254$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 255 my $msg = join "", @_;
189 256
190 $msg .= "\n" 257 $msg .= "\n"
191 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
192 259
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 261
195 LOG llevError, $msg; 262 LOG llevError, $msg;
196 }; 263};
197} 264
265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
276 Coro::terminate
277};
198 278
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 289for my $pkg (qw(
210 cf::global cf::attachable 290 cf::global cf::attachable
211 cf::object cf::object::player 291 cf::object cf::object::player
212 cf::client cf::player 292 cf::client cf::player
213 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
214 cf::map cf::party cf::region 295 cf::party cf::region
215)) { 296)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 298}
219 299
220$Event::DIED = sub { 300$EV::DIED = sub {
221 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
222}; 302};
223 303
224############################################################################# 304#############################################################################
225 305
226=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 329 $d
250 } || "[unable to dump $_[0]: '$@']"; 330 } || "[unable to dump $_[0]: '$@']";
251} 331}
252 332
253=item $ref = cf::from_json $json 333=item $ref = cf::decode_json $json
254 334
255Converts a JSON string into the corresponding perl data structure. 335Converts a JSON string into the corresponding perl data structure.
256 336
257=item $json = cf::to_json $ref 337=item $json = cf::encode_json $ref
258 338
259Converts a perl data structure into its JSON representation. 339Converts a perl data structure into its JSON representation.
260 340
261=cut 341=cut
262 342
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 344
265sub to_json ($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
267 361
268=item cf::lock_wait $string 362=item cf::lock_wait $string
269 363
270Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
271 365
272=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
273 367
274Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
277returned. 371returned.
278 372
279Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 374deadlocked coro.
286 380
287Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
288 382
289=cut 383=cut
290 384
291our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 386
294sub lock_wait($) { 387sub lock_wait($) {
295 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 389}
308 390
309sub lock_acquire($) { 391sub lock_acquire($) {
310 my ($key) = @_; 392 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 393}
324 394
325sub lock_active($) { 395sub lock_active($) {
326 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 397}
330 398
331sub freeze_mainloop { 399sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
333 401
334 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 403}
336 }; 404
337 $TICK_WATCHER->stop; 405=item cf::periodic $interval, $cb
338 $guard 406
407Like EV::periodic, but randomly selects a starting point so that the actions
408get spread over time.
409
410=cut
411
412sub periodic($$) {
413 my ($interval, $cb) = @_;
414
415 my $start = rand List::Util::min 180, $interval;
416
417 EV::periodic $start, $interval, 0, $cb
339} 418}
340 419
341=item cf::get_slot $time[, $priority[, $name]] 420=item cf::get_slot $time[, $priority[, $name]]
342 421
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 422Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 430
352=cut 431=cut
353 432
354our @SLOT_QUEUE; 433our @SLOT_QUEUE;
355our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
356 436
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
360 440
361 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
362 443
363 while () { 444 while () {
364 next_job: 445 next_job:
446
365 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 448
367 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 453 $job->[2]->send;
371 Coro::cede; 454 Coro::cede;
372 goto next_job; 455 goto next_job;
373 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 458 }
375 } 459 }
376 460
377 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 464 $signal->wait;
381 } else { 465 } else {
466 $busy = 0;
382 Coro::schedule; 467 Coro::schedule;
383 } 468 }
384 } 469 }
385}; 470};
386 471
387sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
388 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
389 476
390 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
391 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
392 480
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
406 494
407BEGIN { *async = \&Coro::async_pool } 495BEGIN { *async = \&Coro::async_pool }
408 496
409=item cf::sync_job { BLOCK } 497=item cf::sync_job { BLOCK }
410 498
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 499The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 500is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 501partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 502acceptable.
415 503
416If it must be done, put the blocking parts into C<sync_job>. This will run 504If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 505the given BLOCK in another coroutine while waiting for the result. The
422 510
423sub sync_job(&) { 511sub sync_job(&) {
424 my ($job) = @_; 512 my ($job) = @_;
425 513
426 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 515 my $time = AE::time;
428 516
429 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
431 519
432 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
433 521
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
437 523
438 my $busy = 1; 524 my $busy = 1;
439 my @res; 525 my @res;
440 526
444 warn $@ if $@; 530 warn $@ if $@;
445 undef $busy; 531 undef $busy;
446 })->prio (Coro::PRIO_MAX); 532 })->prio (Coro::PRIO_MAX);
447 533
448 while ($busy) { 534 while ($busy) {
449 Coro::cede or Event::one_event; 535 if (Coro::nready) {
536 Coro::cede_notself;
537 } else {
538 EV::loop EV::LOOP_ONESHOT;
450 } 539 }
540 }
451 541
452 $time = Event::time - $time; 542 my $time = AE::time - $time;
453 543
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
458 545
459 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
460 } else { 547 } else {
461 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
462 549
487=item fork_call { }, $args 574=item fork_call { }, $args
488 575
489Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
493 580
494=cut 581=cut
495 582
496sub fork_call(&@) { 583sub fork_call(&@) {
497 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
504 reset_signals; 591 reset_signals;
505 &$cb 592 &$cb
506 }, @args; 593 }, @args;
507 594
508 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
509} 634}
510 635
511=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
512 637
513Returns a single value from the environment database. 638Returns a single value from the environment database.
652 777
653############################################################################# 778#############################################################################
654 779
655=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
656 781
657Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
660 785
661In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 788Deliantra).
664 789
665=over 4 790=over 4
666 791
667=item $attachable->attach ($attachment, key => $value...) 792=item $attachable->attach ($attachment, key => $value...)
668 793
712=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
713 838
714Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
716 841
717Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
719 844
720These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
721 846
722=over 4 847=over 4
950 } 1075 }
951 1076
952 0 1077 0
953} 1078}
954 1079
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1081
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1083
959Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
960 1085
1013 1138
1014sub reattach { 1139sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1141 my ($obj) = @_;
1017 1142
1143 # no longer needed after getting rid of delete_package?
1018 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
1019 1145
1020 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
1021 1147
1022 @$registry = (); 1148 @$registry = ();
1023 1149
1038cf::attachable->attach ( 1164cf::attachable->attach (
1039 prio => -1000000, 1165 prio => -1000000,
1040 on_instantiate => sub { 1166 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1042 1168
1043 $data = from_json $data; 1169 $data = decode_json $data;
1044 1170
1045 for (@$data) { 1171 for (@$data) {
1046 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1047 1173
1048 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
1069 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1072 1198
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 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 }
1077 close $fh; 1206 aio_close $fh;
1078 1207
1079 if (@$objs) { 1208 if (@$objs) {
1080 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) {
1081 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1084 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 }
1085 close $fh; 1217 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1219 }
1088 } else { 1220 } else {
1089 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1090 } 1222 }
1091 1223
1092 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1093 } else { 1228 } else {
1094 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1095 } 1230 }
1096 } else { 1231 } else {
1097 aio_unlink $filename; 1232 aio_unlink $filename;
1098 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1099 } 1234 }
1118 1253
1119 unless (aio_stat "$filename.pst") { 1254 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1255 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1256 or return;
1122 1257
1123 my $st = eval { Coro::Storable::thaw $av } 1258 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1259 $av = $st->{objs};
1126 } 1260 }
1127 1261
1128 utf8::decode (my $decname = $filename); 1262 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1263 warn sprintf "loading %s (%d,%d)\n",
1191 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1192 1326
1193 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1194} 1328}
1195 1329
1330use File::Glob ();
1331
1196cf::player->attach ( 1332cf::player->attach (
1197 on_command => sub { 1333 on_unknown_command => sub {
1198 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1199 1335
1200 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1201 or return; 1337 or return;
1202 1338
1232 1368
1233 cf::override; 1369 cf::override;
1234 }, 1370 },
1235); 1371);
1236 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
1237sub load_extensions { 1386sub load_extensions {
1238 cf::sync_job { 1387 cf::sync_job {
1239 my %todo; 1388 my %todo;
1240 1389
1241 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1260 1409
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1412
1264 $ext{source} = 1413 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1267 . $source 1416 . $source
1268 . "\n};\n1"; 1417 . "\n};\n1";
1269 1418
1270 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1271 } 1420 }
1272 1421
1422 my $pass = 0;
1273 my %done; 1423 my %done;
1274 while (%todo) { 1424 while (%todo) {
1275 my $progress; 1425 my $progress;
1276 1426
1427 ++$pass;
1428
1429 ext:
1277 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1278 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1279 goto skip 1432 next ext
1280 unless exists $done{$_}; 1433 unless exists $done{$_};
1281 } 1434 }
1282 1435
1283 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1284 1437
1285 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1286 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1287 : "$v->{base}: extension inactive.\n";
1288 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1289 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1290 warn $msg; 1445
1291 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1292 exit 1; 1447 delete $todo{$k};
1293 } 1448 } else {
1294 1449 $done{$k} = delete $todo{$k};
1295 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1296 } 1455 }
1297
1298 $done{$k} = delete $todo{$k};
1299 push @EXTS, $v->{pkg};
1300 $progress = 1;
1301 } 1456 }
1302 1457
1303 skip: 1458 unless ($progress) {
1304 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1305 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 }
1306 } 1466 }
1307 }; 1467 };
1308} 1468}
1309 1469
1310############################################################################# 1470#############################################################################
1311 1471
1312=back 1472=back
1313 1473
1314=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1315 1475
1316Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1317 1477
1318=cut 1478=cut
1319 1479
1320package cf::player; 1480package cf::player;
1321 1481
1364 1524
1365sub exists($) { 1525sub exists($) {
1366 my ($login) = @_; 1526 my ($login) = @_;
1367 1527
1368 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1369 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1370} 1530}
1371 1531
1372sub find($) { 1532sub find($) {
1373 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1374 my $login = $_[0]; 1534 my $login = $_[0];
1386 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1547 or return;
1388 1548
1389 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1390 or return; 1550 or return;
1551
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1394 } 1555 }
1395 } 1556 }
1396} 1557}
1397 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
1398sub save($) { 1572sub save($) {
1399 my ($pl) = @_; 1573 my ($pl) = @_;
1400 1574
1401 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1402 1576
1405 1579
1406 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1407 1581
1408 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1409 $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];
1410 1589
1411 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1591 cf::cede_to_tick;
1413} 1592}
1414 1593
1446 my ($pl) = @_; 1625 my ($pl) = @_;
1447 1626
1448 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1449 1628
1450 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1451 $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
1452 1631
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1454 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1456 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1457 1638
1458 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1498 1679
1499 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1500 my $path = path $login; 1681 my $path = path $login;
1501 1682
1502 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1689 }
1508 1690
1512 1694
1513 \@logins 1695 \@logins
1514} 1696}
1515 1697
1516=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1517 1701
1518Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1519player. May block. 1703player. May block.
1520 1704
1521=cut 1705=cut
1539 } 1723 }
1540 1724
1541 \@paths 1725 \@paths
1542} 1726}
1543 1727
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1545 1729
1546Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1547
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594 1731
1595=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1596 1733
1597Sends an ext reply to the player. 1734Sends an ext reply to the player.
1598 1735
1630 1767
1631=cut 1768=cut
1632 1769
1633sub find_by_path($) { 1770sub find_by_path($) {
1634 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1635 1774
1636 my ($match, $specificity); 1775 my ($match, $specificity);
1637 1776
1638 for my $region (list) { 1777 for my $region (list) {
1639 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1665our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1667 1806
1668sub generate_random_map { 1807sub generate_random_map {
1669 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
1670 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1671 $self->_create_random_map ( 1813 $self->_create_random_map (
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1675 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1676 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1677 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1678 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1700 1842
1701 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1702} 1844}
1703 1845
1704# also paths starting with '/' 1846# also paths starting with '/'
1705$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1706 1848
1707sub thawer_merge { 1849sub thawer_merge {
1708 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1709 1851
1710 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1796 1938
1797# the temporary/swap location 1939# the temporary/swap location
1798sub save_path { 1940sub save_path {
1799 my ($self) = @_; 1941 my ($self) = @_;
1800 1942
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1803} 1945}
1804 1946
1805# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1806sub uniq_path { 1948sub uniq_path {
1807 my ($self) = @_; 1949 my ($self) = @_;
1808 1950
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1811}
1812
1813# and all this just because we cannot iterate over
1814# all maps in C++...
1815sub change_all_map_light {
1816 my ($change) = @_;
1817
1818 $_->change_map_light ($change)
1819 for grep $_->outdoor, values %cf::MAP;
1820} 1953}
1821 1954
1822sub decay_objects { 1955sub decay_objects {
1823 my ($self) = @_; 1956 my ($self) = @_;
1824 1957
1908sub find { 2041sub find {
1909 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1910 2043
1911 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1912 2045
1913 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1915 2048
1916 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1920 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1921 or return; 2051 or return;
1922 2052
1923 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1924 2054
1926 or return; 2056 or return;
1927 2057
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1931 undef $guard1; 2062 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 2063 $map->reset;
1934 return find $path; 2064 return find $path;
1935 } 2065 }
1936 2066
1937 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1938 } 2068 }
1939} 2069}
1940 2070
1941sub pre_load { } 2071sub pre_load { }
1942sub post_load { } 2072#sub post_load { } # XS
1943 2073
1944sub load { 2074sub load {
1945 my ($self) = @_; 2075 my ($self) = @_;
1946 2076
1947 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2095 $f->skip_block;
1966 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
1967 or return; 2097 or return;
1968 2098
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
1970 if delete $self->{load_original}; 2100 if delete $self->{load_original};
1971 2101
1972 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2103 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
1992 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
1993 $self->decay_objects; 2123 $self->decay_objects;
1994 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
1995 $self->update_buttons; 2125 $self->update_buttons;
1996 cf::cede_to_tick; 2126 cf::cede_to_tick;
1997 $self->set_darkness_map;
1998 cf::cede_to_tick;
1999 $self->activate; 2127 $self->activate;
2000 } 2128 }
2001 2129
2002 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2004 2132
2005 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
2006 } 2134 }
2007 2135
2008 $self->post_load; 2136 $self->post_load;
2009} 2137}
2010 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
2011sub customise_for { 2142sub customise_for {
2012 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2013 2144
2014 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2015 if $self->per_player; 2146 if $self->per_player;
2068 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2069 2200
2070 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2071 2202
2072 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2074 } 2205 }
2075 2206
2076 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2077 2208
2078 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2092 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2093 2224
2094 () 2225 ()
2095} 2226}
2096 2227
2228# common code, used by both ->save and ->swapout
2097sub save { 2229sub _save {
2098 my ($self) = @_; 2230 my ($self) = @_;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2231
2102 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2103 2233
2104 return unless $self->dirty; 2234 return unless $self->dirty;
2105 2235
2114 2244
2115 cf::async { 2245 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2246 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2118 }; 2248 };
2249
2250 cf::get_slot 0.02;
2119 2251
2120 if ($uniq) { 2252 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2255 } else {
2124 $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);
2125 } 2257 }
2126} 2258}
2127 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2128sub swap_out { 2268sub swap_out {
2129 my ($self) = @_; 2269 my ($self) = @_;
2130 2270
2131 # save first because save cedes
2132 $self->save;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2136 return if $self->players; 2275 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
2138 return if $self->{deny_save};
2139 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2140 $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};
2141 2327
2142 $self->deactivate; 2328 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2144 $self->clear; 2330 $self->clear;
2145}
2146
2147sub reset_at {
2148 my ($self) = @_;
2149
2150 # TODO: safety, remove and allow resettable per-player maps
2151 return 1e99 if $self->{deny_reset};
2152
2153 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2154 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2155
2156 $time + $to
2157}
2158
2159sub should_reset {
2160 my ($self) = @_;
2161
2162 $self->reset_at <= $cf::RUNTIME
2163}
2164
2165sub reset {
2166 my ($self) = @_;
2167
2168 my $lock = cf::lock_acquire "map_data:$self->{path}";
2169
2170 return if $self->players;
2171
2172 warn "resetting map ", $self->path;
2173
2174 $self->in_memory (cf::MAP_SWAPPED);
2175
2176 # need to save uniques path
2177 unless ($self->{deny_save}) {
2178 my $uniq = $self->uniq_path; utf8::encode $uniq;
2179
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2181 if $uniq;
2182 }
2183
2184 delete $cf::MAP{$self->path};
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear;
2189 2331
2190 $self->unlink_save; 2332 $self->unlink_save;
2191 $self->destroy; 2333 $self->destroy;
2192} 2334}
2193 2335
2201 2343
2202 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2203 2345
2204 $self->unlink_save; 2346 $self->unlink_save;
2205 2347
2206 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2207 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2208 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2209 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2211 2353
2260 2402
2261sub unique_maps() { 2403sub unique_maps() {
2262 [ 2404 [
2263 map { 2405 map {
2264 utf8::decode $_; 2406 utf8::decode $_;
2265 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2266 ? normalise $_ 2410 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2412 ]
2270} 2413}
2271 2414
2272package 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}
2273 2446
2274=back 2447=back
2275 2448
2276=head3 cf::object 2449=head3 cf::object
2277 2450
2281 2454
2282=over 4 2455=over 4
2283 2456
2284=item $ob->inv_recursive 2457=item $ob->inv_recursive
2285 2458
2286Returns 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.
2287 2461
2288=cut 2462=cut
2289 2463
2290sub inv_recursive_; 2464sub inv_recursive_;
2291sub inv_recursive_ { 2465sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2297} 2471}
2298 2472
2299=item $ref = $ob->ref 2473=item $ref = $ob->ref
2300 2474
2301creates 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.
2302 2476
2303=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2304 2478
2305returns 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,
2306even if the object actually exists. May block. 2480even if the object actually exists. May block.
2338can 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
2339dialogue with the given NPC character. 2513dialogue with the given NPC character.
2340 2514
2341=cut 2515=cut
2342 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
2343# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2532# with dialog boxes.
2345#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
2346sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2359 $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));
2360 2548
2361 } else { 2549 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2552 }
2365 } 2553 }
2366} 2554}
2367 2555
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2393 2581
2394=item $player_object->enter_link 2582=item $player_object->enter_link
2395 2583
2396Freezes 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}>).
2397 2585
2398The 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.
2399I<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.
2400 2590
2401Will never block. 2591Will never block.
2402 2592
2403=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2404 2594
2429 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2430 2620
2431 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2432 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2433 2623
2434 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2435} 2625}
2436 2626
2437sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2438 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2439 2629
2456 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2457 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2458 2648
2459 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2460 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2461 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2462 2652
2463 $map->load; 2653 $map->load;
2464 $map->load_neighbours; 2654 $map->load_neighbours;
2465 2655
2466 return unless $self->contr->active; 2656 return unless $self->contr->active;
2467 $self->activate_recursive;
2468 2657
2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2470 $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;
2471} 2663}
2472 2664
2473=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2474 2666
2475Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2476her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2477that has to return the map if sucecssful, and then unfreezes the player on 2669that has to return the map if sucecssful, and then unfreezes the player on
2478the new (success) or old (failed) map position. In either case, $done will 2670the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process. 2671be called at the end of this process.
2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2480 2675
2481=cut 2676=cut
2482 2677
2483our $GOTOGEN; 2678our $GOTOGEN;
2484 2679
2563} 2758}
2564 2759
2565sub prepare_random_map { 2760sub prepare_random_map {
2566 my ($exit) = @_; 2761 my ($exit) = @_;
2567 2762
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2763 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2764 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2765 # that depends on the exit object
2573 2766
2574 my $rmp = parse_random_map_params $exit->msg; 2767 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2769 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2770 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2771 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2772 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2773 $rmp->{origin_y} = $exit->y;
2774
2775 $exit->map->touch;
2581 } 2776 }
2582 2777
2583 $rmp->{random_seed} ||= $exit->random_seed; 2778 $rmp->{random_seed} ||= $exit->random_seed;
2584 2779
2585 my $data = cf::to_json $rmp; 2780 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2781 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2782 my $meta = "$RANDOMDIR/$md5.meta";
2588 2783
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2784 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2785 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2786 undef $fh;
2592 aio_rename "$meta~", $meta; 2787 aio_rename "$meta~", $meta;
2593 2788
2789 my $slaying = "?random/$md5";
2790
2791 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2792 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2793 $exit->msg (undef);
2794 }
2596 } 2795 }
2597} 2796}
2598 2797
2599sub cf::object::player::enter_exit { 2798sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2799 my ($self, $exit) = @_;
2601 2800
2602 return unless $self->type == cf::PLAYER; 2801 return unless $self->type == cf::PLAYER;
2603 2802
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2803 $self->enter_link;
2616 2804
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2805 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2806 $Coro::current->{desc} = "enter_exit";
2623 2807
2624 $self->deactivate_recursive; # just to be sure
2625 unless (eval { 2808 unless (eval {
2809 $self->deactivate_recursive; # just to be sure
2810
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2820 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp;
2822
2626 $self->goto ($slaying, $hp, $sp); 2823 $self->goto ($map, $x, $y);
2627 2824
2825 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y)
2827 if $exit->flag (cf::FLAG_DAMNED);
2828
2628 1; 2829 1
2629 }) { 2830 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2631 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2632 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2634 2835
2635 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
2652sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2653 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2654 2855
2655 utf8::encode $text; 2856 utf8::encode $text;
2656 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2657} 2883}
2658 2884
2659=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2660 2886
2661Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2663the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet. 2890the message unless the client supports the msg packet.
2665 2891
2666=cut 2892=cut
2667 2893
2894# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2669 "c/identify" => { 2902 "c/identify" => {
2670 id => "infobox", 2903 id => "infobox",
2671 title => "Identify", 2904 title => "Identify",
2672 reply => undef, 2905 reply => undef,
2673 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2676 id => "infobox", 2909 id => "infobox",
2677 title => "Examine", 2910 title => "Examine",
2678 reply => undef, 2911 reply => undef,
2679 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2680 }, 2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2919 },
2920 "c/book" => {
2921 id => "infobox",
2922 title => "Book",
2923 reply => undef,
2924 tooltip => "The contents of a note or book",
2925 },
2681 "c/lookat" => { 2926 "c/lookat" => {
2682 id => "infobox", 2927 id => "infobox",
2683 title => "Look", 2928 title => "Look",
2684 reply => undef, 2929 reply => undef,
2685 tooltip => "What you saw there", 2930 tooltip => "What you saw there",
2686 }, 2931 },
2932 "c/who" => {
2933 id => "infobox",
2934 title => "Players",
2935 reply => undef,
2936 tooltip => "Shows players who are currently online",
2937 },
2938 "c/body" => {
2939 id => "infobox",
2940 title => "Body Parts",
2941 reply => undef,
2942 tooltip => "Shows which body parts you posess and are available",
2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2980 "c/uptime" => {
2981 id => "infobox",
2982 title => "Uptime",
2983 reply => undef,
2984 tooltip => "How long the server has been running since last restart",
2985 },
2986 "c/mapinfo" => {
2987 id => "infobox",
2988 title => "Map Info",
2989 reply => undef,
2990 tooltip => "Information related to the maps",
2991 },
2992 "c/party" => {
2993 id => "party",
2994 title => "Party",
2995 reply => "gsay ",
2996 tooltip => "Messages and chat related to your party",
2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2687); 3006);
2688 3007
2689sub cf::client::send_msg { 3008sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2691 3010
2692 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2693 3013
2694 $color &= cf::NDI_CLIENT_MASK; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695 3015
2696 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2699 3019
2700 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2704 3022
2705 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2706 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2707 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2708 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2709 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711 } 3028 }
2712 3029
2713 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2714 } 3031 }
2715 3032
2716 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2717 3034
2718 if ($self->can_msg) {
2719 # default colour, mask it out 3035 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2722 3038
2723 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3039 my $pkt = "msg "
3040 . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2725 } else { 3042 );
2726 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones
2728 for ($msg) {
2729 1 while
2730 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2731 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2732 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2733 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2734 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2735 }
2736 3043
2737 $color &= cf::NDI_COLOR_MASK; 3044 $self->send_big_packet ($pkt);
2738
2739 utf8::encode $msg;
2740
2741 if (0 && $msg =~ /\[/) {
2742 # COMMAND/INFO
2743 $self->send_packet ("drawextinfo $color 10 8 $msg")
2744 } else {
2745 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2746 $self->send_packet ("drawinfo $color $msg")
2747 }
2748 }
2749 }
2750} 3045}
2751 3046
2752=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2753 3048
2754Sends an ext event to the client. 3049Sends an ext event to the client.
2757 3052
2758sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2759 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2760 3055
2761 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2763 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2764 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2765 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2766 } 3061 }
2767} 3062}
2768 3063
2769=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2770 3065
2774 3069
2775sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2776 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2777 3072
2778 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2779 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2780 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2781 #TODO: version 1, remove 3076 #TODO: version 1, remove
2782 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2783 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2784 } 3079 }
2785} 3080}
2786 3081
2787=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2788 3083
2889 3184
2890 $coro 3185 $coro
2891} 3186}
2892 3187
2893cf::client->attach ( 3188cf::client->attach (
2894 on_destroy => sub { 3189 on_client_destroy => sub {
2895 my ($ns) = @_; 3190 my ($ns) = @_;
2896 3191
2897 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2898 }, 3193 },
2899); 3194);
2915our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
2916 3211
2917$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
2918 3213
2919$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
2920 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
2921 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
2922 sort time 3217 sort time
2923)); 3218));
2924 3219
2925# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
2928 3223
2929The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
2930 3225
2931 cf::object 3226 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr 3228 insert remove name archname title slaying race decrease split
3229 value
2934 3230
2935 cf::object::player 3231 cf::object::player
2936 player 3232 player
2937 3233
2938 cf::player 3234 cf::player
2943 3239
2944=cut 3240=cut
2945 3241
2946for ( 3242for (
2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3245 decrease split destroy change_exp value msg lore send_msg)],
2950 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
2952 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
2953) { 3249) {
2954 no strict 'refs'; 3250 no strict 'refs';
2955 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
2956 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2974 3270
2975 my $qcode = $code; 3271 my $qcode = $code;
2976 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2977 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
2978 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
2979 local $_; 3278 local $_;
2980 local @safe::cf::_safe_eval_args = values %vars;
2981 3279
2982 my $eval = 3280 my $eval =
2983 "do {\n" 3281 "do {\n"
2984 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2985 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
2986 . $code 3284 . $code
2987 . "\n}" 3285 . "\n}"
2988 ; 3286 ;
2989 3287
3288 if ($CFG{safe_eval}) {
2990 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
2991 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2992 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
2993 3297
2994 if ($@) { 3298 if ($@) {
2995 warn "$@"; 3299 warn "$@";
2996 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
2997 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3016=cut 3320=cut
3017 3321
3018sub register_script_function { 3322sub register_script_function {
3019 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3020 3324
3021 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3022 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3023} 3327}
3024 3328
3025=back 3329=back
3026 3330
3027=cut 3331=cut
3048 3352
3049 $facedata->{version} == 2 3353 $facedata->{version} == 2
3050 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3051 3355
3052 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3053 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3054 type => FT_RSRC, 3359 type => FT_RSRC,
3055 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3056 }; 3362 };
3057 cf::cede_to_tick; 3363 cf::cede_to_tick;
3058 3364
3059 { 3365 {
3060 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3061 3367
3062 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370
3064 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3068 3375
3069 cf::cede_to_tick; 3376 cf::cede_to_tick;
3070 } 3377 }
3071 3378
3072 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3380 next unless $info->{smooth};
3381
3074 my $idx = cf::face::find $face 3382 my $idx = cf::face::find $face
3075 or next; 3383 or next;
3384
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3385 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3386 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3388 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3389 warn "smooth face '$info->{smooth}' not found for face '$face'";
3094 3403
3095 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3096 } 3405 }
3097 3406
3098 { 3407 {
3099 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3102 3409
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3411 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data;
3108 3413
3109 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3110 # prepend meta info 3415 cf::face::set_type $idx, $info->{type};
3111
3112 my $meta = $enc->encode ({
3113 name => $name,
3114 %{ $info->{meta} || {} },
3115 });
3116
3117 $data = pack "(w/a*)*", $meta, $info->{data};
3118 } else { 3416 } else {
3119 $data = $info->{data}; 3417 $RESOURCE{$name} = $info;
3120 } 3418 }
3121 3419
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3420 cf::cede_to_tick;
3126 } 3421 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3422 }
3423
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3425
3147 1 3426 1
3148} 3427}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3149 3448
3150register_exticmd fx_want => sub { 3449register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_; 3450 my ($ns, $want) = @_;
3152 3451
3153 while (my ($k, $v) = each %$want) { 3452 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3453 $ns->fx_want ($k, $v);
3155 } 3454 }
3156}; 3455};
3456
3457sub load_resource_file($) {
3458 my $guard = lock_acquire "load_resource_file";
3459
3460 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100;
3462 cf::arch::commit_load;
3463
3464 $status
3465}
3157 3466
3158sub reload_regions { 3467sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework 3468 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?) 3469 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3470 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3484}
3176 3485
3177sub reload_archetypes { 3486sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3487 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3488 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3489}
3186 3490
3187sub reload_treasures { 3491sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3492 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3493 or die "unable to load treasurelists\n";
3190} 3494}
3191 3495
3192sub reload_resources { 3496sub reload_resources {
3193 warn "reloading resource files...\n"; 3497 warn "reloading resource files...\n";
3194 3498
3499 reload_facedata;
3500 reload_archetypes;
3195 reload_regions; 3501 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3502 reload_treasures;
3200 3503
3201 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3202} 3505}
3203 3506
3204sub init {
3205 reload_resources;
3206}
3207
3208sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3210 or return; 3511 or return;
3211 3512
3212 local $/; 3513 local $/;
3213 *CFG = YAML::Syck::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3214 3515
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3216 3517
3217 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3218 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3222 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3223 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3224 }; 3525 };
3225 warn $@ if $@; 3526 warn $@ if $@;
3226 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3227} 3558}
3228 3559
3229sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
3230 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3233 (async { 3573 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3575 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3237 }; 3577 };
3238 3578
3579 evthread_start IO::AIO::poll_fileno;
3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3239 reload_config; 3591 reload_config;
3240 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3241 load_extensions; 3602 load_extensions;
3242 3603
3243 $TICK_WATCHER->start; 3604 utime time, time, $RUNTIMEFILE;
3244 Event::loop; 3605
3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3245} 3617}
3246 3618
3247############################################################################# 3619#############################################################################
3248# initialisation and cleanup 3620# initialisation and cleanup
3249 3621
3250# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3251BEGIN { 3623BEGIN {
3624 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3260 },
3261 ); 3628 };
3262 } 3629 }
3263} 3630}
3264 3631
3265sub write_runtime { 3632sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
3267 3634
3268 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3270 3637
3271 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3272 3639
3273 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3274 3641
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3276 or return; 3643 or return;
3277 3644
3278 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3290 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3291 3658
3292 close $fh 3659 close $fh
3293 or return; 3660 or return;
3294 3661
3295 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3296 and return; 3663 and return;
3297 3664
3298 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3299 3666
3300 1 3667 1
3668}
3669
3670our $uuid_lock;
3671our $uuid_skip;
3672
3673sub write_uuid_sync($) {
3674 $uuid_skip ||= $_[0];
3675
3676 return if $uuid_lock;
3677 local $uuid_lock = 1;
3678
3679 my $uuid = "$LOCALDIR/uuid";
3680
3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3682 or return;
3683
3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0;
3693
3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3695 and return;
3696
3697 # always fsync - this file is important
3698 aio_fsync $fh
3699 and return;
3700
3701 close $fh
3702 or return;
3703
3704 aio_rename "$uuid~", $uuid
3705 and return;
3706
3707 warn "uuid file written ($value).\n";
3708
3709 1
3710
3711}
3712
3713sub write_uuid($$) {
3714 my ($skip, $sync) = @_;
3715
3716 $sync ? write_uuid_sync $skip
3717 : async { write_uuid_sync $skip };
3301} 3718}
3302 3719
3303sub emergency_save() { 3720sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3305 3722
3306 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3307 3724
3308 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3309 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3310 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3311 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3312 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3313 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3314 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3315 $pl->valid or next; 3737 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3317 $pl->save; 3739 $pl->save;
3318 } 3740 }
3319 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3320 3742
3321 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3322 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3323 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3324 $map->valid or next; 3746 $map->valid or next;
3325 $map->save; 3747 $map->save;
3326 } 3748 }
3327 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3328 3750
3329 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3331 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3754
3755 warn "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n";
3332 }; 3758 };
3333 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3334 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3335} 3766}
3336 3767
3337sub post_cleanup { 3768sub post_cleanup {
3338 my ($make_core) = @_; 3769 my ($make_core) = @_;
3339 3770
3340 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3341 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3342} 3801}
3343 3802
3344sub do_reload_perl() { 3803sub do_reload_perl() {
3345 # can/must only be called in main 3804 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3347 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3348 return; 3807 return;
3349 } 3808 }
3350 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3351 warn "reloading..."; 3815 warn "reloading...";
3352 3816
3353 warn "entering sync_job"; 3817 warn "entering sync_job";
3354 3818
3355 cf::sync_job { 3819 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3357 cf::emergency_save; 3821 cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3359 3823
3360 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3362 3826
3363 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3364 3828
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests"; 3829 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3376 warn "iterate..."; 3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = ();
3384
3385 warn "removing commands";
3386 %COMMAND = ();
3387
3388 warn "removing ext/exti commands";
3389 %EXTCMD = ();
3390 %EXTICMD = ();
3391
3392 warn "unloading/nuking all extensions";
3393 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg";
3395
3396 if (my $cb = $pkg->can ("unload")) {
3397 eval {
3398 $cb->($pkg);
3399 1
3400 } or warn "$pkg unloaded, but with errors: $@";
3401 } 3832 }
3402 3833
3403 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3404 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3405 } 3836 %EXT_CORO = ();
3406 3837
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3408 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3411 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3412 delete $INC{$k};
3413 3848
3414 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g;
3416
3417 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3418 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3419 } 3858 }
3420 3859
3421 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3422 } 3875 }
3423 3876
3424 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3426 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3427 3880
3428 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3431 3884
3432 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3433 # and global variables created in xs 3886 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3435 3888
3436 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3437 3890
3438 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3439 require cf; 3892 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3441 3894
3442 warn "loading config and database again"; 3895 warn "loading config and database again";
3443 cf::reload_config; 3896 cf::reload_config;
3444 3897
3445 warn "loading extensions"; 3898 warn "loading extensions";
3446 cf::load_extensions; 3899 cf::load_extensions;
3447 3900
3901 if ($REATTACH_ON_RELOAD) {
3448 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3451 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3454 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3455 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3456 3914
3457 1 3915 1
3458 } or do { 3916 } or do {
3459 warn $@; 3917 warn $@;
3460 warn "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3461 exit 1;
3462 }; 3919 };
3463 3920
3464 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3465}; 3927};
3466 3928
3467our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3468 3930
3469sub reload_perl() { 3931sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3472 3934
3473 $RELOAD_WATCHER ||= Event->timer ( 3935 $RELOAD_WATCHER ||= cf::async {
3474 reentrant => 0, 3936 Coro::AIO::aio_wait cache_extensions;
3475 after => 0, 3937
3476 data => WF_AUTOCANCEL, 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3477 cb => sub {
3478 do_reload_perl; 3939 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3480 }, 3941 };
3481 ); 3942 };
3482} 3943}
3483 3944
3484register_command "reload" => sub { 3945register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3486 3947
3499 3960
3500our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3502 3963
3503sub wait_for_tick { 3964sub wait_for_tick {
3504 return unless $TICK_WATCHER->is_active;
3505 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3506 3966
3507 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3508 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait; 3969 $signal->wait;
3510} 3970}
3511 3971
3512sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3515 3974
3516 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 3977 $signal->wait;
3519} 3978}
3520 3979
3521$TICK_WATCHER = Event->timer ( 3980sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 3981 if ($Coro::current != $Coro::main) {
3529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3530 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3531 return; 3984 return;
3532 } 3985 }
3533 3986
3534 $NOW = $tick_start = Event::time;
3535
3536 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3537 3988
3538 $RUNTIME += $TICK; 3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3539 $NEXT_TICK += $TICK;
3540 3990
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 3993 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 3995 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 3996 or warn "ERROR: unable to write runtime file: $!";
3547 };
3548 } 3997 };
3998 }
3549 3999
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 4001 $sig->send;
3552 } 4002 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 4003 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 4004 $sig->send;
3555 } 4005 }
3556 4006
3557 $NOW = Event::time; 4007 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 4009
3568 _post_tick; 4010 if (0) {
4011 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d#
4015 }
3569 }, 4016 }
3570); 4017}
3571 4018
3572{ 4019{
4020 # configure BDB
4021
3573 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3574 BDB::max_poll_time $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 4024 $AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 4025
3599 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | BDB::LOG_AUTOREMOVE, 1); 4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 4033
3606 cf::sync_job { 4034 cf::sync_job {
3607 eval { 4035 eval {
3617 4045
3618 cf::cleanup "db_env_open(db): $@" if $@; 4046 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 4047 };
3620 } 4048 }
3621 4049
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 4050 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4051 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 ); 4052 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4053 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4054 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 4055 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 4056 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4057 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 4058 };
3652} 4059}
3653 4060
3654{ 4061{
4062 # configure IO::AIO
4063
3655 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 4066 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 4067}
3668 4068
3669my $_log_backtrace; 4069my $_log_backtrace;
3670 4070
3671sub _log_backtrace { 4071sub _log_backtrace {
3674 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3675 4075
3676 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3677 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3678 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3679 async { 4080 async {
3680 $Coro::current->{desc} = "abt $msg"; 4081 $Coro::current->{desc} = "abt $msg";
3681 4082
3682 my @bt = fork_call { 4083 my @bt = fork_call {
3683 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3694 } 4095 }
3695 4096
3696 @funcs 4097 @funcs
3697 }; 4098 };
3698 4099
3699 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3700 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3701 --$_log_backtrace; 4103 --$_log_backtrace;
3702 }; 4104 };
3703 } else { 4105 } else {
3704 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3705 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3706 } 4108 }
3707} 4109}
3708 4110
3709# load additional modules 4111# load additional modules
3710use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3711 4114
3712END { cf::emergency_save } 4115END { cf::emergency_save }
3713 4116
37141 41171
3715 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines