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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.520 by root, Fri Apr 16 02:37:50 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines