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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d#
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
… …
447 536
448 while ($busy) { 537 while ($busy) {
449 if (Coro::nready) { 538 if (Coro::nready) {
450 Coro::cede_notself; 539 Coro::cede_notself;
451 } else { 540 } else {
452 Event::one_event; 541 EV::loop EV::LOOP_ONESHOT;
453 } 542 }
454 } 543 }
455 544
456 $time = Event::time - $time; 545 my $time = AE::time - $time;
457 546
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
462 548
463 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
464 } else { 550 } else {
465 # we are in another coroutine, how wonderful, everything just works 551 # we are in another coroutine, how wonderful, everything just works
466 552
… …
491=item fork_call { }, $args 577=item fork_call { }, $args
492 578
493Executes the given code block with the given arguments in a seperate 579Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 580process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 581Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 582never block itself or use any form of event handling.
497 583
498=cut 584=cut
499 585
500sub fork_call(&@) { 586sub fork_call(&@) {
501 my ($cb, @args) = @_; 587 my ($cb, @args) = @_;
… …
508 reset_signals; 594 reset_signals;
509 &$cb 595 &$cb
510 }, @args; 596 }, @args;
511 597
512 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
513} 637}
514 638
515=item $value = cf::db_get $family => $key 639=item $value = cf::db_get $family => $key
516 640
517Returns a single value from the environment database. 641Returns a single value from the environment database.
… …
656 780
657############################################################################# 781#############################################################################
658 782
659=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
660 784
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
664 788
665In 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>
666C<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
667Crossfire TRT). 791Deliantra).
668 792
669=over 4 793=over 4
670 794
671=item $attachable->attach ($attachment, key => $value...) 795=item $attachable->attach ($attachment, key => $value...)
672 796
… …
716=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
717 841
718Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
720 844
721Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 847
724These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
725 849
726=over 4 850=over 4
… …
954 } 1078 }
955 1079
956 0 1080 0
957} 1081}
958 1082
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1083=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1084
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1085=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1086
963Generate an object-specific event with the given arguments. 1087Generate an object-specific event with the given arguments.
964 1088
… …
1017 1141
1018sub reattach { 1142sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1144 my ($obj) = @_;
1021 1145
1146 # no longer needed after getting rid of delete_package?
1022 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
1023 1148
1024 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1025 1150
1026 @$registry = (); 1151 @$registry = ();
1027 1152
… …
1042cf::attachable->attach ( 1167cf::attachable->attach (
1043 prio => -1000000, 1168 prio => -1000000,
1044 on_instantiate => sub { 1169 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1170 my ($obj, $data) = @_;
1046 1171
1047 $data = from_json $data; 1172 $data = decode_json $data;
1048 1173
1049 for (@$data) { 1174 for (@$data) {
1050 my ($name, $args) = @$_; 1175 my ($name, $args) = @$_;
1051 1176
1052 $obj->attach ($name, %{$args || {} }); 1177 $obj->attach ($name, %{$args || {} });
… …
1070 1195
1071 sync_job { 1196 sync_job {
1072 if (length $$rdata) { 1197 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1076 1202
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 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 }
1081 close $fh; 1210 aio_close $fh;
1082 1211
1083 if (@$objs) { 1212 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1088 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 }
1089 close $fh; 1221 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1223 }
1092 } else { 1224 } else {
1093 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1094 } 1226 }
1095 1227
1096 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1232 } else {
1098 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1099 } 1234 }
1100 } else { 1235 } else {
1101 aio_unlink $filename; 1236 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1103 } 1238 }
… …
1128 $av = $st->{objs}; 1263 $av = $st->{objs};
1129 } 1264 }
1130 1265
1131 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1134 1270
1135 ($data, $av) 1271 ($data, $av)
1136} 1272}
1137 1273
1138=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1194 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1195 1331
1196 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1197} 1333}
1198 1334
1335use File::Glob ();
1336
1199cf::player->attach ( 1337cf::player->attach (
1200 on_command => sub { 1338 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1202 1340
1203 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1204 or return; 1342 or return;
1205 1343
… …
1235 1373
1236 cf::override; 1374 cf::override;
1237 }, 1375 },
1238); 1376);
1239 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
1240sub load_extensions { 1391sub load_extensions {
1241 cf::sync_job { 1392 cf::sync_job {
1242 my %todo; 1393 my %todo;
1243 1394
1244 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
… …
1263 1414
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1417
1267 $ext{source} = 1418 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1270 . $source 1421 . $source
1271 . "\n};\n1"; 1422 . "\n};\n1";
1272 1423
1273 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1274 } 1425 }
1275 1426
1427 my $pass = 0;
1276 my %done; 1428 my %done;
1277 while (%todo) { 1429 while (%todo) {
1278 my $progress; 1430 my $progress;
1279 1431
1432 ++$pass;
1433
1434 ext:
1280 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1437 next ext
1283 unless exists $done{$_}; 1438 unless exists $done{$_};
1284 } 1439 }
1285 1440
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1442
1288 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1447
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1449 if exists $v->{meta}{mandatory};
1293 warn $msg; 1450
1294 warn "mandatory extension failed to load, exiting.\n"; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1452 delete $todo{$k};
1296 } 1453 } else {
1297 1454 $done{$k} = delete $todo{$k};
1298 warn $msg; 1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1299 } 1460 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1461 }
1305 1462
1306 skip: 1463 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 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 }
1309 } 1471 }
1310 }; 1472 };
1311} 1473}
1312 1474
1313############################################################################# 1475#############################################################################
1314 1476
1315=back 1477=back
1316 1478
1317=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1318 1480
1319Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1320 1482
1321=cut 1483=cut
1322 1484
1323package cf::player; 1485package cf::player;
1324 1486
… …
1367 1529
1368sub exists($) { 1530sub exists($) {
1369 my ($login) = @_; 1531 my ($login) = @_;
1370 1532
1371 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1373} 1535}
1374 1536
1375sub find($) { 1537sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1539 my $login = $_[0];
… …
1389 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1552 or return;
1391 1553
1392 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1393 or return; 1555 or return;
1556
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1397 } 1560 }
1398 } 1561 }
1399} 1562}
1400 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
1401sub save($) { 1577sub save($) {
1402 my ($pl) = @_; 1578 my ($pl) = @_;
1403 1579
1404 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1405 1581
… …
1408 1584
1409 return if $pl->{deny_save}; 1585 return if $pl->{deny_save};
1410 1586
1411 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1412 $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];
1413 1594
1414 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1596 cf::cede_to_tick;
1416} 1597}
1417 1598
… …
1449 my ($pl) = @_; 1630 my ($pl) = @_;
1450 1631
1451 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1452 1633
1453 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1454 $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
1455 1636
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1641 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1642 $pl->ns->destroy if $pl->ns;
1460 1643
1461 my $path = playerdir $pl; 1644 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1645 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1501 1684
1502 for my $login (@$dirs) { 1685 for my $login (@$dirs) {
1503 my $path = path $login; 1686 my $path = path $login;
1504 1687
1505 # a .pst is a dead give-away for a valid player 1688 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1689 # if no pst file found, open and chekc for blocked users
1690 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1691 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1692 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1693 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1694 }
1511 1695
… …
1515 1699
1516 \@logins 1700 \@logins
1517} 1701}
1518 1702
1519=item $player->maps 1703=item $player->maps
1704
1705=item cf::player::maps $login
1520 1706
1521Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1522player. May block. 1708player. May block.
1523 1709
1524=cut 1710=cut
… …
1542 } 1728 }
1543 1729
1544 \@paths 1730 \@paths
1545} 1731}
1546 1732
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1733=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1734
1549Expand crossfire pod fragments into protocol xml. 1735Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1736
1598=item $player->ext_reply ($msgid, @msg) 1737=item $player->ext_reply ($msgid, @msg)
1599 1738
1600Sends an ext reply to the player. 1739Sends an ext reply to the player.
1601 1740
… …
1633 1772
1634=cut 1773=cut
1635 1774
1636sub find_by_path($) { 1775sub find_by_path($) {
1637 my ($path) = @_; 1776 my ($path) = @_;
1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1638 1779
1639 my ($match, $specificity); 1780 my ($match, $specificity);
1640 1781
1641 for my $region (list) { 1782 for my $region (list) {
1642 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
… …
1668our $MAX_RESET = 3600; 1809our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1810our $DEFAULT_RESET = 3000;
1670 1811
1671sub generate_random_map { 1812sub generate_random_map {
1672 my ($self, $rmp) = @_; 1813 my ($self, $rmp) = @_;
1814
1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816
1673 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1818 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1703 1847
1704 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1705} 1849}
1706 1850
1707# also paths starting with '/' 1851# also paths starting with '/'
1708$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1709 1853
1710sub thawer_merge { 1854sub thawer_merge {
1711 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1712 1856
1713 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
1799 1943
1800# the temporary/swap location 1944# the temporary/swap location
1801sub save_path { 1945sub save_path {
1802 my ($self) = @_; 1946 my ($self) = @_;
1803 1947
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1948 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1949 "$TMPDIR/$path.map"
1806} 1950}
1807 1951
1808# the unique path, undef == no special unique path 1952# the unique path, undef == no special unique path
1809sub uniq_path { 1953sub uniq_path {
1810 my ($self) = @_; 1954 my ($self) = @_;
1811 1955
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1957 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 1958}
1824 1959
1825sub decay_objects { 1960sub decay_objects {
1826 my ($self) = @_; 1961 my ($self) = @_;
1827 1962
… …
1911sub find { 2046sub find {
1912 my ($path, $origin) = @_; 2047 my ($path, $origin) = @_;
1913 2048
1914 $path = normalise $path, $origin && $origin->path; 2049 $path = normalise $path, $origin && $origin->path;
1915 2050
1916 cf::lock_wait "map_data:$path";#d#remove 2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2052 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2053
1919 $cf::MAP{$path} || do { 2054 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 2055 my $map = new_from_path cf::map $path
1924 or return; 2056 or return;
1925 2057
1926 $map->{last_save} = $cf::RUNTIME; 2058 $map->{last_save} = $cf::RUNTIME;
1927 2059
… …
1929 or return; 2061 or return;
1930 2062
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2063 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2064 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2065 #$cf::WAIT_FOR_TICK->wait;
2066 undef $guard2;
1934 undef $guard1; 2067 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2068 $map->reset;
1937 return find $path; 2069 return find $path;
1938 } 2070 }
1939 2071
1940 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1941 } 2073 }
1942} 2074}
1943 2075
1944sub pre_load { } 2076sub pre_load { }
1945sub post_load { } 2077#sub post_load { } # XS
1946 2078
1947sub load { 2079sub load {
1948 my ($self) = @_; 2080 my ($self) = @_;
1949 2081
1950 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
… …
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2099 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2100 $f->skip_block;
1969 $self->_load_objects ($f) 2101 $self->_load_objects ($f)
1970 or return; 2102 or return;
1971 2103
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2104 $self->post_load_original
1973 if delete $self->{load_original}; 2105 if delete $self->{load_original};
1974 2106
1975 if (my $uniq = $self->uniq_path) { 2107 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2108 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2109 unless (aio_stat $uniq) {
… …
1995 unless ($self->{deny_activate}) { 2127 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2128 $self->decay_objects;
1997 $self->fix_auto_apply; 2129 $self->fix_auto_apply;
1998 $self->update_buttons; 2130 $self->update_buttons;
1999 cf::cede_to_tick; 2131 cf::cede_to_tick;
2000 $self->set_darkness_map;
2001 cf::cede_to_tick;
2002 $self->activate; 2132 $self->activate;
2003 } 2133 }
2004 2134
2005 $self->{last_save} = $cf::RUNTIME; 2135 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2136 $self->last_access ($cf::RUNTIME);
2007 2137
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2138 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2139 }
2010 2140
2011 $self->post_load; 2141 $self->post_load;
2012} 2142}
2013 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2014sub customise_for { 2147sub customise_for {
2015 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2016 2149
2017 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2151 if $self->per_player;
… …
2034 or next; 2167 or next;
2035 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2036 or next; 2169 or next;
2037 $neigh->load; 2170 $neigh->load;
2038 2171
2172 # now find the diagonal neighbours
2039 push @neigh, 2173 push @neigh,
2040 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2041 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2042 } 2176 }
2043 2177
… …
2071 my ($path, $origin, $load) = @_; 2205 my ($path, $origin, $load) = @_;
2072 2206
2073 $path = normalise $path, $origin && $origin->{path}; 2207 $path = normalise $path, $origin && $origin->{path};
2074 2208
2075 if (my $map = $cf::MAP{$path}) { 2209 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2210 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2211 }
2078 2212
2079 $MAP_PREFETCH{$path} |= $load; 2213 $MAP_PREFETCH{$path} |= $load;
2080 2214
2081 $MAP_PREFETCHER ||= cf::async { 2215 $MAP_PREFETCHER ||= cf::async {
… …
2095 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2096 2230
2097 () 2231 ()
2098} 2232}
2099 2233
2234# common code, used by both ->save and ->swapout
2100sub save { 2235sub _save {
2101 my ($self) = @_; 2236 my ($self) = @_;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2237
2105 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2106 2239
2107 return unless $self->dirty; 2240 return unless $self->dirty;
2108 2241
… …
2117 2250
2118 cf::async { 2251 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2252 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2253 $_->contr->save for $self->players;
2121 }; 2254 };
2255
2256 cf::get_slot 0.02;
2122 2257
2123 if ($uniq) { 2258 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2259 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2260 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2261 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2128 } 2263 }
2129} 2264}
2130 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2131sub swap_out { 2274sub swap_out {
2132 my ($self) = @_; 2275 my ($self) = @_;
2133 2276
2134 # save first because save cedes
2135 $self->save;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2278
2279 return if $self->in_memory != cf::MAP_ACTIVE;
2280 return if $self->{deny_save};
2139 return if $self->players; 2281 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2141 return if $self->{deny_save};
2142 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2143 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2144 2333
2145 $self->deactivate; 2334 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear; 2336 $self->clear;
2148}
2149
2150sub reset_at {
2151 my ($self) = @_;
2152
2153 # TODO: safety, remove and allow resettable per-player maps
2154 return 1e99 if $self->{deny_reset};
2155
2156 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2157 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2158
2159 $time + $to
2160}
2161
2162sub should_reset {
2163 my ($self) = @_;
2164
2165 $self->reset_at <= $cf::RUNTIME
2166}
2167
2168sub reset {
2169 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172
2173 return if $self->players;
2174
2175 warn "resetting map ", $self->path;
2176
2177 $self->in_memory (cf::MAP_SWAPPED);
2178
2179 # need to save uniques path
2180 unless ($self->{deny_save}) {
2181 my $uniq = $self->uniq_path; utf8::encode $uniq;
2182
2183 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2184 if $uniq;
2185 }
2186
2187 delete $cf::MAP{$self->path};
2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2191 $self->clear;
2192 2337
2193 $self->unlink_save; 2338 $self->unlink_save;
2194 $self->destroy; 2339 $self->destroy;
2195} 2340}
2196 2341
… …
2204 2349
2205 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2206 2351
2207 $self->unlink_save; 2352 $self->unlink_save;
2208 2353
2209 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2210 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2211 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2212 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2214 2359
… …
2263 2408
2264sub unique_maps() { 2409sub unique_maps() {
2265 [ 2410 [
2266 map { 2411 map {
2267 utf8::decode $_; 2412 utf8::decode $_;
2268 /\.map$/ 2413 s/\.map$//; # TODO future compatibility hack
2414 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2415 ? ()
2269 ? normalise $_ 2416 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2418 ]
2273} 2419}
2274 2420
2275package cf; 2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2276 2452
2277=back 2453=back
2278 2454
2279=head3 cf::object 2455=head3 cf::object
2280 2456
… …
2284 2460
2285=over 4 2461=over 4
2286 2462
2287=item $ob->inv_recursive 2463=item $ob->inv_recursive
2288 2464
2289Returns the inventory of the object _and_ their inventories, recursively. 2465Returns the inventory of the object I<and> their inventories, recursively,
2466but I<not> the object itself.
2290 2467
2291=cut 2468=cut
2292 2469
2293sub inv_recursive_; 2470sub inv_recursive_;
2294sub inv_recursive_ { 2471sub inv_recursive_ {
… …
2299 inv_recursive_ inv $_[0] 2476 inv_recursive_ inv $_[0]
2300} 2477}
2301 2478
2302=item $ref = $ob->ref 2479=item $ref = $ob->ref
2303 2480
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2481Creates and returns a persistent reference to an object that can be stored as a string.
2305 2482
2306=item $ob = cf::object::deref ($refstring) 2483=item $ob = cf::object::deref ($refstring)
2307 2484
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2485returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2486even if the object actually exists. May block.
… …
2341can be C<undef>. Does the right thing when the player is currently in a 2518can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2519dialogue with the given NPC character.
2343 2520
2344=cut 2521=cut
2345 2522
2523our $SAY_CHANNEL = {
2524 id => "say",
2525 title => "Map",
2526 reply => "say ",
2527 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2528};
2529
2530our $CHAT_CHANNEL = {
2531 id => "chat",
2532 title => "Chat",
2533 reply => "chat ",
2534 tooltip => "Player chat and shouts, global to the server.",
2535};
2536
2346# rough implementation of a future "reply" method that works 2537# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2538# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2539#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2540sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2541 my ($self, $npc, $msg, $flags) = @_;
… …
2361 my $dialog = $pl->{npc_dialog}; 2552 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2553 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2554
2364 } else { 2555 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2556 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2557 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2558 }
2368 } 2559 }
2369} 2560}
2370 2561
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2562=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2396 2587
2397=item $player_object->enter_link 2588=item $player_object->enter_link
2398 2589
2399Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2400 2591
2401The player should be reasonably safe there for short amounts of time. You 2592The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2594though, as the player cannot control the character while it is on the link
2595map.
2403 2596
2404Will never block. 2597Will never block.
2405 2598
2406=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2407 2600
… …
2427sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2428 my ($self) = @_; 2621 my ($self) = @_;
2429 2622
2430 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2431 2624
2625 ++$self->{_link_recursion};
2626
2432 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2433 2628
2434 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2435 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2436 2631
2437 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2438} 2633}
2439 2634
2440sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2441 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2442 2637
… …
2459 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2461 2656
2462 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2465 2660
2466 $map->load; 2661 $map->load;
2467 $map->load_neighbours; 2662 $map->load_neighbours;
2468 2663
2469 return unless $self->contr->active; 2664 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2665
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2474} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2475 2673
2674}
2675
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2477 2677
2478Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2682be called at the end of this process.
2483 2683
2684Note that $check will be called with a potentially non-loaded map, so if
2685it needs a loaded map it has to call C<< ->load >>.
2686
2484=cut 2687=cut
2485 2688
2486our $GOTOGEN; 2689our $GOTOGEN;
2487 2690
2488sub cf::object::player::goto { 2691sub cf::object::player::goto {
2489 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2490 2699
2491 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2493 2702
2494 $self->enter_link; 2703 $self->enter_link;
… …
2518 my $map = eval { 2727 my $map = eval {
2519 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2520 2729
2521 if ($map) { 2730 if ($map) {
2522 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2523 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2524 } else { 2733 } else {
2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2526 } 2735 }
2527 2736
2528 $map 2737 $map
… …
2536 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2537 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2538 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2539 } 2748 }
2540 2749
2541 $done->() if $done; 2750 $done->($self) if $done;
2542 })->prio (1); 2751 })->prio (1);
2543} 2752}
2544 2753
2545=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2546 2755
… …
2566} 2775}
2567 2776
2568sub prepare_random_map { 2777sub prepare_random_map {
2569 my ($exit) = @_; 2778 my ($exit) = @_;
2570 2779
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2780 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2781 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2782 # that depends on the exit object
2576 2783
2577 my $rmp = parse_random_map_params $exit->msg; 2784 my $rmp = parse_random_map_params $exit->msg;
… …
2579 if ($exit->map) { 2786 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2787 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2788 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2789 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2790 $rmp->{origin_y} = $exit->y;
2791
2792 $exit->map->touch;
2584 } 2793 }
2585 2794
2586 $rmp->{random_seed} ||= $exit->random_seed; 2795 $rmp->{random_seed} ||= $exit->random_seed;
2587 2796
2588 my $data = cf::to_json $rmp; 2797 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2798 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2799 my $meta = "$RANDOMDIR/$md5.meta";
2591 2800
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2801 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2802 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2803 undef $fh;
2595 aio_rename "$meta~", $meta; 2804 aio_rename "$meta~", $meta;
2596 2805
2806 my $slaying = "?random/$md5";
2807
2808 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2809 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2810 $exit->msg (undef);
2811 }
2599 } 2812 }
2600} 2813}
2601 2814
2602sub cf::object::player::enter_exit { 2815sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2816 my ($self, $exit) = @_;
2604 2817
2605 return unless $self->type == cf::PLAYER; 2818 return unless $self->type == cf::PLAYER;
2606 2819
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2820 $self->enter_link;
2619 2821
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2822 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2823 $Coro::current->{desc} = "enter_exit";
2626 2824
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2825 unless (eval {
2826 $self->deactivate_recursive; # just to be sure
2827
2828 # random map handling
2829 {
2830 my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832 prepare_random_map $exit
2833 if $exit->slaying eq "/!";
2834 }
2835
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2837 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp;
2839
2629 $self->goto ($slaying, $hp, $sp); 2840 $self->goto ($map, $x, $y);
2630 2841
2842 # if exit is damned, update players death & WoR home-position
2843 $self->contr->savebed ($map, $x, $y)
2844 if $exit->flag (cf::FLAG_DAMNED);
2845
2631 1; 2846 1
2632 }) { 2847 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2848 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2849 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2850 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2851 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2852
2638 warn "ERROR in enter_exit: $@"; 2853 warn "ERROR in enter_exit: $@";
… …
2655sub cf::client::send_drawinfo { 2870sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2871 my ($self, $text, $flags) = @_;
2657 2872
2658 utf8::encode $text; 2873 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2875}
2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2660} 2900}
2661 2901
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 2903
2664Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2906the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2907the message unless the client supports the msg packet.
2668 2908
2669=cut 2909=cut
2670 2910
2911# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2672 "c/identify" => { 2919 "c/identify" => {
2673 id => "infobox", 2920 id => "infobox",
2674 title => "Identify", 2921 title => "Identify",
2675 reply => undef, 2922 reply => undef,
2676 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
… …
2678 "c/examine" => { 2925 "c/examine" => {
2679 id => "infobox", 2926 id => "infobox",
2680 title => "Examine", 2927 title => "Examine",
2681 reply => undef, 2928 reply => undef,
2682 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2683 }, 2936 },
2684 "c/book" => { 2937 "c/book" => {
2685 id => "infobox", 2938 id => "infobox",
2686 title => "Book", 2939 title => "Book",
2687 reply => undef, 2940 reply => undef,
… …
2691 id => "infobox", 2944 id => "infobox",
2692 title => "Look", 2945 title => "Look",
2693 reply => undef, 2946 reply => undef,
2694 tooltip => "What you saw there", 2947 tooltip => "What you saw there",
2695 }, 2948 },
2949 "c/who" => {
2950 id => "infobox",
2951 title => "Players",
2952 reply => undef,
2953 tooltip => "Shows players who are currently online",
2954 },
2955 "c/body" => {
2956 id => "infobox",
2957 title => "Body Parts",
2958 reply => undef,
2959 tooltip => "Shows which body parts you posess and are available",
2960 },
2961 "c/statistics" => {
2962 id => "infobox",
2963 title => "Statistics",
2964 reply => undef,
2965 tooltip => "Shows your primary statistics",
2966 },
2967 "c/skills" => {
2968 id => "infobox",
2969 title => "Skills",
2970 reply => undef,
2971 tooltip => "Shows your experience per skill and item power",
2972 },
2973 "c/shopitems" => {
2974 id => "infobox",
2975 title => "Shop Items",
2976 reply => undef,
2977 tooltip => "Shows the items currently for sale in this shop",
2978 },
2979 "c/resistances" => {
2980 id => "infobox",
2981 title => "Resistances",
2982 reply => undef,
2983 tooltip => "Shows your resistances",
2984 },
2985 "c/pets" => {
2986 id => "infobox",
2987 title => "Pets",
2988 reply => undef,
2989 tooltip => "Shows information abotu your pets/a specific pet",
2990 },
2991 "c/perceiveself" => {
2992 id => "infobox",
2993 title => "Perceive Self",
2994 reply => undef,
2995 tooltip => "You gained detailed knowledge about yourself",
2996 },
2997 "c/uptime" => {
2998 id => "infobox",
2999 title => "Uptime",
3000 reply => undef,
3001 tooltip => "How long the server has been running since last restart",
3002 },
3003 "c/mapinfo" => {
3004 id => "infobox",
3005 title => "Map Info",
3006 reply => undef,
3007 tooltip => "Information related to the maps",
3008 },
3009 "c/party" => {
3010 id => "party",
3011 title => "Party",
3012 reply => "gsay ",
3013 tooltip => "Messages and chat related to your party",
3014 },
3015 "c/death" => {
3016 id => "death",
3017 title => "Death",
3018 reply => undef,
3019 tooltip => "Reason for and more info about your most recent death",
3020 },
3021 "c/say" => $SAY_CHANNEL,
3022 "c/chat" => $CHAT_CHANNEL,
2696); 3023);
2697 3024
2698sub cf::client::send_msg { 3025sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 3026 my ($self, $channel, $msg, $color, @extra) = @_;
2700 3027
2701 $msg = $self->pl->expand_cfpod ($msg); 3028 $msg = $self->pl->expand_cfpod ($msg)
3029 unless $color & cf::NDI_VERBATIM;
2702 3030
2703 $color &= cf::NDI_CLIENT_MASK; # just in case... 3031 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704 3032
2705 # check predefined channels, for the benefit of C 3033 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) { 3034 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel}; 3035 $channel = $CHANNEL{$channel};
2708 3036
2709 $self->ext_msg (channel_info => $channel) 3037 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id}; 3038 $channel = $channel->{id};
2713 3039
2714 } elsif (ref $channel) { 3040 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent 3041 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) { 3042 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel; 3043 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel) 3044 $self->ext_msg (channel_info => $channel);
2719 if $self->can_msg;
2720 } 3045 }
2721 3046
2722 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2723 } 3048 }
2724 3049
2725 return unless @extra || length $msg; 3050 return unless @extra || length $msg;
2726 3051
2727 if ($self->can_msg) {
2728 # default colour, mask it out 3052 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3053 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF; 3054 if $color & cf::NDI_DEF;
2731 3055
2732 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3056 my $pkt = "msg "
3057 . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2734 } else { 3059 );
2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745 3060
2746 $color &= cf::NDI_COLOR_MASK; 3061 $self->send_big_packet ($pkt);
2747
2748 utf8::encode $msg;
2749
2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2753 } else {
2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2755 $self->send_packet ("drawinfo $color $msg")
2756 }
2757 }
2758 }
2759} 3062}
2760 3063
2761=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2762 3065
2763Sends an ext event to the client. 3066Sends an ext event to the client.
… …
2766 3069
2767sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2768 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2769 3072
2770 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2773 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 } 3078 }
2776} 3079}
2777 3080
2778=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2779 3082
… …
2783 3086
2784sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2786 3089
2787 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove 3093 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 } 3096 }
2794} 3097}
2795 3098
2796=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2797 3100
… …
2898 3201
2899 $coro 3202 $coro
2900} 3203}
2901 3204
2902cf::client->attach ( 3205cf::client->attach (
2903 on_destroy => sub { 3206 on_client_destroy => sub {
2904 my ($ns) = @_; 3207 my ($ns) = @_;
2905 3208
2906 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2907 }, 3210 },
2908); 3211);
… …
2924our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
2925 3228
2926$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
2927 3230
2928$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
2930 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
2931 sort time 3234 sort time
2932)); 3235));
2933 3236
2934# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
… …
2937 3240
2938The following functions and methods are available within a safe environment: 3241The following functions and methods are available within a safe environment:
2939 3242
2940 cf::object 3243 cf::object
2941 contr pay_amount pay_player map x y force_find force_add destroy 3244 contr pay_amount pay_player map x y force_find force_add destroy
2942 insert remove name archname title slaying race decrease_ob_nr 3245 insert remove name archname title slaying race decrease split
3246 value
2943 3247
2944 cf::object::player 3248 cf::object::player
2945 player 3249 player
2946 3250
2947 cf::player 3251 cf::player
… …
2952 3256
2953=cut 3257=cut
2954 3258
2955for ( 3259for (
2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3260 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race 3261 insert remove inv nrof name archname title slaying race
2958 decrease_ob_nr destroy)], 3262 decrease split destroy change_exp value msg lore send_msg)],
2959 ["cf::object::player" => qw(player)], 3263 ["cf::object::player" => qw(player)],
2960 ["cf::player" => qw(peaceful)], 3264 ["cf::player" => qw(peaceful send_msg)],
2961 ["cf::map" => qw(trigger)], 3265 ["cf::map" => qw(trigger)],
2962) { 3266) {
2963 no strict 'refs'; 3267 no strict 'refs';
2964 my ($pkg, @funs) = @$_; 3268 my ($pkg, @funs) = @$_;
2965 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2983 3287
2984 my $qcode = $code; 3288 my $qcode = $code;
2985 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2986 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
2987 3291
3292 %vars = (_dummy => 0) unless %vars;
3293
3294 my @res;
2988 local $_; 3295 local $_;
2989 local @safe::cf::_safe_eval_args = values %vars;
2990 3296
2991 my $eval = 3297 my $eval =
2992 "do {\n" 3298 "do {\n"
2993 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2994 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
2995 . $code 3301 . $code
2996 . "\n}" 3302 . "\n}"
2997 ; 3303 ;
2998 3304
3305 if ($CFG{safe_eval}) {
2999 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3000 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3001 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3002 3314
3003 if ($@) { 3315 if ($@) {
3004 warn "$@"; 3316 warn "$@";
3005 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3006 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
… …
3025=cut 3337=cut
3026 3338
3027sub register_script_function { 3339sub register_script_function {
3028 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3029 3341
3030 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3031 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3032} 3344}
3033 3345
3034=back 3346=back
3035 3347
3036=cut 3348=cut
… …
3057 3369
3058 $facedata->{version} == 2 3370 $facedata->{version} == 2
3059 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060 3372
3061 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3062 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC, 3376 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3065 }; 3379 };
3066 cf::cede_to_tick; 3380 cf::cede_to_tick;
3067 3381
3068 { 3382 {
3069 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
3070 3384
3071 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3387
3073 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3077 3392
3078 cf::cede_to_tick; 3393 cf::cede_to_tick;
3079 } 3394 }
3080 3395
3081 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3397 next unless $info->{smooth};
3398
3083 my $idx = cf::face::find $face 3399 my $idx = cf::face::find $face
3084 or next; 3400 or next;
3401
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3402 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3403 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3405 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3406 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3103 3420
3104 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3105 } 3422 }
3106 3423
3107 { 3424 {
3108 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3111 3426
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3428 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
3117 3430
3118 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3119 # prepend meta info 3432 cf::face::set_type $idx, $info->{type};
3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
3127 } else { 3433 } else {
3128 $data = $info->{data}; 3434 $RESOURCE{$name} = $info;
3129 } 3435 }
3130 3436
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick; 3437 cf::cede_to_tick;
3135 } 3438 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 } 3439 }
3440
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3442
3156 1 3443 1
3157} 3444}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3158 3465
3159register_exticmd fx_want => sub { 3466register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_; 3467 my ($ns, $want) = @_;
3161 3468
3162 while (my ($k, $v) = each %$want) { 3469 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v); 3470 $ns->fx_want ($k, $v);
3164 } 3471 }
3165}; 3472};
3473
3474sub load_resource_file($) {
3475 my $guard = lock_acquire "load_resource_file";
3476
3477 my $status = load_resource_file_ $_[0];
3478 get_slot 0.1, 100;
3479 cf::arch::commit_load;
3480
3481 $status
3482}
3166 3483
3167sub reload_regions { 3484sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework 3485 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?) 3486 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = (); 3487 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3184} 3501}
3185 3502
3186sub reload_archetypes { 3503sub reload_archetypes {
3187 load_resource_file "$DATADIR/archetypes" 3504 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n"; 3505 or die "unable to load archetypes\n";
3189 #d# NEED to laod twice to resolve forward references
3190 # this really needs to be done in an extra post-pass
3191 # (which needs to be synchronous, so solve it differently)
3192 load_resource_file "$DATADIR/archetypes"
3193 or die "unable to load archetypes\n";
3194} 3506}
3195 3507
3196sub reload_treasures { 3508sub reload_treasures {
3197 load_resource_file "$DATADIR/treasures" 3509 load_resource_file "$DATADIR/treasures"
3198 or die "unable to load treasurelists\n"; 3510 or die "unable to load treasurelists\n";
3199} 3511}
3200 3512
3201sub reload_resources { 3513sub reload_resources {
3202 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3203 3515
3516 reload_facedata;
3517 reload_archetypes;
3204 reload_regions; 3518 reload_regions;
3205 reload_facedata;
3206 #reload_archetypes;#d#
3207 reload_archetypes;
3208 reload_treasures; 3519 reload_treasures;
3209 3520
3210 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3211} 3522}
3212 3523
3213sub init {
3214 reload_resources;
3215}
3216
3217sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3218 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3219 or return; 3528 or return;
3220 3529
3221 local $/; 3530 local $/;
3222 *CFG = YAML::Syck::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3223 3532
3224 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3225 3534
3226 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3227 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3228 3537
3229 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3231 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3232 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3233 }; 3542 };
3234 warn $@ if $@; 3543 warn $@ if $@;
3235 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3547}
3548
3549sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!";
3552 flock $fh, &Fcntl::LOCK_EX
3553 or die "$PIDFILE: flock: $!";
3554 $fh
3555}
3556
3557# make sure only one server instance is running at any one time
3558sub atomic {
3559 my $fh = pidfile;
3560
3561 my $pid = <$fh>;
3562 kill 9, $pid if $pid > 0;
3563
3564 seek $fh, 0, 0;
3565 print $fh $$;
3566}
3567
3568sub main_loop {
3569 warn "EV::loop starting\n";
3570 if (1) {
3571 EV::loop;
3572 }
3573 warn "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP;
3236} 3575}
3237 3576
3238sub main { 3577sub main {
3578 cf::init_globals; # initialise logging
3579
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586
3239 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242 (async { 3590 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3591 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3592 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3593 })->prio (Coro::PRIO_MAX);
3246 }; 3594 };
3247 3595
3596 evthread_start IO::AIO::poll_fileno;
3597
3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3607 reload_resources;
3248 reload_config; 3608 reload_config;
3249 db_init; 3609 db_init;
3610
3611 cf::init_uuid;
3612 cf::init_signals;
3613 cf::init_skills;
3614
3615 cf::init_beforeplay;
3616
3617 atomic;
3618
3250 load_extensions; 3619 load_extensions;
3251 3620
3252 $TICK_WATCHER->start; 3621 utime time, time, $RUNTIMEFILE;
3253 Event::loop; 3622
3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626
3627 (pop @POST_INIT)->(0) while @POST_INIT;
3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3632
3633 main_loop;
3254} 3634}
3255 3635
3256############################################################################# 3636#############################################################################
3257# initialisation and cleanup 3637# initialisation and cleanup
3258 3638
3259# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3260BEGIN { 3640BEGIN {
3641 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3263 reentrant => 0,
3264 data => WF_AUTOCANCEL,
3265 signal => $signal,
3266 prio => 0,
3267 cb => sub {
3268 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3269 },
3270 ); 3645 };
3271 } 3646 }
3272} 3647}
3273 3648
3274sub write_runtime { 3649sub write_runtime_sync {
3275 my $runtime = "$LOCALDIR/runtime"; 3650 my $t0 = AE::time;
3276 3651
3277 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3279 3654
3280 IO::AIO::aio_utime $runtime, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3281 3656
3282 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3283 3658
3284 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3285 or return; 3660 or return;
3286 3661
3287 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3288 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3289 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
… …
3299 aio_utime $fh, undef, undef; 3674 aio_utime $fh, undef, undef;
3300 3675
3301 close $fh 3676 close $fh
3302 or return; 3677 or return;
3303 3678
3304 aio_rename "$runtime~", $runtime 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3305 and return; 3680 and return;
3306 3681
3307 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3308 3683
3309 1 3684 1
3685}
3686
3687our $uuid_lock;
3688our $uuid_skip;
3689
3690sub write_uuid_sync($) {
3691 $uuid_skip ||= $_[0];
3692
3693 return if $uuid_lock;
3694 local $uuid_lock = 1;
3695
3696 my $uuid = "$LOCALDIR/uuid";
3697
3698 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3699 or return;
3700
3701 my $value = uuid_seq uuid_cur;
3702
3703 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n";
3705 return;
3706 }
3707
3708 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0;
3710
3711 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3712 and return;
3713
3714 # always fsync - this file is important
3715 aio_fsync $fh
3716 and return;
3717
3718 close $fh
3719 or return;
3720
3721 aio_rename "$uuid~", $uuid
3722 and return;
3723
3724 warn "uuid file written ($value).\n";
3725
3726 1
3727
3728}
3729
3730sub write_uuid($$) {
3731 my ($skip, $sync) = @_;
3732
3733 $sync ? write_uuid_sync $skip
3734 : async { write_uuid_sync $skip };
3310} 3735}
3311 3736
3312sub emergency_save() { 3737sub emergency_save() {
3313 my $freeze_guard = cf::freeze_mainloop; 3738 my $freeze_guard = cf::freeze_mainloop;
3314 3739
3315 warn "enter emergency perl save\n"; 3740 warn "emergency_perl_save: enter\n";
3316 3741
3317 cf::sync_job { 3742 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747
3318 # use a peculiar iteration method to avoid tripping on perl 3748 # use a peculiar iteration method to avoid tripping on perl
3319 # refcount bugs in for. also avoids problems with players 3749 # refcount bugs in for. also avoids problems with players
3320 # and maps saved/destroyed asynchronously. 3750 # and maps saved/destroyed asynchronously.
3321 warn "begin emergency player save\n"; 3751 warn "emergency_perl_save: begin player save\n";
3322 for my $login (keys %cf::PLAYER) { 3752 for my $login (keys %cf::PLAYER) {
3323 my $pl = $cf::PLAYER{$login} or next; 3753 my $pl = $cf::PLAYER{$login} or next;
3324 $pl->valid or next; 3754 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3326 $pl->save; 3756 $pl->save;
3327 } 3757 }
3328 warn "end emergency player save\n"; 3758 warn "emergency_perl_save: end player save\n";
3329 3759
3330 warn "begin emergency map save\n"; 3760 warn "emergency_perl_save: begin map save\n";
3331 for my $path (keys %cf::MAP) { 3761 for my $path (keys %cf::MAP) {
3332 my $map = $cf::MAP{$path} or next; 3762 my $map = $cf::MAP{$path} or next;
3333 $map->valid or next; 3763 $map->valid or next;
3334 $map->save; 3764 $map->save;
3335 } 3765 }
3336 warn "end emergency map save\n"; 3766 warn "emergency_perl_save: end map save\n";
3337 3767
3338 warn "begin emergency database checkpoint\n"; 3768 warn "emergency_perl_save: begin database checkpoint\n";
3339 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3340 warn "end emergency database checkpoint\n"; 3770 warn "emergency_perl_save: end database checkpoint\n";
3771
3772 warn "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1;
3774 warn "emergency_perl_save: end write uuid\n";
3341 }; 3775 };
3342 3776
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3343 warn "leave emergency perl save\n"; 3782 warn "emergency_perl_save: leave\n";
3344} 3783}
3345 3784
3346sub post_cleanup { 3785sub post_cleanup {
3347 my ($make_core) = @_; 3786 my ($make_core) = @_;
3348 3787
3349 warn Carp::longmess "post_cleanup backtrace" 3788 warn Carp::longmess "post_cleanup backtrace"
3350 if $make_core; 3789 if $make_core;
3790
3791 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$;
3793}
3794
3795# a safer delete_package, copied from Symbol
3796sub clear_package($) {
3797 my $pkg = shift;
3798
3799 # expand to full symbol table name if needed
3800 unless ($pkg =~ /^main::.*::$/) {
3801 $pkg = "main$pkg" if $pkg =~ /^::/;
3802 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3803 $pkg .= '::' unless $pkg =~ /::$/;
3804 }
3805
3806 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3807 my $stem_symtab = *{$stem}{HASH};
3808
3809 defined $stem_symtab and exists $stem_symtab->{$leaf}
3810 or return;
3811
3812 # clear all symbols
3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3814 for my $name (keys %$leaf_symtab) {
3815 _gv_clear *{"$pkg$name"};
3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3817 }
3351} 3818}
3352 3819
3353sub do_reload_perl() { 3820sub do_reload_perl() {
3354 # can/must only be called in main 3821 # can/must only be called in main
3355 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3356 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3357 return; 3824 return;
3358 } 3825 }
3359 3826
3827 return if $RELOAD++;
3828
3829 my $t1 = AE::time;
3830
3831 while ($RELOAD) {
3360 warn "reloading..."; 3832 warn "reloading...";
3361 3833
3362 warn "entering sync_job"; 3834 warn "entering sync_job";
3363 3835
3364 cf::sync_job { 3836 cf::sync_job {
3365 cf::write_runtime; # external watchdog should not bark 3837 cf::write_runtime_sync; # external watchdog should not bark
3366 cf::emergency_save; 3838 cf::emergency_save;
3367 cf::write_runtime; # external watchdog should not bark 3839 cf::write_runtime_sync; # external watchdog should not bark
3368 3840
3369 warn "syncing database to disk"; 3841 warn "syncing database to disk";
3370 BDB::db_env_txn_checkpoint $DB_ENV; 3842 BDB::db_env_txn_checkpoint $DB_ENV;
3371 3843
3372 # if anything goes wrong in here, we should simply crash as we already saved 3844 # if anything goes wrong in here, we should simply crash as we already saved
3373 3845
3374 warn "cancelling all WF_AUTOCANCEL watchers";
3375 for (Event::all_watchers) {
3376 $_->cancel if $_->data & WF_AUTOCANCEL;
3377 }
3378
3379 warn "flushing outstanding aio requests"; 3846 warn "flushing outstanding aio requests";
3380 for (;;) {
3381 BDB::flush;
3382 IO::AIO::flush;
3383 Coro::cede_notself;
3384 last unless IO::AIO::nreqs || BDB::nreqs; 3847 while (IO::AIO::nreqs || BDB::nreqs) {
3385 warn "iterate..."; 3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3386 }
3387
3388 ++$RELOAD;
3389
3390 warn "cancelling all extension coros";
3391 $_->cancel for values %EXT_CORO;
3392 %EXT_CORO = ();
3393
3394 warn "removing commands";
3395 %COMMAND = ();
3396
3397 warn "removing ext/exti commands";
3398 %EXTCMD = ();
3399 %EXTICMD = ();
3400
3401 warn "unloading/nuking all extensions";
3402 for my $pkg (@EXTS) {
3403 warn "... unloading $pkg";
3404
3405 if (my $cb = $pkg->can ("unload")) {
3406 eval {
3407 $cb->($pkg);
3408 1
3409 } or warn "$pkg unloaded, but with errors: $@";
3410 } 3849 }
3411 3850
3412 warn "... nuking $pkg"; 3851 warn "cancelling all extension coros";
3413 Symbol::delete_package $pkg; 3852 $_->cancel for values %EXT_CORO;
3414 } 3853 %EXT_CORO = ();
3415 3854
3416 warn "unloading all perl modules loaded from $LIBDIR"; 3855 warn "removing commands";
3417 while (my ($k, $v) = each %INC) { 3856 %COMMAND = ();
3418 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3419 3857
3858 warn "removing ext/exti commands";
3859 %EXTCMD = ();
3860 %EXTICMD = ();
3861
3862 warn "unloading/nuking all extensions";
3863 for my $pkg (@EXTS) {
3420 warn "... unloading $k"; 3864 warn "... unloading $pkg";
3421 delete $INC{$k};
3422 3865
3423 $k =~ s/\.pm$//;
3424 $k =~ s/\//::/g;
3425
3426 if (my $cb = $k->can ("unload_module")) { 3866 if (my $cb = $pkg->can ("unload")) {
3867 eval {
3427 $cb->(); 3868 $cb->($pkg);
3869 1
3870 } or warn "$pkg unloaded, but with errors: $@";
3871 }
3872
3873 warn "... clearing $pkg";
3874 clear_package $pkg;
3428 } 3875 }
3429 3876
3430 Symbol::delete_package $k; 3877 warn "unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880
3881 warn "... unloading $k";
3882 delete $INC{$k};
3883
3884 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g;
3886
3887 if (my $cb = $k->can ("unload_module")) {
3888 $cb->();
3889 }
3890
3891 clear_package $k;
3431 } 3892 }
3432 3893
3433 warn "getting rid of safe::, as good as possible"; 3894 warn "getting rid of safe::, as good as possible";
3434 Symbol::delete_package "safe::$_" 3895 clear_package "safe::$_"
3435 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3436 3897
3437 warn "unloading cf.pm \"a bit\""; 3898 warn "unloading cf.pm \"a bit\"";
3438 delete $INC{"cf.pm"}; 3899 delete $INC{"cf.pm"};
3439 delete $INC{"cf/pod.pm"}; 3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3440 3901
3441 # don't, removes xs symbols, too, 3902 # don't, removes xs symbols, too,
3442 # and global variables created in xs 3903 # and global variables created in xs
3443 #Symbol::delete_package __PACKAGE__; 3904 #clear_package __PACKAGE__;
3444 3905
3445 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3446 3907
3447 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3448 require cf; 3909 require cf;
3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3450 3911
3451 warn "loading config and database again"; 3912 warn "loading config and database again";
3452 cf::reload_config; 3913 cf::reload_config;
3453 3914
3454 warn "loading extensions"; 3915 warn "loading extensions";
3455 cf::load_extensions; 3916 cf::load_extensions;
3456 3917
3918 if ($REATTACH_ON_RELOAD) {
3457 warn "reattaching attachments to objects/players"; 3919 warn "reattaching attachments to objects/players";
3458 _global_reattach; # objects, sockets 3920 _global_reattach; # objects, sockets
3459 warn "reattaching attachments to maps"; 3921 warn "reattaching attachments to maps";
3460 reattach $_ for values %MAP; 3922 reattach $_ for values %MAP;
3461 warn "reattaching attachments to players"; 3923 warn "reattaching attachments to players";
3462 reattach $_ for values %PLAYER; 3924 reattach $_ for values %PLAYER;
3925 }
3463 3926
3927 warn "running post_init jobs";
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929
3464 warn "leaving sync_job"; 3930 warn "leaving sync_job";
3465 3931
3466 1 3932 1
3467 } or do { 3933 } or do {
3468 warn $@; 3934 warn $@;
3469 warn "error while reloading, exiting."; 3935 cf::cleanup "error while reloading, exiting.";
3470 exit 1;
3471 }; 3936 };
3472 3937
3473 warn "reloaded"; 3938 warn "reloaded";
3939 --$RELOAD;
3940 }
3941
3942 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n";
3474}; 3944};
3475 3945
3476our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3477 3947
3478sub reload_perl() { 3948sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 3949 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3481 3951
3482 $RELOAD_WATCHER ||= Event->timer ( 3952 $RELOAD_WATCHER ||= cf::async {
3483 reentrant => 0, 3953 Coro::AIO::aio_wait cache_extensions;
3484 after => 0, 3954
3485 data => WF_AUTOCANCEL, 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3486 cb => sub {
3487 do_reload_perl; 3956 do_reload_perl;
3488 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3489 }, 3958 };
3490 ); 3959 };
3491} 3960}
3492 3961
3493register_command "reload" => sub { 3962register_command "reload" => sub {
3494 my ($who, $arg) = @_; 3963 my ($who, $arg) = @_;
3495 3964
… …
3508 3977
3509our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3510our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3511 3980
3512sub wait_for_tick { 3981sub wait_for_tick {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3515 3983
3516 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3518 $signal->wait; 3986 $signal->wait;
3519} 3987}
3520 3988
3521sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3522 return unless $TICK_WATCHER->is_active;
3523 return if $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3524 3991
3525 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 3994 $signal->wait;
3528} 3995}
3529 3996
3530$TICK_WATCHER = Event->timer ( 3997sub tick {
3531 reentrant => 0,
3532 parked => 1,
3533 prio => 0,
3534 at => $NEXT_TICK || $TICK,
3535 data => WF_AUTOCANCEL,
3536 cb => sub {
3537 if ($Coro::current != $Coro::main) { 3998 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3999 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3540 return; 4001 return;
3541 } 4002 }
3542 4003
3543 $NOW = $tick_start = Event::time;
3544
3545 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
3546 4005
3547 $RUNTIME += $TICK; 4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3548 $NEXT_TICK += $TICK;
3549 4007
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 4010 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 4012 write_runtime_sync
3555 or warn "ERROR: unable to write runtime file: $!"; 4013 or warn "ERROR: unable to write runtime file: $!";
3556 };
3557 } 4014 };
4015 }
3558 4016
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 4018 $sig->send;
3561 } 4019 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 4020 while (my $sig = shift @WAIT_FOR_TICK) {
3563 $sig->send; 4021 $sig->send;
3564 } 4022 }
3565 4023
3566 $NOW = Event::time; 4024 $LOAD = ($NOW - $TICK_START) / $TICK;
3567
3568 # if we are delayed by four ticks or more, skip them all
3569 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571 $TICK_WATCHER->at ($NEXT_TICK);
3572 $TICK_WATCHER->start;
3573
3574 $LOAD = ($NOW - $tick_start) / $TICK;
3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4025 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 4026
3577 _post_tick; 4027 if (0) {
4028 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d#
4032 }
3578 }, 4033 }
3579); 4034}
3580 4035
3581{ 4036{
4037 # configure BDB
4038
3582 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3583 BDB::max_poll_time $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 4041 $AnyEvent::BDB::WATCHER->priority (1);
3585 reentrant => 0,
3586 fd => BDB::poll_fileno,
3587 poll => 'r',
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => \&BDB::poll_cb,
3591 );
3592
3593 BDB::set_sync_prepare {
3594 my $status;
3595 my $current = $Coro::current;
3596 (
3597 sub {
3598 $status = $!;
3599 $current->ready; undef $current;
3600 },
3601 sub {
3602 Coro::schedule while defined $current;
3603 $! = $status;
3604 },
3605 )
3606 };
3607 4042
3608 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3611 | BDB::LOG_AUTOREMOVE, 1); 4046 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4047 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4048 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4049 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3614 4050
3615 cf::sync_job { 4051 cf::sync_job {
3616 eval { 4052 eval {
… …
3626 4062
3627 cf::cleanup "db_env_open(db): $@" if $@; 4063 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 4064 };
3629 } 4065 }
3630 4066
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 4067 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4068 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 4069 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4070 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4071 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 4072 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 4073 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4074 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 4075 };
3661} 4076}
3662 4077
3663{ 4078{
4079 # configure IO::AIO
4080
3664 IO::AIO::min_parallel 8; 4081 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 4082 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 4083 undef $AnyEvent::AIO::WATCHER;
3669 reentrant => 0,
3670 data => WF_AUTOCANCEL,
3671 fd => IO::AIO::poll_fileno,
3672 poll => 'r',
3673 prio => 0,
3674 cb => \&IO::AIO::poll_cb,
3675 );
3676} 4084}
3677 4085
3678my $_log_backtrace; 4086my $_log_backtrace;
3679 4087
3680sub _log_backtrace { 4088sub _log_backtrace {
… …
3683 $msg =~ s/\n//; 4091 $msg =~ s/\n//;
3684 4092
3685 # limit the # of concurrent backtraces 4093 # limit the # of concurrent backtraces
3686 if ($_log_backtrace < 2) { 4094 if ($_log_backtrace < 2) {
3687 ++$_log_backtrace; 4095 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg;
3688 async { 4097 async {
3689 $Coro::current->{desc} = "abt $msg"; 4098 $Coro::current->{desc} = "abt $msg";
3690 4099
3691 my @bt = fork_call { 4100 my @bt = fork_call {
3692 @addr = map { sprintf "%x", $_ } @addr; 4101 @addr = map { sprintf "%x", $_ } @addr;
… …
3703 } 4112 }
3704 4113
3705 @funcs 4114 @funcs
3706 }; 4115 };
3707 4116
3708 LOG llevInfo, "[ABT] $msg\n"; 4117 LOG llevInfo, "[ABT] $perl_bt\n";
4118 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3709 LOG llevInfo, "[ABT] $_\n" for @bt; 4119 LOG llevInfo, "[ABT] $_\n" for @bt;
3710 --$_log_backtrace; 4120 --$_log_backtrace;
3711 }; 4121 };
3712 } else { 4122 } else {
3713 LOG llevInfo, "[ABT] $msg\n"; 4123 LOG llevInfo, "[ABT] $msg\n";
3714 LOG llevInfo, "[ABT] [suppressed]\n"; 4124 LOG llevInfo, "[ABT] [suppressed]\n";
3715 } 4125 }
3716} 4126}
3717 4127
3718# load additional modules 4128# load additional modules
3719use cf::pod; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3720 4131
3721END { cf::emergency_save } 4132END { cf::emergency_save }
3722 4133
37231 41341
3724 4135

Diff Legend

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