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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 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;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
86 124
87our %CFG; 125our %CFG;
88 126
89our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 128our $RUNTIME;
129our $NOW;
91 130
92our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
95 134
96# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 137
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
102 147
103binmode STDOUT; 148binmode STDOUT;
104binmode STDERR; 149binmode STDERR;
105 150
106# read virtual server time, if available 151# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
111} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
112 159
113mkdir $_ 160mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 162
116our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
117 164
118sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 177
120############################################################################# 178#############################################################################
121 179
122=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
123 181
159 217
160The raw value load value from the last tick. 218The raw value load value from the last tick.
161 219
162=item %cf::CFG 220=item %cf::CFG
163 221
164Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 223from wherever your confdir points to.
166 224
167=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
168 226
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These 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 228returns 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. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 230
173=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
174 232
175This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 235that call.
178 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
179=back 243=back
180 244
181=cut 245=cut
182 246
183BEGIN { 247$Coro::State::WARNHOOK = sub {
184 *CORE::GLOBAL::warn = sub {
185 my $msg = join "", @_; 248 my $msg = join "", @_;
186 249
187 $msg .= "\n" 250 $msg .= "\n"
188 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
189 252
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 254
192 utf8::encode $msg;
193 LOG llevError, $msg; 255 LOG llevError, $msg;
194 }; 256};
195} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
196 271
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 282for my $pkg (qw(
208 cf::global cf::attachable 283 cf::global cf::attachable
209 cf::object cf::object::player 284 cf::object cf::object::player
210 cf::client cf::player 285 cf::client cf::player
211 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
212 cf::map cf::party cf::region 288 cf::party cf::region
213)) { 289)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 291}
217 292
218$Event::DIED = sub { 293$EV::DIED = sub {
219 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
220}; 295};
221 296
222############################################################################# 297#############################################################################
223 298
224=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 322 $d
248 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
249} 324}
250 325
251=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
252 327
253Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
254 329
255=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
256 331
257Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
258 333
259=cut 334=cut
260 335
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 337
263sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
265 354
266=item cf::lock_wait $string 355=item cf::lock_wait $string
267 356
268Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
269 358
270=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
271 360
272Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
275returned. 364returned.
276 365
277Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 367deadlocked coro.
284 373
285Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
286 375
287=cut 376=cut
288 377
289our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 379
292sub lock_wait($) { 380sub lock_wait($) {
293 my ($key) = @_; 381 $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} 382}
306 383
307sub lock_acquire($) { 384sub lock_acquire($) {
308 my ($key) = @_; 385 $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} 386}
322 387
323sub lock_active($) { 388sub lock_active($) {
324 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 390}
328 391
329sub freeze_mainloop { 392sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
331 394
332 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 396}
334 }; 397
335 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
336 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
337} 411}
338 412
339=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
340 414
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
349 423
350=cut 424=cut
351 425
352our @SLOT_QUEUE; 426our @SLOT_QUEUE;
353our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
354 429
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
357 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
358 436
359 while () { 437 while () {
360 next_job: 438 next_job:
439
361 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
362 if ($avail > 0.01) { 441
363 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
365 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send; 446 $job->[2]->send;
367 Coro::cede; 447 Coro::cede;
368 goto next_job; 448 goto next_job;
369 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
370 } 451 }
371 } 452 }
372 453
373 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 457 $signal->wait;
377 } else { 458 } else {
459 $busy = 0;
378 Coro::schedule; 460 Coro::schedule;
379 } 461 }
380 } 462 }
381}; 463};
382 464
383sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
384 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
385 469
386 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
387 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
388 473
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
402 487
403BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
404 489
405=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
406 491
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 493is 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 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 495acceptable.
411 496
412If it must be done, put the blocking parts into C<sync_job>. This will run 497If 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 498the given BLOCK in another coroutine while waiting for the result. The
418 503
419sub sync_job(&) { 504sub sync_job(&) {
420 my ($job) = @_; 505 my ($job) = @_;
421 506
422 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 508 my $time = AE::time;
424 509
425 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
427 512
428 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 514
430 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
431 516
432 my $busy = 1; 517 my $busy = 1;
433 my @res; 518 my @res;
434 519
435 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 522 @res = eval { $job->() };
437 warn $@ if $@; 523 warn $@ if $@;
438 undef $busy; 524 undef $busy;
439 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
440 526
441 while ($busy) { 527 while ($busy) {
442 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
443 } 532 }
533 }
444 534
445 $time = Event::time - $time; 535 my $time = AE::time - $time;
446 536
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 537 $TICK_START += $time; # do not account sync jobs to server load
451 538
452 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
453 } else { 540 } else {
454 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
455 542
480=item fork_call { }, $args 567=item fork_call { }, $args
481 568
482Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
486 573
487=cut 574=cut
488 575
489sub fork_call(&@) { 576sub fork_call(&@) {
490 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
499 }, @args; 586 }, @args;
500 587
501 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
502} 589}
503 590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
616}
617
504=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
505 619
506Returns a single value from the environment database. 620Returns a single value from the environment database.
507 621
508=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
509 623
510Stores the given C<$value> in the family. It can currently store binary 624Stores 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). 625data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 626
627=item $db = cf::db_table "name"
628
629Create and/or open a new database table. The string must not be "db" and must be unique
630within each server.
631
513=cut 632=cut
633
634sub db_table($) {
635 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV;
637
638 eval {
639 $db->set_flags (BDB::CHKSUM);
640
641 utf8::encode $name;
642 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
643 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
644 cf::cleanup "db_open(db): $!" if $!;
645 };
646 cf::cleanup "db_open(db): $@" if $@;
647
648 $db
649}
514 650
515our $DB; 651our $DB;
516 652
517sub db_init { 653sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 654 cf::sync_job {
522 eval { 655 $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 } 656 };
532} 657}
533 658
534sub db_get($$) { 659sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
536 661
634 759
635############################################################################# 760#############################################################################
636 761
637=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
638 763
639Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
642 767
643In the following description, CLASS can be any of C<global>, C<object> 768In 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 769C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 770Deliantra).
646 771
647=over 4 772=over 4
648 773
649=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
650 775
694=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
695 820
696Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
698 823
699Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
701 826
702These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
703 828
704=over 4 829=over 4
932 } 1057 }
933 1058
934 0 1059 0
935} 1060}
936 1061
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1063
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1065
941Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
942 1067
948 1073
949=cut 1074=cut
950 1075
951############################################################################# 1076#############################################################################
952# object support 1077# object support
953#
954 1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
955sub _can_merge { 1112sub _can_merge {
956 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
957 1114
958 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1116
962 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
963} 1119}
964 1120
965sub reattach { 1121sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1123 my ($obj) = @_;
968 1124
1125 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1127
971 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
972 1129
973 @$registry = (); 1130 @$registry = ();
974 1131
989cf::attachable->attach ( 1146cf::attachable->attach (
990 prio => -1000000, 1147 prio => -1000000,
991 on_instantiate => sub { 1148 on_instantiate => sub {
992 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
993 1150
994 $data = from_json $data; 1151 $data = decode_json $data;
995 1152
996 for (@$data) { 1153 for (@$data) {
997 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
998 1155
999 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1013); 1170);
1014 1171
1015sub object_freezer_save { 1172sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1017 1174
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1175 sync_job {
1021 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1024 1180
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1029 close $fh; 1188 aio_close $fh;
1030 1189
1031 if (@$objs) { 1190 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1037 close $fh; 1199 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1201 }
1040 } else { 1202 } else {
1041 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1042 } 1204 }
1043 1205
1044 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1210 } else {
1046 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1047 } 1212 }
1048 } else { 1213 } else {
1049 aio_unlink $filename; 1214 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1051 } 1216 }
1052 }; 1217 };
1053
1054 undef $guard;
1055} 1218}
1056 1219
1057sub object_freezer_as_string { 1220sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1059 1222
1064 1227
1065sub object_thawer_load { 1228sub object_thawer_load {
1066 my ($filename) = @_; 1229 my ($filename) = @_;
1067 1230
1068 my ($data, $av); 1231 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1232
1072 (aio_load $filename, $data) >= 0 1233 (aio_load $filename, $data) >= 0
1073 or return; 1234 or return;
1074 1235
1075 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1238 or return;
1078 1239
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1081 } 1242 }
1082 1243
1244 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1085 1247
1086 ($data, $av) 1248 ($data, $av)
1087} 1249}
1088 1250
1089=head2 COMMAND CALLBACKS 1251=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1146 1308
1147 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1148} 1310}
1149 1311
1312use File::Glob ();
1313
1150cf::player->attach ( 1314cf::player->attach (
1151 on_command => sub { 1315 on_unknown_command => sub {
1152 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1153 1317
1154 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1155 or return; 1319 or return;
1156 1320
1186 1350
1187 cf::override; 1351 cf::override;
1188 }, 1352 },
1189); 1353);
1190 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1191sub load_extensions { 1368sub load_extensions {
1192 cf::sync_job { 1369 cf::sync_job {
1193 my %todo; 1370 my %todo;
1194 1371
1195 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1214 1391
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1394
1218 $ext{source} = 1395 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1221 . $source 1398 . $source
1222 . "\n};\n1"; 1399 . "\n};\n1";
1223 1400
1224 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1225 } 1402 }
1226 1403
1404 my $pass = 0;
1227 my %done; 1405 my %done;
1228 while (%todo) { 1406 while (%todo) {
1229 my $progress; 1407 my $progress;
1230 1408
1409 ++$pass;
1410
1411 ext:
1231 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip 1414 next ext
1234 unless exists $done{$_}; 1415 unless exists $done{$_};
1235 } 1416 }
1236 1417
1237 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1238 1419
1239 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1240 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1241 : "$v->{base}: extension inactive.\n";
1242 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1243 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1244 warn $msg; 1427 } else {
1245 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1246 exit 1; 1429 push @EXTS, $v->{pkg};
1247 } 1430 $progress = 1;
1248 1431
1249 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1250 } 1434 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1255 } 1435 }
1256 1436
1257 skip: 1437 unless ($progress) {
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1259 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1260 } 1445 }
1261 }; 1446 };
1262} 1447}
1263 1448
1264############################################################################# 1449#############################################################################
1265 1450
1266=back 1451=back
1267 1452
1268=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1269 1454
1270Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1271 1456
1272=cut 1457=cut
1273 1458
1274package cf::player; 1459package cf::player;
1275 1460
1276use Coro::AIO; 1461use Coro::AIO;
1277 1462
1278=head3 cf::player 1463=head3 cf::player
1279 1464
1280=over 4 1465=over 4
1466
1467=item cf::player::num_playing
1468
1469Returns the official number of playing players, as per the Crossfire metaserver rules.
1470
1471=cut
1472
1473sub num_playing {
1474 scalar grep
1475 $_->ob->map
1476 && !$_->hidden
1477 && !$_->ob->flag (cf::FLAG_WIZ),
1478 cf::player::list
1479}
1281 1480
1282=item cf::player::find $login 1481=item cf::player::find $login
1283 1482
1284Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
1285 1484
1304 1503
1305sub exists($) { 1504sub exists($) {
1306 my ($login) = @_; 1505 my ($login) = @_;
1307 1506
1308 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1309 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1310} 1509}
1311 1510
1312sub find($) { 1511sub find($) {
1313 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1314 my $login = $_[0]; 1513 my $login = $_[0];
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1524
1326 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1526 or return;
1328 1527
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1331 or return; 1529 or return;
1530
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1335 } 1534 }
1336 } 1535 }
1337} 1536}
1338 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1339sub save($) { 1551sub save($) {
1340 my ($pl) = @_; 1552 my ($pl) = @_;
1341 1553
1342 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1343 1555
1346 1558
1347 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1348 1560
1349 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1563
1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1351 1568
1352 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1570 cf::cede_to_tick;
1354} 1571}
1355 1572
1387 my ($pl) = @_; 1604 my ($pl) = @_;
1388 1605
1389 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1390 1607
1391 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1393 1610
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1395 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1397 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1398 1617
1399 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1439 1658
1440 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1441 my $path = path $login; 1660 my $path = path $login;
1442 1661
1443 # a .pst is a dead give-away for a valid player 1662 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1668 }
1449 1669
1480 } 1700 }
1481 1701
1482 \@paths 1702 \@paths
1483} 1703}
1484 1704
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1486 1706
1487Expand crossfire pod fragments into protocol xml. 1707Expand deliantra pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535 1708
1536=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1537 1710
1538Sends an ext reply to the player. 1711Sends an ext reply to the player.
1539 1712
1606our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1608 1781
1609sub generate_random_map { 1782sub generate_random_map {
1610 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1611 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1788 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1616 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1617 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1618 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1619 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 1913
1738# the temporary/swap location 1914# the temporary/swap location
1739sub save_path { 1915sub save_path {
1740 my ($self) = @_; 1916 my ($self) = @_;
1741 1917
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1744} 1920}
1745 1921
1746# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1747sub uniq_path { 1923sub uniq_path {
1748 my ($self) = @_; 1924 my ($self) = @_;
1749 1925
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1752}
1753
1754# and all this just because we cannot iterate over
1755# all maps in C++...
1756sub change_all_map_light {
1757 my ($change) = @_;
1758
1759 $_->change_map_light ($change)
1760 for grep $_->outdoor, values %cf::MAP;
1761} 1928}
1762 1929
1763sub decay_objects { 1930sub decay_objects {
1764 my ($self) = @_; 1931 my ($self) = @_;
1765 1932
1849sub find { 2016sub find {
1850 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1851 2018
1852 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1853 2020
1854 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1856 2023
1857 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1861 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1862 or return; 2026 or return;
1863 2027
1864 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1865 2029
1867 or return; 2031 or return;
1868 2032
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
1872 undef $guard1; 2037 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2038 $map->reset;
1875 return find $path; 2039 return find $path;
1876 } 2040 }
1877 2041
1878 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1879 } 2043 }
1880} 2044}
1881 2045
1882sub pre_load { } 2046sub pre_load { }
1883sub post_load { } 2047#sub post_load { } # XS
1884 2048
1885sub load { 2049sub load {
1886 my ($self) = @_; 2050 my ($self) = @_;
1887 2051
1888 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
1891 2055
1892 { 2056 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2057 my $guard = cf::lock_acquire "map_data:$path";
1894 2058
1895 return unless $self->valid; 2059 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2060 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2061
1898 $self->in_memory (cf::MAP_LOADING); 2062 $self->in_memory (cf::MAP_LOADING);
1899 2063
1900 $self->alloc; 2064 $self->alloc;
1901 2065
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2070 $f->skip_block;
1907 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
1908 or return; 2072 or return;
1909 2073
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
1911 if delete $self->{load_original}; 2075 if delete $self->{load_original};
1912 2076
1913 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2078 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
1933 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
1934 $self->decay_objects; 2098 $self->decay_objects;
1935 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
1936 $self->update_buttons; 2100 $self->update_buttons;
1937 cf::cede_to_tick; 2101 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1940 $self->activate; 2102 $self->activate;
1941 } 2103 }
1942 2104
1943 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
1945 2107
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2109 }
1948 2110
1949 $self->post_load; 2111 $self->post_load;
1950} 2112}
1951 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
1952sub customise_for { 2117sub customise_for {
1953 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
1954 2119
1955 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
1956 if $self->per_player; 2121 if $self->per_player;
2009 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
2010 2175
2011 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
2012 2177
2013 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2180 }
2016 2181
2017 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
2018 2183
2019 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2185 $Coro::current->{desc} = "map prefetcher";
2186
2020 while (%MAP_PREFETCH) { 2187 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2188 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2189 if (my $map = find $k) {
2023 $map->load if $v; 2190 $map->load if $v;
2024 } 2191 }
2050 return if $self->{deny_save}; 2217 return if $self->{deny_save};
2051 2218
2052 local $self->{last_access} = $self->last_access;#d# 2219 local $self->{last_access} = $self->last_access;#d#
2053 2220
2054 cf::async { 2221 cf::async {
2222 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2056 }; 2224 };
2225
2226 cf::get_slot 0.02;
2057 2227
2058 if ($uniq) { 2228 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2231 } else {
2070 $self->save; 2240 $self->save;
2071 2241
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2243
2074 return if $self->players; 2244 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2077 2247
2078 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2079 2249
2080 $self->deactivate; 2250 $self->deactivate;
2105 2275
2106 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2107 2277
2108 return if $self->players; 2278 return if $self->players;
2109 2279
2110 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2111 2281
2112 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2113 2283
2114 # need to save uniques path 2284 # need to save uniques path
2115 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2198 2368
2199sub unique_maps() { 2369sub unique_maps() {
2200 [ 2370 [
2201 map { 2371 map {
2202 utf8::decode $_; 2372 utf8::decode $_;
2203 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2204 ? normalise $_ 2376 : normalise $_
2205 : ()
2206 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2207 ] 2378 ]
2208} 2379}
2209 2380
2210package cf; 2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2211 2412
2212=back 2413=back
2213 2414
2214=head3 cf::object 2415=head3 cf::object
2215 2416
2219 2420
2220=over 4 2421=over 4
2221 2422
2222=item $ob->inv_recursive 2423=item $ob->inv_recursive
2223 2424
2224Returns the inventory of the object _and_ their inventories, recursively. 2425Returns the inventory of the object I<and> their inventories, recursively,
2426but I<not> the object itself.
2225 2427
2226=cut 2428=cut
2227 2429
2228sub inv_recursive_; 2430sub inv_recursive_;
2229sub inv_recursive_ { 2431sub inv_recursive_ {
2234 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2235} 2437}
2236 2438
2237=item $ref = $ob->ref 2439=item $ref = $ob->ref
2238 2440
2239creates and returns a persistent reference to an objetc that can be stored as a string. 2441Creates and returns a persistent reference to an object that can be stored as a string.
2240 2442
2241=item $ob = cf::object::deref ($refstring) 2443=item $ob = cf::object::deref ($refstring)
2242 2444
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2445returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block. 2446even if the object actually exists. May block.
2246=cut 2448=cut
2247 2449
2248sub deref { 2450sub deref {
2249 my ($ref) = @_; 2451 my ($ref) = @_;
2250 2452
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2453 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2454 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2455 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2456 or return;
2258 $pl->ob->uuid eq $uuid 2457 $pl->ob->uuid eq $uuid
2259 or return; 2458 or return;
2279can be C<undef>. Does the right thing when the player is currently in a 2478can be C<undef>. Does the right thing when the player is currently in a
2280dialogue with the given NPC character. 2479dialogue with the given NPC character.
2281 2480
2282=cut 2481=cut
2283 2482
2483our $SAY_CHANNEL = {
2484 id => "say",
2485 title => "Map",
2486 reply => "say ",
2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2488};
2489
2490our $CHAT_CHANNEL = {
2491 id => "chat",
2492 title => "Chat",
2493 reply => "chat ",
2494 tooltip => "Player chat and shouts, global to the server.",
2495};
2496
2284# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2285# with dialog boxes. 2498# with dialog boxes.
2286#TODO: the first argument must go, split into a $npc->reply_to ( method 2499#TODO: the first argument must go, split into a $npc->reply_to ( method
2287sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2288 my ($self, $npc, $msg, $flags) = @_; 2501 my ($self, $npc, $msg, $flags) = @_;
2299 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2513 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2301 2514
2302 } else { 2515 } else {
2303 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2304 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2305 } 2518 }
2306 } 2519 }
2307} 2520}
2308 2521
2309=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2334 2547
2335=item $player_object->enter_link 2548=item $player_object->enter_link
2336 2549
2337Freezes the player and moves him/her to a special map (C<{link}>). 2550Freezes the player and moves him/her to a special map (C<{link}>).
2338 2551
2339The player should be reasonably safe there for short amounts of time. You 2552The player should be reasonably safe there for short amounts of time (e.g.
2340I<MUST> call C<leave_link> as soon as possible, though. 2553for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link
2555map.
2341 2556
2342Will never block. 2557Will never block.
2343 2558
2344=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2345 2560
2397 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2398 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2399 2614
2400 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2401 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2402 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2403 2618
2404 $map->load; 2619 $map->load;
2405 $map->load_neighbours; 2620 $map->load_neighbours;
2406 2621
2407 return unless $self->contr->active; 2622 return unless $self->contr->active;
2408 $self->activate_recursive;
2409 2623
2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2411 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2412} 2629}
2413 2630
2414=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2415 2632
2416Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2417her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2418that has to return the map if sucecssful, and then unfreezes the player on 2635that has to return the map if sucecssful, and then unfreezes the player on
2419the new (success) or old (failed) map position. In either case, $done will 2636the new (success) or old (failed) map position. In either case, $done will
2420be called at the end of this process. 2637be called at the end of this process.
2421 2638
2639Note that $check will be called with a potentially non-loaded map, so if
2640it needs a loaded map it has to call C<< ->load >>.
2641
2422=cut 2642=cut
2423 2643
2424our $GOTOGEN; 2644our $GOTOGEN;
2425 2645
2426sub cf::object::player::goto { 2646sub cf::object::player::goto {
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2651
2432 $self->enter_link; 2652 $self->enter_link;
2433 2653
2434 (async { 2654 (async {
2655 $Coro::current->{desc} = "player::goto $path $x $y";
2656
2657 # *tag paths override both path and x|y
2658 if ($path =~ /^\*(.*)$/) {
2659 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2660 my $ob = $obs[rand @obs];
2661
2662 # see if we actually can go there
2663 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2664 $ob = $obs[rand @obs];
2665 } else {
2666 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2667 }
2668 # else put us there anyways for now #d#
2669
2670 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2671 } else {
2672 ($path, $x, $y) = (undef, undef, undef);
2673 }
2674 }
2675
2435 my $map = eval { 2676 my $map = eval {
2436 my $map = cf::map::find $path; 2677 my $map = defined $path ? cf::map::find $path : undef;
2437 2678
2438 if ($map) { 2679 if ($map) {
2439 $map = $map->customise_for ($self); 2680 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2681 $map = $check->($map) if $check && $map;
2441 } else { 2682 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2684 }
2444 2685
2445 $map 2686 $map
2446 }; 2687 };
2447 2688
2483} 2724}
2484 2725
2485sub prepare_random_map { 2726sub prepare_random_map {
2486 my ($exit) = @_; 2727 my ($exit) = @_;
2487 2728
2488 my $guard = cf::lock_acquire "exit_prepare:$exit";
2489
2490 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2491 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2492 # that depends on the exit object 2731 # that depends on the exit object
2493 2732
2494 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2496 if ($exit->map) { 2735 if ($exit->map) {
2497 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2498 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2499 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2500 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2501 } 2742 }
2502 2743
2503 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2504 2745
2505 my $data = cf::to_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2506 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2507 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2508 2749
2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2510 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2511 undef $fh; 2752 undef $fh;
2512 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2513 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2514 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2515 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2516 } 2761 }
2517} 2762}
2518 2763
2519sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2520 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2521 2766
2522 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2523 2768
2524 if ($exit->slaying eq "/!") {
2525 #TODO: this should de-fi-ni-te-ly not be a sync-job
2526 # the problem is that $exit might not survive long enough
2527 # so it needs to be done right now, right here
2528 cf::sync_job { prepare_random_map $exit };
2529 }
2530
2531 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2532 my $hp = $exit->stats->hp;
2533 my $sp = $exit->stats->sp;
2534
2535 $self->enter_link; 2769 $self->enter_link;
2536 2770
2537 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED);
2540
2541 (async { 2771 (async {
2542 $self->deactivate_recursive; # just to be sure 2772 $Coro::current->{desc} = "enter_exit";
2773
2543 unless (eval { 2774 unless (eval {
2775 $self->deactivate_recursive; # just to be sure
2776
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2786 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp;
2788
2544 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2545 2790
2791 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y)
2793 if $exit->flag (cf::FLAG_DAMNED);
2794
2546 1; 2795 1
2547 }) { 2796 }) {
2548 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2549 . "I'll try to bring you back to the map you were before. " 2798 . "I'll try to bring you back to the map you were before. "
2550 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2551 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2552 2801
2553 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2570sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2571 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2572 2821
2573 utf8::encode $text; 2822 utf8::encode $text;
2574 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2824}
2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2575} 2849}
2576 2850
2577=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2578 2852
2579Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2581the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet. 2856the message unless the client supports the msg packet.
2583 2857
2584=cut 2858=cut
2585 2859
2860# non-persistent channels (usually the info channel)
2586our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2587 "c/identify" => { 2868 "c/identify" => {
2588 id => "identify", 2869 id => "infobox",
2589 title => "Identify", 2870 title => "Identify",
2590 reply => undef, 2871 reply => undef,
2591 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2592 }, 2873 },
2593 "c/examine" => { 2874 "c/examine" => {
2594 id => "examine", 2875 id => "infobox",
2595 title => "Examine", 2876 title => "Examine",
2596 reply => undef, 2877 reply => undef,
2597 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2598 }, 2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2885 },
2886 "c/book" => {
2887 id => "infobox",
2888 title => "Book",
2889 reply => undef,
2890 tooltip => "The contents of a note or book",
2891 },
2892 "c/lookat" => {
2893 id => "infobox",
2894 title => "Look",
2895 reply => undef,
2896 tooltip => "What you saw there",
2897 },
2898 "c/who" => {
2899 id => "infobox",
2900 title => "Players",
2901 reply => undef,
2902 tooltip => "Shows players who are currently online",
2903 },
2904 "c/body" => {
2905 id => "infobox",
2906 title => "Body Parts",
2907 reply => undef,
2908 tooltip => "Shows which body parts you posess and are available",
2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2916 "c/skills" => {
2917 id => "infobox",
2918 title => "Skills",
2919 reply => undef,
2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2945 },
2946 "c/uptime" => {
2947 id => "infobox",
2948 title => "Uptime",
2949 reply => undef,
2950 tooltip => "How long the server has been running since last restart",
2951 },
2952 "c/mapinfo" => {
2953 id => "infobox",
2954 title => "Map Info",
2955 reply => undef,
2956 tooltip => "Information related to the maps",
2957 },
2958 "c/party" => {
2959 id => "party",
2960 title => "Party",
2961 reply => "gsay ",
2962 tooltip => "Messages and chat related to your party",
2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2599); 2972);
2600 2973
2601sub cf::client::send_msg { 2974sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2976
2604 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2605 2979
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2981
2608 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2983 if ($CHANNEL{$channel}) {
2984 $channel = $CHANNEL{$channel};
2610 2985
2986 $self->ext_msg (channel_info => $channel);
2987 $channel = $channel->{id};
2988
2611 if (ref $channel) { 2989 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2616 if $self->can_msg;
2617 } 2994 }
2618 2995
2619 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2620 } 2997 }
2621 2998
2622 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2623 3000
2624 if ($self->can_msg) {
2625 # default colour, mask it out 3001 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2628 3004
2629 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2631 } else { 3008 );
2632 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones
2634 for ($msg) {
2635 1 while
2636 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2637 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2638 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2639 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2640 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2641 }
2642 3009
2643 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2644
2645 utf8::encode $msg;
2646
2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2650 } else {
2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2652 $self->send_packet ("drawinfo $color $msg")
2653 }
2654 }
2655 }
2656} 3011}
2657 3012
2658=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2659 3014
2660Sends an ext event to the client. 3015Sends an ext event to the client.
2663 3018
2664sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2665 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2666 3021
2667 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2670 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2672 } 3027 }
2673} 3028}
2674 3029
2675=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2676 3031
2680 3035
2681sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2682 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2683 3038
2684 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2686 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2687 #TODO: version 1, remove 3042 #TODO: version 1, remove
2688 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2690 } 3045 }
2691} 3046}
2692 3047
2693=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2694 3049
2795 3150
2796 $coro 3151 $coro
2797} 3152}
2798 3153
2799cf::client->attach ( 3154cf::client->attach (
2800 on_destroy => sub { 3155 on_client_destroy => sub {
2801 my ($ns) = @_; 3156 my ($ns) = @_;
2802 3157
2803 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2804 }, 3159 },
2805); 3160);
2821our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
2822 3177
2823$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
2824 3179
2825$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
2826 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
2827 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
2828 sort time 3183 sort time
2829)); 3184));
2830 3185
2831# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
2833=pod 3188=pod
2834 3189
2835The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
2836 3191
2837 cf::object 3192 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 3193 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
2840 3196
2841 cf::object::player 3197 cf::object::player
2842 player 3198 player
2843 3199
2844 cf::player 3200 cf::player
2849 3205
2850=cut 3206=cut
2851 3207
2852for ( 3208for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
2855 decrease_ob_nr)], 3211 decrease split destroy change_exp value msg lore send_msg)],
2856 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
2858 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
2859) { 3215) {
2860 no strict 'refs'; 3216 no strict 'refs';
2861 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
2862 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2880 3236
2881 my $qcode = $code; 3237 my $qcode = $code;
2882 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2883 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
2884 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
2885 local $_; 3244 local $_;
2886 local @safe::cf::_safe_eval_args = values %vars;
2887 3245
2888 my $eval = 3246 my $eval =
2889 "do {\n" 3247 "do {\n"
2890 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2891 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
2892 . $code 3250 . $code
2893 . "\n}" 3251 . "\n}"
2894 ; 3252 ;
2895 3253
3254 if ($CFG{safe_eval}) {
2896 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
2897 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2898 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
2899 3263
2900 if ($@) { 3264 if ($@) {
2901 warn "$@"; 3265 warn "$@";
2902 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
2903 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
2922=cut 3286=cut
2923 3287
2924sub register_script_function { 3288sub register_script_function {
2925 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
2926 3290
2927 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
2928 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
2929} 3293}
2930 3294
2931=back 3295=back
2932 3296
2933=cut 3297=cut
2954 3318
2955 $facedata->{version} == 2 3319 $facedata->{version} == 2
2956 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
2957 3321
2958 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2959 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
2960 type => FT_RSRC, 3325 type => FT_RSRC,
2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
2962 }; 3328 };
2963 cf::cede_to_tick; 3329 cf::cede_to_tick;
2964 3330
2965 { 3331 {
2966 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
2967 3333
2968 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
2969 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336
2970 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2974 3341
2975 cf::cede_to_tick; 3342 cf::cede_to_tick;
2976 } 3343 }
2977 3344
2978 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
2979 next unless $info->{smooth}; 3346 next unless $info->{smooth};
3347
2980 my $idx = cf::face::find $face 3348 my $idx = cf::face::find $face
2981 or next; 3349 or next;
3350
2982 if (my $smooth = cf::face::find $info->{smooth}) { 3351 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth; 3352 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2985 } else { 3354 } else {
2986 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3355 warn "smooth face '$info->{smooth}' not found for face '$face'";
3000 3369
3001 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3002 } 3371 }
3003 3372
3004 { 3373 {
3005 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3008 3375
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
3014 3379
3015 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3016 # prepend meta info 3381 cf::face::set_type $idx, $info->{type};
3017
3018 my $meta = $enc->encode ({
3019 name => $name,
3020 %{ $info->{meta} || {} },
3021 });
3022
3023 $data = pack "(w/a*)*", $meta, $info->{data};
3024 } else { 3382 } else {
3025 $data = $info->{data}; 3383 $RESOURCE{$name} = $info;
3026 } 3384 }
3027 3385
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick; 3386 cf::cede_to_tick;
3032 } 3387 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
3051 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3052 3391
3053 1 3392 1
3054} 3393}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3055 3414
3056register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
3058 3417
3059 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
3061 } 3420 }
3062}; 3421};
3422
3423sub load_resource_file($) {
3424 my $guard = lock_acquire "load_resource_file";
3425
3426 my $status = load_resource_file_ $_[0];
3427 get_slot 0.1, 100;
3428 cf::arch::commit_load;
3429
3430 $status
3431}
3063 3432
3064sub reload_regions { 3433sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework 3434 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?) 3435 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
3081} 3450}
3082 3451
3083sub reload_archetypes { 3452sub reload_archetypes {
3084 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
3085 or die "unable to load archetypes\n"; 3454 or die "unable to load archetypes\n";
3086 #d# NEED to laod twice to resolve forward references
3087 # this really needs to be done in an extra post-pass
3088 # (which needs to be synchronous, so solve it differently)
3089 load_resource_file "$DATADIR/archetypes"
3090 or die "unable to load archetypes\n";
3091} 3455}
3092 3456
3093sub reload_treasures { 3457sub reload_treasures {
3094 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
3095 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
3096} 3460}
3097 3461
3098sub reload_resources { 3462sub reload_resources {
3099 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3100 3464
3465 reload_facedata;
3466 reload_archetypes;
3101 reload_regions; 3467 reload_regions;
3102 reload_facedata;
3103 #reload_archetypes;#d#
3104 reload_archetypes;
3105 reload_treasures; 3468 reload_treasures;
3106 3469
3107 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3108} 3471}
3109 3472
3110sub init {
3111 reload_resources;
3112}
3113
3114sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3115 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3116 or return; 3477 or return;
3117 3478
3118 local $/; 3479 local $/;
3119 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3120 3481
3121 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3122 3483
3123 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3124 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3128 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3129 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3130 }; 3491 };
3131 warn $@ if $@; 3492 warn $@ if $@;
3132 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3496}
3497
3498sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!";
3501 flock $fh, &Fcntl::LOCK_EX
3502 or die "$PIDFILE: flock: $!";
3503 $fh
3504}
3505
3506# make sure only one server instance is running at any one time
3507sub atomic {
3508 my $fh = pidfile;
3509
3510 my $pid = <$fh>;
3511 kill 9, $pid if $pid > 0;
3512
3513 seek $fh, 0, 0;
3514 print $fh $$;
3515}
3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3133} 3524}
3134 3525
3135sub main { 3526sub main {
3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540
3136 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3544 (async {
3140 Event::one_event; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3546 EV::loop EV::LOOP_ONESHOT;
3141 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3142 }; 3548 };
3143 3549
3550 evthread_start IO::AIO::poll_fileno;
3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3144 reload_config; 3557 reload_config;
3145 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3146 load_extensions; 3568 load_extensions;
3147 3569
3148 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3149 Event::loop; 3571
3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575
3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3150} 3580}
3151 3581
3152############################################################################# 3582#############################################################################
3153# initialisation and cleanup 3583# initialisation and cleanup
3154 3584
3155# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3156BEGIN { 3586BEGIN {
3587 our %SIGWATCHER = ();
3157 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3158 Event->signal ( 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3159 reentrant => 0,
3160 data => WF_AUTOCANCEL,
3161 signal => $signal,
3162 prio => 0,
3163 cb => sub {
3164 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3165 },
3166 ); 3591 };
3167 } 3592 }
3168} 3593}
3169 3594
3170sub write_runtime { 3595sub write_runtime_sync {
3171 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = AE::time;
3172 3597
3173 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3174 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3175 3600
3176 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3177 3602
3178 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3179 3604
3180 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3181 or return; 3606 or return;
3182 3607
3183 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3184 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3185 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3195 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3196 3621
3197 close $fh 3622 close $fh
3198 or return; 3623 or return;
3199 3624
3200 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3201 and return; 3626 and return;
3202 3627
3203 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3204 3629
3205 1 3630 1
3631}
3632
3633our $uuid_lock;
3634our $uuid_skip;
3635
3636sub write_uuid_sync($) {
3637 $uuid_skip ||= $_[0];
3638
3639 return if $uuid_lock;
3640 local $uuid_lock = 1;
3641
3642 my $uuid = "$LOCALDIR/uuid";
3643
3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3645 or return;
3646
3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0;
3656
3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3658 and return;
3659
3660 # always fsync - this file is important
3661 aio_fsync $fh
3662 and return;
3663
3664 close $fh
3665 or return;
3666
3667 aio_rename "$uuid~", $uuid
3668 and return;
3669
3670 warn "uuid file written ($value).\n";
3671
3672 1
3673
3674}
3675
3676sub write_uuid($$) {
3677 my ($skip, $sync) = @_;
3678
3679 $sync ? write_uuid_sync $skip
3680 : async { write_uuid_sync $skip };
3206} 3681}
3207 3682
3208sub emergency_save() { 3683sub emergency_save() {
3209 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3210 3685
3211 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3212 3687
3213 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3214 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3215 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3216 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3218 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3700 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3702 $pl->save;
3222 } 3703 }
3223 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3224 3705
3225 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3226 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3227 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3228 $map->valid or next; 3709 $map->valid or next;
3229 $map->save; 3710 $map->save;
3230 } 3711 }
3231 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3232 3713
3233 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3234 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3235 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3717
3718 warn "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n";
3236 }; 3721 };
3237 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3238 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3239} 3729}
3240 3730
3241sub post_cleanup { 3731sub post_cleanup {
3242 my ($make_core) = @_; 3732 my ($make_core) = @_;
3243 3733
3244 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3245 if $make_core; 3735 if $make_core;
3736
3737 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$;
3739}
3740
3741# a safer delete_package, copied from Symbol
3742sub clear_package($) {
3743 my $pkg = shift;
3744
3745 # expand to full symbol table name if needed
3746 unless ($pkg =~ /^main::.*::$/) {
3747 $pkg = "main$pkg" if $pkg =~ /^::/;
3748 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3749 $pkg .= '::' unless $pkg =~ /::$/;
3750 }
3751
3752 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3753 my $stem_symtab = *{$stem}{HASH};
3754
3755 defined $stem_symtab and exists $stem_symtab->{$leaf}
3756 or return;
3757
3758 # clear all symbols
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 }
3764 warn "cleared package $pkg\n";#d#
3246} 3765}
3247 3766
3248sub do_reload_perl() { 3767sub do_reload_perl() {
3249 # can/must only be called in main 3768 # can/must only be called in main
3250 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3251 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3252 return; 3771 return;
3253 } 3772 }
3254 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = AE::time;
3777
3778 while ($RELOAD) {
3255 warn "reloading..."; 3779 warn "reloading...";
3256 3780
3257 warn "entering sync_job"; 3781 warn "entering sync_job";
3258 3782
3259 cf::sync_job { 3783 cf::sync_job {
3260 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3261 cf::emergency_save; 3785 cf::emergency_save;
3262 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3263 3787
3264 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3265 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3266 3790
3267 # if anything goes wrong in here, we should simply crash as we already saved 3791 # if anything goes wrong in here, we should simply crash as we already saved
3268 3792
3269 warn "cancelling all WF_AUTOCANCEL watchers";
3270 for (Event::all_watchers) {
3271 $_->cancel if $_->data & WF_AUTOCANCEL;
3272 }
3273
3274 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3275 for (;;) {
3276 BDB::flush;
3277 IO::AIO::flush;
3278 Coro::cede;
3279 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3280 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3281 }
3282
3283 ++$RELOAD;
3284
3285 warn "cancelling all extension coros";
3286 $_->cancel for values %EXT_CORO;
3287 %EXT_CORO = ();
3288
3289 warn "removing commands";
3290 %COMMAND = ();
3291
3292 warn "removing ext/exti commands";
3293 %EXTCMD = ();
3294 %EXTICMD = ();
3295
3296 warn "unloading/nuking all extensions";
3297 for my $pkg (@EXTS) {
3298 warn "... unloading $pkg";
3299
3300 if (my $cb = $pkg->can ("unload")) {
3301 eval {
3302 $cb->($pkg);
3303 1
3304 } or warn "$pkg unloaded, but with errors: $@";
3305 } 3796 }
3306 3797
3307 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3308 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3309 } 3800 %EXT_CORO = ();
3310 3801
3311 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3312 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3313 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3314 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3315 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3316 delete $INC{$k};
3317 3812
3318 $k =~ s/\.pm$//;
3319 $k =~ s/\//::/g;
3320
3321 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3322 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3323 } 3822 }
3324 3823
3325 Symbol::delete_package $k; 3824 warn "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827
3828 warn "... unloading $k";
3829 delete $INC{$k};
3830
3831 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g;
3833
3834 if (my $cb = $k->can ("unload_module")) {
3835 $cb->();
3836 }
3837
3838 clear_package $k;
3326 } 3839 }
3327 3840
3328 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3329 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3330 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3331 3844
3332 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3333 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3334 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3335 3848
3336 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3337 # and global variables created in xs 3850 # and global variables created in xs
3338 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3339 3852
3340 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3341 3854
3342 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3343 require cf; 3856 require cf;
3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3345 3858
3346 warn "loading config and database again"; 3859 warn "loading config and database again";
3347 cf::reload_config; 3860 cf::reload_config;
3348 3861
3349 warn "loading extensions"; 3862 warn "loading extensions";
3350 cf::load_extensions; 3863 cf::load_extensions;
3351 3864
3865 if ($REATTACH_ON_RELOAD) {
3352 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3353 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3354 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3355 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3356 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3357 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3358 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3359 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3360 3878
3361 1 3879 1
3362 } or do { 3880 } or do {
3363 warn $@; 3881 warn $@;
3364 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3365 exit 1;
3366 }; 3883 };
3367 3884
3368 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3369}; 3891};
3370 3892
3371our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3372 3894
3373sub reload_perl() { 3895sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3376 3898
3377 $RELOAD_WATCHER ||= Event->timer ( 3899 $RELOAD_WATCHER ||= cf::async {
3378 reentrant => 0, 3900 Coro::AIO::aio_wait cache_extensions;
3379 after => 0, 3901
3380 data => WF_AUTOCANCEL, 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3381 cb => sub {
3382 do_reload_perl; 3903 do_reload_perl;
3383 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3384 }, 3905 };
3385 ); 3906 };
3386} 3907}
3387 3908
3388register_command "reload" => sub { 3909register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3390 3911
3391 if ($who->flag (FLAG_WIZ)) { 3912 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3913 $who->message ("reloading server.");
3914 async {
3915 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3916 reload_perl;
3917 };
3394 } 3918 }
3395}; 3919};
3396 3920
3397unshift @INC, $LIBDIR; 3921unshift @INC, $LIBDIR;
3398 3922
3400 3924
3401our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3402our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3403 3927
3404sub wait_for_tick { 3928sub wait_for_tick {
3405 return unless $TICK_WATCHER->is_active;
3406 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3407 3930
3408 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3409 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3410 $signal->wait; 3933 $signal->wait;
3411} 3934}
3412 3935
3413sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3414 return unless $TICK_WATCHER->is_active;
3415 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3416 3938
3417 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3941 $signal->wait;
3420} 3942}
3421 3943
3422 my $min = 1e6;#d# 3944sub tick {
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer (
3425 reentrant => 0,
3426 parked => 1,
3427 prio => 0,
3428 at => $NEXT_TICK || $TICK,
3429 data => WF_AUTOCANCEL,
3430 cb => sub {
3431 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3433 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3434 return; 3948 return;
3435 } 3949 }
3436 3950
3437 $NOW = $tick_start = Event::time;
3438
3439 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3440 3952
3441 0 && sync_job {#d# 3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3442 for(1..10) {
3443 my $t = Event::time;
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3445 or die;
3446 3954
3447 $map->width (50); 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3448 $map->height (50); 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3449 $map->alloc; 3957 Coro::async_pool {
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3958 $Coro::current->{desc} = "runtime saver";
3451 my $t = Event::time - $t; 3959 write_runtime_sync
3452 3960 or warn "ERROR: unable to write runtime file: $!";
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 }; 3961 };
3962 }
3463 3963
3464 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK;
3466
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool {
3470 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!";
3472 };
3473 }
3474
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3965 $sig->send;
3480 } 3966 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3968 $sig->send;
3483 } 3969 }
3484 3970
3485 $NOW = Event::time; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3486
3487 # if we are delayed by four ticks or more, skip them all
3488 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3489
3490 $TICK_WATCHER->at ($NEXT_TICK);
3491 $TICK_WATCHER->start;
3492
3493 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3973
3496 _post_tick; 3974 if (0) {
3497 3975 if ($NEXT_TICK) {
3498 3976 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d#
3979 }
3499 }, 3980 }
3500); 3981}
3501 3982
3502{ 3983{
3503 BDB::max_poll_time $TICK * 0.1; 3984 # configure BDB
3504 $BDB_POLL_WATCHER = Event->io ( 3985
3505 reentrant => 0,
3506 fd => BDB::poll_fileno,
3507 poll => 'r',
3508 prio => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb,
3511 );
3512 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3513 3987 BDB::max_poll_reqs $TICK * 0.1;
3514 BDB::set_sync_prepare { 3988 $AnyEvent::BDB::WATCHER->priority (1);
3515 my $status;
3516 my $current = $Coro::current;
3517 (
3518 sub {
3519 $status = $!;
3520 $current->ready; undef $current;
3521 },
3522 sub {
3523 Coro::schedule while defined $current;
3524 $! = $status;
3525 },
3526 )
3527 };
3528 3989
3529 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3994 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3997
3532 cf::sync_job { 3998 cf::sync_job {
3533 eval { 3999 eval {
3534 BDB::db_env_open 4000 BDB::db_env_open
3535 $DB_ENV, 4001 $DB_ENV,
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4003 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4004 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 4005 0666;
3540 4006
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4007 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 4008 };
3546 4009
3547 cf::cleanup "db_env_open(db): $@" if $@; 4010 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 4011 };
3549 } 4012 }
4013
4014 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4015 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4016 };
4017 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4018 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4019 };
4020 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4021 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4022 };
3550} 4023}
3551 4024
3552{ 4025{
4026 # configure IO::AIO
4027
3553 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3554
3555 undef $Coro::AIO::WATCHER;
3556 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
3557 $AIO_POLL_WATCHER = Event->io ( 4030 undef $AnyEvent::AIO::WATCHER;
3558 reentrant => 0,
3559 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno,
3561 poll => 'r',
3562 prio => 6,
3563 cb => \&IO::AIO::poll_cb,
3564 );
3565} 4031}
3566 4032
3567my $_log_backtrace; 4033my $_log_backtrace;
3568 4034
3569sub _log_backtrace { 4035sub _log_backtrace {
3572 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3573 4039
3574 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3577 async { 4044 async {
4045 $Coro::current->{desc} = "abt $msg";
4046
3578 my @bt = fork_call { 4047 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4049 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4050 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 4051 or die "addr2line: $!";
3590 } 4059 }
3591 4060
3592 @funcs 4061 @funcs
3593 }; 4062 };
3594 4063
3595 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3596 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3597 --$_log_backtrace; 4067 --$_log_backtrace;
3598 }; 4068 };
3599 } else { 4069 } else {
3600 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3601 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3602 } 4072 }
3603} 4073}
3604 4074
3605# load additional modules 4075# load additional modules
3606use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3607 4078
3608END { cf::emergency_save } 4079END { cf::emergency_save }
3609 4080
36101 40811
3611 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines