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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.519 by root, Fri Apr 16 02:32:25 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
121our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 123our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 124our $DB_ENV;
125
126our @EXTRA_MODULES = qw(pod match mapscript);
86 127
87our %CFG; 128our %CFG;
88 129
89our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 131our $RUNTIME;
132our $NOW;
91 133
92our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
95 137
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 140
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
101our $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 :)
102 150
103binmode STDOUT; 151binmode STDOUT;
104binmode STDERR; 152binmode STDERR;
105 153
106# read virtual server time, if available 154# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
111} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
112 162
113mkdir $_ 163mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 165
116our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
117 167
118sub 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::"} };
119 180
120############################################################################# 181#############################################################################
121 182
122=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
123 184
… …
159 220
160The raw value load value from the last tick. 221The raw value load value from the last tick.
161 222
162=item %cf::CFG 223=item %cf::CFG
163 224
164Configuration for the server, loaded from C</etc/crossfire/config>, or 225Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 226from wherever your confdir points to.
166 227
167=item cf::wait_for_tick, cf::wait_for_tick_begin 228=item cf::wait_for_tick, cf::wait_for_tick_begin
168 229
169These 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
170returns 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
171per 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.
172 233
173=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
174 235
175This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 238that call.
178 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
179=back 246=back
180 247
181=cut 248=cut
182 249
183BEGIN { 250$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 251 my $msg = join "", @_;
186 252
187 $msg .= "\n" 253 $msg .= "\n"
188 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
189 255
190 $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;
191 257
192 utf8::encode $msg;
193 LOG llevError, $msg; 258 LOG llevError, $msg;
194 }; 259};
195} 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};
196 274
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
207for my $pkg (qw( 285for my $pkg (qw(
208 cf::global cf::attachable 286 cf::global cf::attachable
209 cf::object cf::object::player 287 cf::object cf::object::player
210 cf::client cf::player 288 cf::client cf::player
211 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
212 cf::map cf::party cf::region 291 cf::party cf::region
213)) { 292)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 294}
217 295
218$Event::DIED = sub { 296$EV::DIED = sub {
219 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
220}; 298};
221 299
222############################################################################# 300#############################################################################
223 301
224=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
246 $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;
247 $d 325 $d
248 } || "[unable to dump $_[0]: '$@']"; 326 } || "[unable to dump $_[0]: '$@']";
249} 327}
250 328
251=item $ref = cf::from_json $json 329=item $ref = cf::decode_json $json
252 330
253Converts a JSON string into the corresponding perl data structure. 331Converts a JSON string into the corresponding perl data structure.
254 332
255=item $json = cf::to_json $ref 333=item $json = cf::encode_json $ref
256 334
257Converts a perl data structure into its JSON representation. 335Converts a perl data structure into its JSON representation.
258 336
259=cut 337=cut
260 338
261our $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
262 340
263sub to_json ($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
264sub 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}
265 357
266=item cf::lock_wait $string 358=item cf::lock_wait $string
267 359
268Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
269 361
270=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
271 363
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
275returned. 367returned.
276 368
277Locks 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
278deadlocked coro. 370deadlocked coro.
… …
284 376
285Return 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.
286 378
287=cut 379=cut
288 380
289our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 382
292sub lock_wait($) { 383sub lock_wait($) {
293 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 385}
306 386
307sub lock_acquire($) { 387sub lock_acquire($) {
308 my ($key) = @_; 388 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 389}
322 390
323sub lock_active($) { 391sub lock_active($) {
324 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 393}
328 394
329sub freeze_mainloop { 395sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
331 397
332 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 399}
334 }; 400
335 $TICK_WATCHER->stop; 401=item cf::periodic $interval, $cb
336 $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
337} 414}
338 415
339=item cf::get_slot $time[, $priority[, $name]] 416=item cf::get_slot $time[, $priority[, $name]]
340 417
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 418Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
349 426
350=cut 427=cut
351 428
352our @SLOT_QUEUE; 429our @SLOT_QUEUE;
353our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
354 432
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
435 $Coro::current->desc ("timeslot manager");
436
357 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
358 439
359 while () { 440 while () {
360 next_job: 441 next_job:
442
361 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
362 if ($avail > 0.01) { 444
363 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
365 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send; 449 $job->[2]->send;
367 Coro::cede; 450 Coro::cede;
368 goto next_job; 451 goto next_job;
369 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
370 } 454 }
371 } 455 }
372 456
373 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
374 # 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
375 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 460 $signal->wait;
377 } else { 461 } else {
462 $busy = 0;
378 Coro::schedule; 463 Coro::schedule;
379 } 464 }
380 } 465 }
381}; 466};
382 467
383sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
384 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
385 472
386 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
387 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
388 476
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
402 490
403BEGIN { *async = \&Coro::async_pool } 491BEGIN { *async = \&Coro::async_pool }
404 492
405=item cf::sync_job { BLOCK } 493=item cf::sync_job { BLOCK }
406 494
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 495The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 496is always able to handle events or runnable, as Deliantra is only
409partly 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
410acceptable. 498acceptable.
411 499
412If 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
413the given BLOCK in another coroutine while waiting for the result. The 501the given BLOCK in another coroutine while waiting for the result. The
… …
418 506
419sub sync_job(&) { 507sub sync_job(&) {
420 my ($job) = @_; 508 my ($job) = @_;
421 509
422 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 511 my $time = AE::time;
424 512
425 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
427 515
428 # TODO: use suspend/resume instead 516 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 517
430 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
431 519
432 my $busy = 1; 520 my $busy = 1;
433 my @res; 521 my @res;
434 522
435 (async { 523 (async {
524 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 525 @res = eval { $job->() };
437 warn $@ if $@; 526 warn $@ if $@;
438 undef $busy; 527 undef $busy;
439 })->prio (Coro::PRIO_MAX); 528 })->prio (Coro::PRIO_MAX);
440 529
441 while ($busy) { 530 while ($busy) {
442 Coro::cede or Event::one_event; 531 if (Coro::nready) {
532 Coro::cede_notself;
533 } else {
534 EV::loop EV::LOOP_ONESHOT;
443 } 535 }
536 }
444 537
445 $time = Event::time - $time; 538 my $time = AE::time - $time;
446 539
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
451 541
452 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
453 } else { 543 } else {
454 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
455 545
… …
480=item fork_call { }, $args 570=item fork_call { }, $args
481 571
482Executes the given code block with the given arguments in a seperate 572Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 573process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 574Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 575never block itself or use any form of event handling.
486 576
487=cut 577=cut
488 578
489sub fork_call(&@) { 579sub fork_call(&@) {
490 my ($cb, @args) = @_; 580 my ($cb, @args) = @_;
… …
499 }, @args; 589 }, @args;
500 590
501 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
502} 592}
503 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
630}
631
504=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
505 633
506Returns a single value from the environment database. 634Returns a single value from the environment database.
507 635
508=item cf::db_put $family => $key => $value 636=item cf::db_put $family => $key => $value
509 637
510Stores the given C<$value> in the family. It can currently store binary 638Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 639data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 640
641=item $db = cf::db_table "name"
642
643Create and/or open a new database table. The string must not be "db" and must be unique
644within each server.
645
513=cut 646=cut
647
648sub db_table($) {
649 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV;
651
652 eval {
653 $db->set_flags (BDB::CHKSUM);
654
655 utf8::encode $name;
656 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
657 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
658 cf::cleanup "db_open(db): $!" if $!;
659 };
660 cf::cleanup "db_open(db): $@" if $@;
661
662 $db
663}
514 664
515our $DB; 665our $DB;
516 666
517sub db_init { 667sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 668 cf::sync_job {
522 eval { 669 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 670 };
532} 671}
533 672
534sub db_get($$) { 673sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 674 my $key = "$_[0]/$_[1]";
536 675
… …
634 773
635############################################################################# 774#############################################################################
636 775
637=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
638 777
639Many 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
640attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
642 781
643In 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>
644C<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
645Crossfire TRT). 784Deliantra).
646 785
647=over 4 786=over 4
648 787
649=item $attachable->attach ($attachment, key => $value...) 788=item $attachable->attach ($attachment, key => $value...)
650 789
… …
694=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
695 834
696Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
698 837
699Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
700that 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.
701 840
702These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
703 842
704=over 4 843=over 4
… …
932 } 1071 }
933 1072
934 0 1073 0
935} 1074}
936 1075
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1077
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1079
941Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
942 1081
… …
948 1087
949=cut 1088=cut
950 1089
951############################################################################# 1090#############################################################################
952# object support 1091# object support
953#
954 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#
955sub _can_merge { 1126sub _can_merge {
956 my ($ob1, $ob2) = @_; 1127 my ($ob1, $ob2) = @_;
957 1128
958 local $Storable::canonical = 1; 1129 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1130
962 $fob1 eq $fob2 1131 # we do the slow way here
1132 return _object_equal $ob1, $ob2
963} 1133}
964 1134
965sub reattach { 1135sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1137 my ($obj) = @_;
968 1138
1139 # no longer needed after getting rid of delete_package?
969 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
970 1141
971 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
972 1143
973 @$registry = (); 1144 @$registry = ();
974 1145
… …
989cf::attachable->attach ( 1160cf::attachable->attach (
990 prio => -1000000, 1161 prio => -1000000,
991 on_instantiate => sub { 1162 on_instantiate => sub {
992 my ($obj, $data) = @_; 1163 my ($obj, $data) = @_;
993 1164
994 $data = from_json $data; 1165 $data = decode_json $data;
995 1166
996 for (@$data) { 1167 for (@$data) {
997 my ($name, $args) = @$_; 1168 my ($name, $args) = @$_;
998 1169
999 $obj->attach ($name, %{$args || {} }); 1170 $obj->attach ($name, %{$args || {} });
… …
1013); 1184);
1014 1185
1015sub object_freezer_save { 1186sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1187 my ($filename, $rdata, $objs) = @_;
1017 1188
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1189 sync_job {
1021 if (length $$rdata) { 1190 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1024 1194
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 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 }
1029 close $fh; 1202 aio_close $fh;
1030 1203
1031 if (@$objs) { 1204 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1036 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 }
1037 close $fh; 1213 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1215 }
1040 } else { 1216 } else {
1041 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1042 } 1218 }
1043 1219
1044 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1224 } else {
1046 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1047 } 1226 }
1048 } else { 1227 } else {
1049 aio_unlink $filename; 1228 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1051 } 1230 }
1052 }; 1231 };
1053
1054 undef $guard;
1055} 1232}
1056 1233
1057sub object_freezer_as_string { 1234sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1235 my ($rdata, $objs) = @_;
1059 1236
… …
1064 1241
1065sub object_thawer_load { 1242sub object_thawer_load {
1066 my ($filename) = @_; 1243 my ($filename) = @_;
1067 1244
1068 my ($data, $av); 1245 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1246
1072 (aio_load $filename, $data) >= 0 1247 (aio_load $filename, $data) >= 0
1073 or return; 1248 or return;
1074 1249
1075 unless (aio_stat "$filename.pst") { 1250 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1251 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1252 or return;
1078 1253
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1254 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs};
1081 } 1256 }
1082 1257
1258 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1259 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1260 $decname, length $data, scalar @{$av || []};
1085 1261
1086 ($data, $av) 1262 ($data, $av)
1087} 1263}
1088 1264
1089=head2 COMMAND CALLBACKS 1265=head2 COMMAND CALLBACKS
… …
1145 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1146 1322
1147 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1148} 1324}
1149 1325
1326use File::Glob ();
1327
1150cf::player->attach ( 1328cf::player->attach (
1151 on_command => sub { 1329 on_unknown_command => sub {
1152 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1153 1331
1154 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1155 or return; 1333 or return;
1156 1334
… …
1186 1364
1187 cf::override; 1365 cf::override;
1188 }, 1366 },
1189); 1367);
1190 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
1191sub load_extensions { 1382sub load_extensions {
1192 cf::sync_job { 1383 cf::sync_job {
1193 my %todo; 1384 my %todo;
1194 1385
1195 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
… …
1214 1405
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1408
1218 $ext{source} = 1409 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1221 . $source 1412 . $source
1222 . "\n};\n1"; 1413 . "\n};\n1";
1223 1414
1224 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1225 } 1416 }
1226 1417
1418 my $pass = 0;
1227 my %done; 1419 my %done;
1228 while (%todo) { 1420 while (%todo) {
1229 my $progress; 1421 my $progress;
1230 1422
1423 ++$pass;
1424
1425 ext:
1231 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip 1428 next ext
1234 unless exists $done{$_}; 1429 unless exists $done{$_};
1235 } 1430 }
1236 1431
1237 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1238 1433
1239 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1240 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1241 : "$v->{base}: extension inactive.\n";
1242 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1243 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1244 warn $msg; 1441 } else {
1245 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1246 exit 1; 1443 push @EXTS, $v->{pkg};
1247 } 1444 $progress = 1;
1248 1445
1249 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1250 } 1448 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1255 } 1449 }
1256 1450
1257 skip: 1451 unless ($progress) {
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1259 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 }
1260 } 1459 }
1261 }; 1460 };
1262} 1461}
1263 1462
1264############################################################################# 1463#############################################################################
1265 1464
1266=back 1465=back
1267 1466
1268=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1269 1468
1270Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1271 1470
1272=cut 1471=cut
1273 1472
1274package cf::player; 1473package cf::player;
1275 1474
… …
1318 1517
1319sub exists($) { 1518sub exists($) {
1320 my ($login) = @_; 1519 my ($login) = @_;
1321 1520
1322 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1324} 1523}
1325 1524
1326sub find($) { 1525sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1527 my $login = $_[0];
… …
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1537 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1538
1340 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1540 or return;
1342 1541
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1345 or return; 1543 or return;
1544
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1349 } 1548 }
1350 } 1549 }
1351} 1550}
1352 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
1353sub save($) { 1565sub save($) {
1354 my ($pl) = @_; 1566 my ($pl) = @_;
1355 1567
1356 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1357 1569
… …
1360 1572
1361 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1362 1574
1363 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1364 $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];
1365 1582
1366 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1367 cf::cede_to_tick; 1584 cf::cede_to_tick;
1368} 1585}
1369 1586
… …
1401 my ($pl) = @_; 1618 my ($pl) = @_;
1402 1619
1403 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1404 1621
1405 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1406 $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
1407 1624
1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1409 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1410 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1411 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1412 1631
1413 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1414 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1453 1672
1454 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1455 my $path = path $login; 1674 my $path = path $login;
1456 1675
1457 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1460 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1461 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 } 1682 }
1463 1683
… …
1494 } 1714 }
1495 1715
1496 \@paths 1716 \@paths
1497} 1717}
1498 1718
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1500 1720
1501Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549 1722
1550=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1551 1724
1552Sends an ext reply to the player. 1725Sends an ext reply to the player.
1553 1726
… …
1620our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1622 1795
1623sub generate_random_map { 1796sub generate_random_map {
1624 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
1625 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1626 $self->_create_random_map ( 1802 $self->_create_random_map (
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1630 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1631 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1632 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1633 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1751 1927
1752# the temporary/swap location 1928# the temporary/swap location
1753sub save_path { 1929sub save_path {
1754 my ($self) = @_; 1930 my ($self) = @_;
1755 1931
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1757 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1758} 1934}
1759 1935
1760# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1761sub uniq_path { 1937sub uniq_path {
1762 my ($self) = @_; 1938 my ($self) = @_;
1763 1939
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1765 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1766}
1767
1768# and all this just because we cannot iterate over
1769# all maps in C++...
1770sub change_all_map_light {
1771 my ($change) = @_;
1772
1773 $_->change_map_light ($change)
1774 for grep $_->outdoor, values %cf::MAP;
1775} 1942}
1776 1943
1777sub decay_objects { 1944sub decay_objects {
1778 my ($self) = @_; 1945 my ($self) = @_;
1779 1946
… …
1863sub find { 2030sub find {
1864 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1865 2032
1866 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1867 2034
1868 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1869 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1870 2037
1871 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1875 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1876 or return; 2040 or return;
1877 2041
1878 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1879 2043
… …
1881 or return; 2045 or return;
1882 2046
1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1886 undef $guard1; 2051 undef $guard1;
1887 undef $guard2;
1888 $map->reset; 2052 $map->reset;
1889 return find $path; 2053 return find $path;
1890 } 2054 }
1891 2055
1892 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1893 } 2057 }
1894} 2058}
1895 2059
1896sub pre_load { } 2060sub pre_load { }
1897sub post_load { } 2061#sub post_load { } # XS
1898 2062
1899sub load { 2063sub load {
1900 my ($self) = @_; 2064 my ($self) = @_;
1901 2065
1902 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
1919 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block; 2084 $f->skip_block;
1921 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
1922 or return; 2086 or return;
1923 2087
1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
1925 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1926 2090
1927 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1928 utf8::encode $uniq; 2092 utf8::encode $uniq;
1929 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
… …
1947 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1948 $self->decay_objects; 2112 $self->decay_objects;
1949 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1950 $self->update_buttons; 2114 $self->update_buttons;
1951 cf::cede_to_tick; 2115 cf::cede_to_tick;
1952 $self->set_darkness_map;
1953 cf::cede_to_tick;
1954 $self->activate; 2116 $self->activate;
1955 } 2117 }
1956 2118
1957 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1959 2121
1960 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1961 } 2123 }
1962 2124
1963 $self->post_load; 2125 $self->post_load;
1964} 2126}
1965 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
1966sub customise_for { 2131sub customise_for {
1967 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
1968 2133
1969 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
1970 if $self->per_player; 2135 if $self->per_player;
… …
2023 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2024 2189
2025 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2026 2191
2027 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2029 } 2194 }
2030 2195
2031 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2032 2197
2033 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2199 $Coro::current->{desc} = "map prefetcher";
2200
2034 while (%MAP_PREFETCH) { 2201 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2202 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2203 if (my $map = find $k) {
2037 $map->load if $v; 2204 $map->load if $v;
2038 } 2205 }
… …
2045 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2046 2213
2047 () 2214 ()
2048} 2215}
2049 2216
2217# common code, used by both ->save and ->swapout
2050sub save { 2218sub _save {
2051 my ($self) = @_; 2219 my ($self) = @_;
2052
2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
2054 2220
2055 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2056 2222
2057 return unless $self->dirty; 2223 return unless $self->dirty;
2058 2224
… …
2064 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2065 2231
2066 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2067 2233
2068 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2070 }; 2237 };
2238
2239 cf::get_slot 0.02;
2071 2240
2072 if ($uniq) { 2241 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2074 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2075 } else { 2244 } else {
2076 $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);
2077 } 2246 }
2078} 2247}
2079 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2080sub swap_out { 2257sub swap_out {
2081 my ($self) = @_; 2258 my ($self) = @_;
2082 2259
2083 # save first because save cedes
2084 $self->save;
2085
2086 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2087 2261
2262 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save};
2088 return if $self->players; 2264 return if $self->players;
2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
2090 return if $self->{deny_save};
2091 2265
2092 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2093
2094 $self->deactivate; 2267 $self->deactivate;
2095 $_->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
2096 $self->clear; 2275 $self->clear;
2097} 2276}
2098 2277
2099sub reset_at { 2278sub reset_at {
2100 my ($self) = @_; 2279 my ($self) = @_;
… …
2119 2298
2120 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2121 2300
2122 return if $self->players; 2301 return if $self->players;
2123 2302
2124 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2125 2304
2126 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2127 2306
2128 # need to save uniques path 2307 # need to save uniques path
2129 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
… …
2212 2391
2213sub unique_maps() { 2392sub unique_maps() {
2214 [ 2393 [
2215 map { 2394 map {
2216 utf8::decode $_; 2395 utf8::decode $_;
2217 /\.map$/ 2396 s/\.map$//; # TODO future compatibility hack
2397 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2398 ? ()
2218 ? normalise $_ 2399 : normalise $_
2219 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2401 ]
2222} 2402}
2223 2403
2224package 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}
2225 2435
2226=back 2436=back
2227 2437
2228=head3 cf::object 2438=head3 cf::object
2229 2439
… …
2233 2443
2234=over 4 2444=over 4
2235 2445
2236=item $ob->inv_recursive 2446=item $ob->inv_recursive
2237 2447
2238Returns 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.
2239 2450
2240=cut 2451=cut
2241 2452
2242sub inv_recursive_; 2453sub inv_recursive_;
2243sub inv_recursive_ { 2454sub inv_recursive_ {
… …
2248 inv_recursive_ inv $_[0] 2459 inv_recursive_ inv $_[0]
2249} 2460}
2250 2461
2251=item $ref = $ob->ref 2462=item $ref = $ob->ref
2252 2463
2253creates 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.
2254 2465
2255=item $ob = cf::object::deref ($refstring) 2466=item $ob = cf::object::deref ($refstring)
2256 2467
2257returns 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,
2258even if the object actually exists. May block. 2469even if the object actually exists. May block.
… …
2260=cut 2471=cut
2261 2472
2262sub deref { 2473sub deref {
2263 my ($ref) = @_; 2474 my ($ref) = @_;
2264 2475
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2476 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2477 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2478 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2479 or return;
2272 $pl->ob->uuid eq $uuid 2480 $pl->ob->uuid eq $uuid
2273 or return; 2481 or return;
… …
2293can 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
2294dialogue with the given NPC character. 2502dialogue with the given NPC character.
2295 2503
2296=cut 2504=cut
2297 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
2298# rough implementation of a future "reply" method that works 2520# rough implementation of a future "reply" method that works
2299# with dialog boxes. 2521# with dialog boxes.
2300#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
2301sub cf::object::player::reply($$$;$) { 2523sub cf::object::player::reply($$$;$) {
2302 my ($self, $npc, $msg, $flags) = @_; 2524 my ($self, $npc, $msg, $flags) = @_;
… …
2313 my $dialog = $pl->{npc_dialog}; 2535 my $dialog = $pl->{npc_dialog};
2314 $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));
2315 2537
2316 } else { 2538 } else {
2317 $msg = $npc->name . " says: $msg" if $npc; 2539 $msg = $npc->name . " says: $msg" if $npc;
2318 $self->message ($msg, $flags); 2540 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2319 } 2541 }
2320 } 2542 }
2321} 2543}
2322 2544
2323=item $object->send_msg ($channel, $msg, $color, [extra...]) 2545=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2348 2570
2349=item $player_object->enter_link 2571=item $player_object->enter_link
2350 2572
2351Freezes 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}>).
2352 2574
2353The 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.
2354I<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.
2355 2579
2356Will never block. 2580Will never block.
2357 2581
2358=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2359 2583
… …
2384 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2385 2609
2386 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2387 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2388 2612
2389 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2390} 2614}
2391 2615
2392sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2393 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2394 2618
… …
2411 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2412 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2413 2637
2414 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2415 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2416 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2417 2641
2418 $map->load; 2642 $map->load;
2419 $map->load_neighbours; 2643 $map->load_neighbours;
2420 2644
2421 return unless $self->contr->active; 2645 return unless $self->contr->active;
2422 $self->activate_recursive;
2423 2646
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2425 $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;
2426} 2652}
2427 2653
2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2429 2655
2430Moves 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
2431her, loading and preparing them map, calling the provided $check callback 2657her, loading and preparing them map, calling the provided $check callback
2432that 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
2433the 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
2434be called at the end of this process. 2660be called at the end of this process.
2435 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
2436=cut 2665=cut
2437 2666
2438our $GOTOGEN; 2667our $GOTOGEN;
2439 2668
2440sub cf::object::player::goto { 2669sub cf::object::player::goto {
… …
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2673 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2674
2446 $self->enter_link; 2675 $self->enter_link;
2447 2676
2448 (async { 2677 (async {
2678 $Coro::current->{desc} = "player::goto $path $x $y";
2679
2680 # *tag paths override both path and x|y
2681 if ($path =~ /^\*(.*)$/) {
2682 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2683 my $ob = $obs[rand @obs];
2684
2685 # see if we actually can go there
2686 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2687 $ob = $obs[rand @obs];
2688 } else {
2689 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2690 }
2691 # else put us there anyways for now #d#
2692
2693 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2694 } else {
2695 ($path, $x, $y) = (undef, undef, undef);
2696 }
2697 }
2698
2449 my $map = eval { 2699 my $map = eval {
2450 my $map = cf::map::find $path; 2700 my $map = defined $path ? cf::map::find $path : undef;
2451 2701
2452 if ($map) { 2702 if ($map) {
2453 $map = $map->customise_for ($self); 2703 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2704 $map = $check->($map) if $check && $map;
2455 } else { 2705 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2706 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2707 }
2458 2708
2459 $map 2709 $map
2460 }; 2710 };
2461 2711
… …
2497} 2747}
2498 2748
2499sub prepare_random_map { 2749sub prepare_random_map {
2500 my ($exit) = @_; 2750 my ($exit) = @_;
2501 2751
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
2503
2504 # all this does is basically replace the /! path by 2752 # all this does is basically replace the /! path by
2505 # a new random map path (?random/...) with a seed 2753 # a new random map path (?random/...) with a seed
2506 # that depends on the exit object 2754 # that depends on the exit object
2507 2755
2508 my $rmp = parse_random_map_params $exit->msg; 2756 my $rmp = parse_random_map_params $exit->msg;
… …
2510 if ($exit->map) { 2758 if ($exit->map) {
2511 $rmp->{region} = $exit->region->name; 2759 $rmp->{region} = $exit->region->name;
2512 $rmp->{origin_map} = $exit->map->path; 2760 $rmp->{origin_map} = $exit->map->path;
2513 $rmp->{origin_x} = $exit->x; 2761 $rmp->{origin_x} = $exit->x;
2514 $rmp->{origin_y} = $exit->y; 2762 $rmp->{origin_y} = $exit->y;
2763
2764 $exit->map->touch;
2515 } 2765 }
2516 2766
2517 $rmp->{random_seed} ||= $exit->random_seed; 2767 $rmp->{random_seed} ||= $exit->random_seed;
2518 2768
2519 my $data = cf::to_json $rmp; 2769 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2520 my $md5 = Digest::MD5::md5_hex $data; 2770 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2771 my $meta = "$RANDOMDIR/$md5.meta";
2522 2772
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2773 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2774 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh; 2775 undef $fh;
2526 aio_rename "$meta~", $meta; 2776 aio_rename "$meta~", $meta;
2527 2777
2778 my $slaying = "?random/$md5";
2779
2780 if ($exit->valid) {
2528 $exit->slaying ("?random/$md5"); 2781 $exit->slaying ("?random/$md5");
2529 $exit->msg (undef); 2782 $exit->msg (undef);
2783 }
2530 } 2784 }
2531} 2785}
2532 2786
2533sub cf::object::player::enter_exit { 2787sub cf::object::player::enter_exit {
2534 my ($self, $exit) = @_; 2788 my ($self, $exit) = @_;
2535 2789
2536 return unless $self->type == cf::PLAYER; 2790 return unless $self->type == cf::PLAYER;
2537 2791
2538 if ($exit->slaying eq "/!") {
2539 #TODO: this should de-fi-ni-te-ly not be a sync-job
2540 # the problem is that $exit might not survive long enough
2541 # so it needs to be done right now, right here
2542 cf::sync_job { prepare_random_map $exit };
2543 }
2544
2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2546 my $hp = $exit->stats->hp;
2547 my $sp = $exit->stats->sp;
2548
2549 $self->enter_link; 2792 $self->enter_link;
2550 2793
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2555 (async { 2794 (async {
2556 $self->deactivate_recursive; # just to be sure 2795 $Coro::current->{desc} = "enter_exit";
2796
2557 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
2558 $self->goto ($slaying, $hp, $sp); 2812 $self->goto ($map, $x, $y);
2559 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
2560 1; 2818 1
2561 }) { 2819 }) {
2562 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2563 . "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. "
2564 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2565 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2566 2824
2567 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
… …
2584sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2585 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2586 2844
2587 utf8::encode $text; 2845 utf8::encode $text;
2588 $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);
2589} 2872}
2590 2873
2591=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2592 2875
2593Send 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
… …
2595the 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
2596the message unless the client supports the msg packet. 2879the message unless the client supports the msg packet.
2597 2880
2598=cut 2881=cut
2599 2882
2883# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2601 "c/identify" => { 2891 "c/identify" => {
2602 id => "identify", 2892 id => "infobox",
2603 title => "Identify", 2893 title => "Identify",
2604 reply => undef, 2894 reply => undef,
2605 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2606 }, 2896 },
2607 "c/examine" => { 2897 "c/examine" => {
2608 id => "examine", 2898 id => "infobox",
2609 title => "Examine", 2899 title => "Examine",
2610 reply => undef, 2900 reply => undef,
2611 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2612 }, 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,
2613); 2995);
2614 2996
2615sub cf::client::send_msg { 2997sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2999
2618 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2619 3002
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 3004
2622 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3006 if ($CHANNEL{$channel}) {
3007 $channel = $CHANNEL{$channel};
2624 3008
3009 $self->ext_msg (channel_info => $channel);
3010 $channel = $channel->{id};
3011
2625 if (ref $channel) { 3012 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2630 if $self->can_msg;
2631 } 3017 }
2632 3018
2633 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2634 } 3020 }
2635 3021
2636 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2637 3023
2638 if ($self->can_msg) {
2639 # default colour, mask it out 3024 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2642 3027
2643 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2645 } else { 3031 );
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656 3032
2657 $color &= cf::NDI_COLOR_MASK; 3033 $self->send_big_packet ($pkt);
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670} 3034}
2671 3035
2672=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2673 3037
2674Sends an ext event to the client. 3038Sends an ext event to the client.
… …
2677 3041
2678sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2679 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2680 3044
2681 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2684 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 } 3050 }
2687} 3051}
2688 3052
2689=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2690 3054
… …
2694 3058
2695sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2697 3061
2698 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove 3065 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 } 3068 }
2705} 3069}
2706 3070
2707=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2708 3072
… …
2809 3173
2810 $coro 3174 $coro
2811} 3175}
2812 3176
2813cf::client->attach ( 3177cf::client->attach (
2814 on_destroy => sub { 3178 on_client_destroy => sub {
2815 my ($ns) = @_; 3179 my ($ns) = @_;
2816 3180
2817 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2818 }, 3182 },
2819); 3183);
… …
2835our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
2836 3200
2837$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
2838 3202
2839$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
2841 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
2842 sort time 3206 sort time
2843)); 3207));
2844 3208
2845# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
… …
2847=pod 3211=pod
2848 3212
2849The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
2850 3214
2851 cf::object 3215 cf::object
2852 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
2853 insert remove name archname title slaying race decrease_ob_nr 3217 insert remove name archname title slaying race decrease split
3218 value
2854 3219
2855 cf::object::player 3220 cf::object::player
2856 player 3221 player
2857 3222
2858 cf::player 3223 cf::player
… …
2863 3228
2864=cut 3229=cut
2865 3230
2866for ( 3231for (
2867 ["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
2868 insert remove inv name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
2869 decrease_ob_nr)], 3234 decrease split destroy change_exp value msg lore send_msg)],
2870 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
2872 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
2873) { 3238) {
2874 no strict 'refs'; 3239 no strict 'refs';
2875 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
2876 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2894 3259
2895 my $qcode = $code; 3260 my $qcode = $code;
2896 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2897 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
2898 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
2899 local $_; 3267 local $_;
2900 local @safe::cf::_safe_eval_args = values %vars;
2901 3268
2902 my $eval = 3269 my $eval =
2903 "do {\n" 3270 "do {\n"
2904 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2905 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
2906 . $code 3273 . $code
2907 . "\n}" 3274 . "\n}"
2908 ; 3275 ;
2909 3276
3277 if ($CFG{safe_eval}) {
2910 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
2911 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2912 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 }
2913 3286
2914 if ($@) { 3287 if ($@) {
2915 warn "$@"; 3288 warn "$@";
2916 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
2917 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
… …
2936=cut 3309=cut
2937 3310
2938sub register_script_function { 3311sub register_script_function {
2939 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
2940 3313
2941 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
2942 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
2943} 3316}
2944 3317
2945=back 3318=back
2946 3319
2947=cut 3320=cut
… …
2968 3341
2969 $facedata->{version} == 2 3342 $facedata->{version} == 2
2970 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971 3344
2972 # 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]);
2973 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC, 3348 type => FT_RSRC,
2975 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),
2976 }; 3351 };
2977 cf::cede_to_tick; 3352 cf::cede_to_tick;
2978 3353
2979 { 3354 {
2980 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
2981 3356
2982 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3359
2984 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2988 3364
2989 cf::cede_to_tick; 3365 cf::cede_to_tick;
2990 } 3366 }
2991 3367
2992 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3369 next unless $info->{smooth};
3370
2994 my $idx = cf::face::find $face 3371 my $idx = cf::face::find $face
2995 or next; 3372 or next;
3373
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3374 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3375 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3376 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3377 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3378 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3014 3392
3015 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3016 } 3394 }
3017 3395
3018 { 3396 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3022 3398
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3400 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028 3402
3029 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3030 # prepend meta info 3404 cf::face::set_type $idx, $info->{type};
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else { 3405 } else {
3039 $data = $info->{data}; 3406 $RESOURCE{$name} = $info;
3040 } 3407 }
3041 3408
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick; 3409 cf::cede_to_tick;
3046 } 3410 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 } 3411 }
3412
3413 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3414
3067 1 3415 1
3068} 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});
3069 3437
3070register_exticmd fx_want => sub { 3438register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3439 my ($ns, $want) = @_;
3072 3440
3073 while (my ($k, $v) = each %$want) { 3441 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v); 3442 $ns->fx_want ($k, $v);
3075 } 3443 }
3076}; 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}
3077 3455
3078sub reload_regions { 3456sub reload_regions {
3079 # 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
3080 # for this (global event?) 3458 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = (); 3459 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3095} 3473}
3096 3474
3097sub reload_archetypes { 3475sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes" 3476 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n"; 3477 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
3105} 3478}
3106 3479
3107sub reload_treasures { 3480sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures" 3481 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n"; 3482 or die "unable to load treasurelists\n";
3110} 3483}
3111 3484
3112sub reload_resources { 3485sub reload_resources {
3113 warn "reloading resource files...\n"; 3486 warn "reloading resource files...\n";
3114 3487
3488 reload_facedata;
3489 reload_archetypes;
3115 reload_regions; 3490 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures; 3491 reload_treasures;
3120 3492
3121 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3122} 3494}
3123 3495
3124sub init {
3125 reload_resources;
3126}
3127
3128sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3500 or return;
3131 3501
3132 local $/; 3502 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3134 3504
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3136 3506
3137 $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};
3138 $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};
… …
3142 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3143 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3144 }; 3514 };
3145 warn $@ if $@; 3515 warn $@ if $@;
3146 } 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;
3147} 3547}
3148 3548
3149sub 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
3150 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3152 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#
3153 (async { 3562 (async {
3154 Event::one_event; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3564 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3156 }; 3566 };
3157 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;
3158 reload_config; 3580 reload_config;
3159 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
3160 load_extensions; 3591 load_extensions;
3161 3592
3162 $TICK_WATCHER->start; 3593 utime time, time, $RUNTIMEFILE;
3163 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;
3164} 3606}
3165 3607
3166############################################################################# 3608#############################################################################
3167# initialisation and cleanup 3609# initialisation and cleanup
3168 3610
3169# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3170BEGIN { 3612BEGIN {
3613 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3173 reentrant => 0,
3174 data => WF_AUTOCANCEL,
3175 signal => $signal,
3176 prio => 0,
3177 cb => sub {
3178 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3179 },
3180 ); 3617 };
3181 } 3618 }
3182} 3619}
3183 3620
3184sub write_runtime { 3621sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3186 3623
3187 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3189 3626
3190 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3191 3628
3192 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3193 3630
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3195 or return; 3632 or return;
3196 3633
3197 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
… …
3209 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3210 3647
3211 close $fh 3648 close $fh
3212 or return; 3649 or return;
3213 3650
3214 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3215 and return; 3652 and return;
3216 3653
3217 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3218 3655
3219 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 };
3220} 3707}
3221 3708
3222sub emergency_save() { 3709sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3224 3711
3225 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3226 3713
3227 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
3228 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3229 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3230 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3232 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3726 $pl->valid or next;
3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3728 $pl->save;
3236 } 3729 }
3237 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3238 3731
3239 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3240 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3241 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3242 $map->valid or next; 3735 $map->valid or next;
3243 $map->save; 3736 $map->save;
3244 } 3737 }
3245 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3246 3739
3247 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3249 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";
3250 }; 3747 };
3251 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
3252 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3253} 3755}
3254 3756
3255sub post_cleanup { 3757sub post_cleanup {
3256 my ($make_core) = @_; 3758 my ($make_core) = @_;
3257 3759
3258 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3259 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 }
3790 warn "cleared package $pkg\n";#d#
3260} 3791}
3261 3792
3262sub do_reload_perl() { 3793sub do_reload_perl() {
3263 # can/must only be called in main 3794 # can/must only be called in main
3264 if ($Coro::current != $Coro::main) { 3795 if ($Coro::current != $Coro::main) {
3265 warn "can only reload from main coroutine"; 3796 warn "can only reload from main coroutine";
3266 return; 3797 return;
3267 } 3798 }
3268 3799
3800 return if $RELOAD++;
3801
3802 my $t1 = AE::time;
3803
3804 while ($RELOAD) {
3269 warn "reloading..."; 3805 warn "reloading...";
3270 3806
3271 warn "entering sync_job"; 3807 warn "entering sync_job";
3272 3808
3273 cf::sync_job { 3809 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark 3810 cf::write_runtime_sync; # external watchdog should not bark
3275 cf::emergency_save; 3811 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3277 3813
3278 warn "syncing database to disk"; 3814 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3815 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3816
3281 # if anything goes wrong in here, we should simply crash as we already saved 3817 # if anything goes wrong in here, we should simply crash as we already saved
3282 3818
3283 warn "cancelling all WF_AUTOCANCEL watchers";
3284 for (Event::all_watchers) {
3285 $_->cancel if $_->data & WF_AUTOCANCEL;
3286 }
3287
3288 warn "flushing outstanding aio requests"; 3819 warn "flushing outstanding aio requests";
3289 for (;;) {
3290 BDB::flush;
3291 IO::AIO::flush;
3292 Coro::cede;
3293 last unless IO::AIO::nreqs || BDB::nreqs; 3820 while (IO::AIO::nreqs || BDB::nreqs) {
3294 warn "iterate..."; 3821 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3295 }
3296
3297 ++$RELOAD;
3298
3299 warn "cancelling all extension coros";
3300 $_->cancel for values %EXT_CORO;
3301 %EXT_CORO = ();
3302
3303 warn "removing commands";
3304 %COMMAND = ();
3305
3306 warn "removing ext/exti commands";
3307 %EXTCMD = ();
3308 %EXTICMD = ();
3309
3310 warn "unloading/nuking all extensions";
3311 for my $pkg (@EXTS) {
3312 warn "... unloading $pkg";
3313
3314 if (my $cb = $pkg->can ("unload")) {
3315 eval {
3316 $cb->($pkg);
3317 1
3318 } or warn "$pkg unloaded, but with errors: $@";
3319 } 3822 }
3320 3823
3321 warn "... nuking $pkg"; 3824 warn "cancelling all extension coros";
3322 Symbol::delete_package $pkg; 3825 $_->cancel for values %EXT_CORO;
3323 } 3826 %EXT_CORO = ();
3324 3827
3325 warn "unloading all perl modules loaded from $LIBDIR"; 3828 warn "removing commands";
3326 while (my ($k, $v) = each %INC) { 3829 %COMMAND = ();
3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3328 3830
3831 warn "removing ext/exti commands";
3832 %EXTCMD = ();
3833 %EXTICMD = ();
3834
3835 warn "unloading/nuking all extensions";
3836 for my $pkg (@EXTS) {
3329 warn "... unloading $k"; 3837 warn "... unloading $pkg";
3330 delete $INC{$k};
3331 3838
3332 $k =~ s/\.pm$//;
3333 $k =~ s/\//::/g;
3334
3335 if (my $cb = $k->can ("unload_module")) { 3839 if (my $cb = $pkg->can ("unload")) {
3840 eval {
3336 $cb->(); 3841 $cb->($pkg);
3842 1
3843 } or warn "$pkg unloaded, but with errors: $@";
3844 }
3845
3846 warn "... clearing $pkg";
3847 clear_package $pkg;
3337 } 3848 }
3338 3849
3339 Symbol::delete_package $k; 3850 warn "unloading all perl modules loaded from $LIBDIR";
3851 while (my ($k, $v) = each %INC) {
3852 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853
3854 warn "... unloading $k";
3855 delete $INC{$k};
3856
3857 $k =~ s/\.pm$//;
3858 $k =~ s/\//::/g;
3859
3860 if (my $cb = $k->can ("unload_module")) {
3861 $cb->();
3862 }
3863
3864 clear_package $k;
3340 } 3865 }
3341 3866
3342 warn "getting rid of safe::, as good as possible"; 3867 warn "getting rid of safe::, as good as possible";
3343 Symbol::delete_package "safe::$_" 3868 clear_package "safe::$_"
3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3345 3870
3346 warn "unloading cf.pm \"a bit\""; 3871 warn "unloading cf.pm \"a bit\"";
3347 delete $INC{"cf.pm"}; 3872 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"}; 3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3349 3874
3350 # don't, removes xs symbols, too, 3875 # don't, removes xs symbols, too,
3351 # and global variables created in xs 3876 # and global variables created in xs
3352 #Symbol::delete_package __PACKAGE__; 3877 #clear_package __PACKAGE__;
3353 3878
3354 warn "unload completed, starting to reload now"; 3879 warn "unload completed, starting to reload now";
3355 3880
3356 warn "reloading cf.pm"; 3881 warn "reloading cf.pm";
3357 require cf; 3882 require cf;
3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3883 cf::_connect_to_perl_1;
3359 3884
3360 warn "loading config and database again"; 3885 warn "loading config and database again";
3361 cf::reload_config; 3886 cf::reload_config;
3362 3887
3363 warn "loading extensions"; 3888 warn "loading extensions";
3364 cf::load_extensions; 3889 cf::load_extensions;
3365 3890
3891 if ($REATTACH_ON_RELOAD) {
3366 warn "reattaching attachments to objects/players"; 3892 warn "reattaching attachments to objects/players";
3367 _global_reattach; # objects, sockets 3893 _global_reattach; # objects, sockets
3368 warn "reattaching attachments to maps"; 3894 warn "reattaching attachments to maps";
3369 reattach $_ for values %MAP; 3895 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players"; 3896 warn "reattaching attachments to players";
3371 reattach $_ for values %PLAYER; 3897 reattach $_ for values %PLAYER;
3898 }
3372 3899
3900 warn "running post_init jobs";
3901 (pop @POST_INIT)->(1) while @POST_INIT;
3902
3373 warn "leaving sync_job"; 3903 warn "leaving sync_job";
3374 3904
3375 1 3905 1
3376 } or do { 3906 } or do {
3377 warn $@; 3907 warn $@;
3378 warn "error while reloading, exiting."; 3908 cf::cleanup "error while reloading, exiting.";
3379 exit 1;
3380 }; 3909 };
3381 3910
3382 warn "reloaded"; 3911 warn "reloaded";
3912 --$RELOAD;
3913 }
3914
3915 $t1 = AE::time - $t1;
3916 warn "reload completed in ${t1}s\n";
3383}; 3917};
3384 3918
3385our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3386 3920
3387sub reload_perl() { 3921sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3922 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3390 3924
3391 $RELOAD_WATCHER ||= Event->timer ( 3925 $RELOAD_WATCHER ||= cf::async {
3392 reentrant => 0, 3926 Coro::AIO::aio_wait cache_extensions;
3393 after => 0, 3927
3394 data => WF_AUTOCANCEL, 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3395 cb => sub {
3396 do_reload_perl; 3929 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3398 }, 3931 };
3399 ); 3932 };
3400} 3933}
3401 3934
3402register_command "reload" => sub { 3935register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3936 my ($who, $arg) = @_;
3404 3937
3405 if ($who->flag (FLAG_WIZ)) { 3938 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3939 $who->message ("reloading server.");
3940 async {
3941 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3942 reload_perl;
3943 };
3408 } 3944 }
3409}; 3945};
3410 3946
3411unshift @INC, $LIBDIR; 3947unshift @INC, $LIBDIR;
3412 3948
… …
3414 3950
3415our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3417 3953
3418sub wait_for_tick { 3954sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3421 3956
3422 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait; 3959 $signal->wait;
3425} 3960}
3426 3961
3427sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3430 3964
3431 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3967 $signal->wait;
3434} 3968}
3435 3969
3436 my $min = 1e6;#d# 3970sub tick {
3437 my $avg = 10;
3438$TICK_WATCHER = Event->timer (
3439 reentrant => 0,
3440 parked => 1,
3441 prio => 0,
3442 at => $NEXT_TICK || $TICK,
3443 data => WF_AUTOCANCEL,
3444 cb => sub {
3445 if ($Coro::current != $Coro::main) { 3971 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3972 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3448 return; 3974 return;
3449 } 3975 }
3450 3976
3451 $NOW = $tick_start = Event::time;
3452
3453 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3454 3978
3455 0 && sync_job {#d# 3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3456 for(1..10) {
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460 3980
3461 $map->width (50); 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3462 $map->height (50); 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3463 $map->alloc; 3983 Coro::async_pool {
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3984 $Coro::current->{desc} = "runtime saver";
3465 my $t = Event::time - $t; 3985 write_runtime_sync
3466 3986 or warn "ERROR: unable to write runtime file: $!";
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 }; 3987 };
3988 }
3477 3989
3478 $RUNTIME += $TICK;
3479 $NEXT_TICK += $TICK;
3480
3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3990 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3991 $sig->send;
3494 } 3992 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3993 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3994 $sig->send;
3497 } 3995 }
3498 3996
3499 $NOW = Event::time; 3997 $LOAD = ($NOW - $TICK_START) / $TICK;
3500
3501 # if we are delayed by four ticks or more, skip them all
3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3503
3504 $TICK_WATCHER->at ($NEXT_TICK);
3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3998 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3999
3510 _post_tick; 4000 if (0) {
3511 4001 if ($NEXT_TICK) {
3512 4002 my $jitter = $TICK_START - $NEXT_TICK;
4003 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004 warn "jitter $JITTER\n";#d#
4005 }
3513 }, 4006 }
3514); 4007}
3515 4008
3516{ 4009{
3517 BDB::max_poll_time $TICK * 0.1; 4010 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 4011
3519 reentrant => 0,
3520 fd => BDB::poll_fileno,
3521 poll => 'r',
3522 prio => 0,
3523 data => WF_AUTOCANCEL,
3524 cb => \&BDB::poll_cb,
3525 );
3526 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3527 4013 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 4014 $AnyEvent::BDB::WATCHER->priority (1);
3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542 4015
3543 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;
4018 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4019 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4020 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4021 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4022 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 4023
3546 cf::sync_job { 4024 cf::sync_job {
3547 eval { 4025 eval {
3548 BDB::db_env_open 4026 BDB::db_env_open
3549 $DB_ENV, 4027 $DB_ENV,
… …
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 4031 0666;
3554 4032
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 }; 4034 };
3560 4035
3561 cf::cleanup "db_env_open(db): $@" if $@; 4036 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 4037 };
3563 } 4038 }
4039
4040 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4041 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4042 };
4043 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4044 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4045 };
4046 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4047 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4048 };
3564} 4049}
3565 4050
3566{ 4051{
4052 # configure IO::AIO
4053
3567 IO::AIO::min_parallel 8; 4054 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 4055 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 4056 undef $AnyEvent::AIO::WATCHER;
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579} 4057}
3580 4058
3581my $_log_backtrace; 4059my $_log_backtrace;
3582 4060
3583sub _log_backtrace { 4061sub _log_backtrace {
… …
3586 $msg =~ s/\n//; 4064 $msg =~ s/\n//;
3587 4065
3588 # limit the # of concurrent backtraces 4066 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 4067 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 4068 ++$_log_backtrace;
4069 my $perl_bt = Carp::longmess $msg;
3591 async { 4070 async {
4071 $Coro::current->{desc} = "abt $msg";
4072
3592 my @bt = fork_call { 4073 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 4074 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4075 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4076 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 4077 or die "addr2line: $!";
… …
3604 } 4085 }
3605 4086
3606 @funcs 4087 @funcs
3607 }; 4088 };
3608 4089
3609 LOG llevInfo, "[ABT] $msg\n"; 4090 LOG llevInfo, "[ABT] $perl_bt\n";
4091 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt; 4092 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace; 4093 --$_log_backtrace;
3612 }; 4094 };
3613 } else { 4095 } else {
3614 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $msg\n";
3615 LOG llevInfo, "[ABT] [suppressed]\n"; 4097 LOG llevInfo, "[ABT] [suppressed]\n";
3616 } 4098 }
3617} 4099}
3618 4100
3619# load additional modules 4101# load additional modules
3620use cf::pod; 4102require "cf/$_.pm" for @EXTRA_MODULES;
4103cf::_connect_to_perl_2;
3621 4104
3622END { cf::emergency_save } 4105END { cf::emergency_save }
3623 4106
36241 41071
3625 4108

Diff Legend

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