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.378 by root, Thu Oct 4 11:36:54 2007 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

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

Diff Legend

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