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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines