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.362 by root, Mon Sep 10 12:44:06 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 LOG llevError, $msg; 255 LOG llevError, $msg;
193 }; 256};
194} 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};
195 271
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 282for my $pkg (qw(
207 cf::global cf::attachable 283 cf::global cf::attachable
208 cf::object cf::object::player 284 cf::object cf::object::player
209 cf::client cf::player 285 cf::client cf::player
210 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
211 cf::map cf::party cf::region 288 cf::party cf::region
212)) { 289)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 291}
216 292
217$Event::DIED = sub { 293$EV::DIED = sub {
218 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
219}; 295};
220 296
221############################################################################# 297#############################################################################
222 298
223=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
245 $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;
246 $d 322 $d
247 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
248} 324}
249 325
250=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
251 327
252Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
253 329
254=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
255 331
256Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
257 333
258=cut 334=cut
259 335
260our $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
261 337
262sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
263sub 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}
264 354
265=item cf::lock_wait $string 355=item cf::lock_wait $string
266 356
267Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
268 358
269=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
270 360
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
274returned. 364returned.
275 365
276Locks 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
277deadlocked coro. 367deadlocked coro.
283 373
284Return 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.
285 375
286=cut 376=cut
287 377
288our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
289our %LOCKER;#d#
290 379
291sub lock_wait($) { 380sub lock_wait($) {
292 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
298
299 # wait for lock, if any
300 while ($LOCK{$key}) {
301 push @{ $LOCK{$key} }, $Coro::current;
302 Coro::schedule;
303 }
304} 382}
305 383
306sub lock_acquire($) { 384sub lock_acquire($) {
307 my ($key) = @_; 385 $LOCKS->guard ($_[0])
308
309 # wait, to be sure we are not locked
310 lock_wait $key;
311
312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
314
315 Coro::guard {
316 delete $LOCKER{$key};#d#
317 # wake up all waiters, to be on the safe side
318 $_->ready for @{ delete $LOCK{$key} };
319 }
320} 386}
321 387
322sub lock_active($) { 388sub lock_active($) {
323 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
324
325 ! ! $LOCK{$key}
326} 390}
327 391
328sub freeze_mainloop { 392sub freeze_mainloop {
329 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
330 394
331 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
332 $TICK_WATCHER->start; 396}
333 }; 397
334 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
335 $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
336} 411}
337 412
338=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
339 414
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
348 423
349=cut 424=cut
350 425
351our @SLOT_QUEUE; 426our @SLOT_QUEUE;
352our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
353 429
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
356 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
357 436
358 while () { 437 while () {
359 next_job: 438 next_job:
439
360 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
361 if ($avail > 0.01) { 441
362 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
363 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
364 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
365 $job->[2]->send; 446 $job->[2]->send;
366 Coro::cede; 447 Coro::cede;
367 goto next_job; 448 goto next_job;
368 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
369 } 451 }
370 } 452 }
371 453
372 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
373 # 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
374 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 457 $signal->wait;
376 } else { 458 } else {
459 $busy = 0;
377 Coro::schedule; 460 Coro::schedule;
378 } 461 }
379 } 462 }
380}; 463};
381 464
382sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
383 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
384 469
385 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
386 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
387 473
388 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
389 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
390 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
401 487
402BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
403 489
404=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
405 491
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
408partly 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
409acceptable. 495acceptable.
410 496
411If 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
412the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
417 503
418sub sync_job(&) { 504sub sync_job(&) {
419 my ($job) = @_; 505 my ($job) = @_;
420 506
421 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
422 my $time = Event::time; 508 my $time = AE::time;
423 509
424 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
426 512
427 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
428 # (but this is cancel-safe) 514
429 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
430 516
431 my $busy = 1; 517 my $busy = 1;
432 my @res; 518 my @res;
433 519
434 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 522 @res = eval { $job->() };
436 warn $@ if $@; 523 warn $@ if $@;
437 undef $busy; 524 undef $busy;
438 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
439 526
440 while ($busy) { 527 while ($busy) {
441 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
442 } 532 }
533 }
443 534
444 $time = Event::time - $time; 535 my $time = AE::time - $time;
445 536
446 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448
449 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
450 538
451 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
452 } else { 540 } else {
453 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
454 542
479=item fork_call { }, $args 567=item fork_call { }, $args
480 568
481Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
485 573
486=cut 574=cut
487 575
488sub fork_call(&@) { 576sub fork_call(&@) {
489 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
498 }, @args; 586 }, @args;
499 587
500 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
501} 589}
502 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
503=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
504 619
505Returns a single value from the environment database. 620Returns a single value from the environment database.
506 621
507=item cf::db_put $family => $key => $value 622=item cf::db_put $family => $key => $value
508 623
509Stores 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
510data 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).
511 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
512=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}
513 650
514our $DB; 651our $DB;
515 652
516sub db_init { 653sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 654 cf::sync_job {
521 eval { 655 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 656 };
531} 657}
532 658
533sub db_get($$) { 659sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 660 my $key = "$_[0]/$_[1]";
535 661
633 759
634############################################################################# 760#############################################################################
635 761
636=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
637 763
638Many 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
639attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
641 767
642In 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>
643C<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
644Crossfire TRT). 770Deliantra).
645 771
646=over 4 772=over 4
647 773
648=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
649 775
693=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
694 820
695Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
696given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
697 823
698Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
699that 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.
700 826
701These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
702 828
703=over 4 829=over 4
931 } 1057 }
932 1058
933 0 1059 0
934} 1060}
935 1061
936=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
937 1063
938=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
939 1065
940Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
941 1067
947 1073
948=cut 1074=cut
949 1075
950############################################################################# 1076#############################################################################
951# object support 1077# object support
952#
953 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#
954sub _can_merge { 1112sub _can_merge {
955 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
956 1114
957 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1116
961 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
962} 1119}
963 1120
964sub reattach { 1121sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1123 my ($obj) = @_;
967 1124
1125 # no longer needed after getting rid of delete_package?
968 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
969 1127
970 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
971 1129
972 @$registry = (); 1130 @$registry = ();
973 1131
988cf::attachable->attach ( 1146cf::attachable->attach (
989 prio => -1000000, 1147 prio => -1000000,
990 on_instantiate => sub { 1148 on_instantiate => sub {
991 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
992 1150
993 $data = from_json $data; 1151 $data = decode_json $data;
994 1152
995 for (@$data) { 1153 for (@$data) {
996 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
997 1155
998 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1011 }, 1169 },
1012); 1170);
1013 1171
1014sub object_freezer_save { 1172sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1016
1017 my $guard = cf::lock_acquire "io";
1018 1174
1019 sync_job { 1175 sync_job {
1020 if (length $$rdata) { 1176 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1023 $decname, 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
1083 utf8::decode (my $decname = $filename); 1244 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1146 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1147 1308
1148 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1149} 1310}
1150 1311
1312use File::Glob ();
1313
1151cf::player->attach ( 1314cf::player->attach (
1152 on_command => sub { 1315 on_unknown_command => sub {
1153 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1154 1317
1155 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1156 or return; 1319 or return;
1157 1320
1187 1350
1188 cf::override; 1351 cf::override;
1189 }, 1352 },
1190); 1353);
1191 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
1192sub load_extensions { 1368sub load_extensions {
1193 cf::sync_job { 1369 cf::sync_job {
1194 my %todo; 1370 my %todo;
1195 1371
1196 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1215 1391
1216 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1217 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1218 1394
1219 $ext{source} = 1395 $ext{source} =
1220 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1221 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1222 . $source 1398 . $source
1223 . "\n};\n1"; 1399 . "\n};\n1";
1224 1400
1225 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1226 } 1402 }
1227 1403
1404 my $pass = 0;
1228 my %done; 1405 my %done;
1229 while (%todo) { 1406 while (%todo) {
1230 my $progress; 1407 my $progress;
1231 1408
1409 ++$pass;
1410
1411 ext:
1232 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1233 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1234 goto skip 1414 next ext
1235 unless exists $done{$_}; 1415 unless exists $done{$_};
1236 } 1416 }
1237 1417
1238 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1239 1419
1240 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1241 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1242 : "$v->{base}: extension inactive.\n";
1243 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1244 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1245 warn $msg; 1427 } else {
1246 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1247 exit 1; 1429 push @EXTS, $v->{pkg};
1248 } 1430 $progress = 1;
1249 1431
1250 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1251 } 1434 }
1252
1253 $done{$k} = delete $todo{$k};
1254 push @EXTS, $v->{pkg};
1255 $progress = 1;
1256 } 1435 }
1257 1436
1258 skip: 1437 unless ($progress) {
1259 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1260 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 }
1261 } 1445 }
1262 }; 1446 };
1263} 1447}
1264 1448
1265############################################################################# 1449#############################################################################
1266 1450
1267=back 1451=back
1268 1452
1269=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1270 1454
1271Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1272 1456
1273=cut 1457=cut
1274 1458
1275package cf::player; 1459package cf::player;
1276 1460
1319 1503
1320sub exists($) { 1504sub exists($) {
1321 my ($login) = @_; 1505 my ($login) = @_;
1322 1506
1323 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1324 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1325} 1509}
1326 1510
1327sub find($) { 1511sub find($) {
1328 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1329 my $login = $_[0]; 1513 my $login = $_[0];
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1524
1341 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1526 or return;
1343 1527
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1346 or return; 1529 or return;
1530
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1350 } 1534 }
1351 } 1535 }
1352} 1536}
1353 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
1354sub save($) { 1551sub save($) {
1355 my ($pl) = @_; 1552 my ($pl) = @_;
1356 1553
1357 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1358 1555
1361 1558
1362 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1363 1560
1364 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1365 $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];
1366 1568
1367 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1368 cf::cede_to_tick; 1570 cf::cede_to_tick;
1369} 1571}
1370 1572
1402 my ($pl) = @_; 1604 my ($pl) = @_;
1403 1605
1404 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1405 1607
1406 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1407 $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
1408 1610
1409 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1410 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1411 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1412 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1413 1617
1414 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1415 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1454 1658
1455 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1456 my $path = path $login; 1660 my $path = path $login;
1457 1661
1458 # a .pst is a dead give-away for a valid player 1662 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") { 1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1461 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1462 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 } 1668 }
1464 1669
1495 } 1700 }
1496 1701
1497 \@paths 1702 \@paths
1498} 1703}
1499 1704
1500=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1501 1706
1502Expand crossfire pod fragments into protocol xml. 1707Expand deliantra pod fragments into protocol xml.
1503
1504=cut
1505
1506sub expand_cfpod {
1507 ((my $self), (local $_)) = @_;
1508
1509 # escape & and <
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512
1513 # this is buggy, it needs to properly take care of nested <'s
1514
1515 1 while
1516 # replace B<>, I<>, U<> etc.
1517 s/B<([^\>]*)>/<b>$1<\/b>/
1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1521 # replace G<male|female> tags
1522 || s{G<([^>|]*)\|([^>]*)>}{
1523 $self->gender ? $2 : $1
1524 }ge
1525 # replace H<hint text>
1526 || s{H<([^\>]*)>}
1527 {
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "")
1531 [$self->{hintmode}]
1532 }ge;
1533
1534 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g;
1536
1537 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines
1542
1543 $_
1544}
1545
1546sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode}
1549}
1550 1708
1551=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1552 1710
1553Sends an ext reply to the player. 1711Sends an ext reply to the player.
1554 1712
1621our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1622our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1623 1781
1624sub generate_random_map { 1782sub generate_random_map {
1625 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
1626 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1627 $self->_create_random_map ( 1788 $self->_create_random_map (
1628 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1629 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1630 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1631 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1632 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1633 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1634 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1752 1913
1753# the temporary/swap location 1914# the temporary/swap location
1754sub save_path { 1915sub save_path {
1755 my ($self) = @_; 1916 my ($self) = @_;
1756 1917
1757 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1758 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1759} 1920}
1760 1921
1761# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1762sub uniq_path { 1923sub uniq_path {
1763 my ($self) = @_; 1924 my ($self) = @_;
1764 1925
1765 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1766 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1767}
1768
1769# and all this just because we cannot iterate over
1770# all maps in C++...
1771sub change_all_map_light {
1772 my ($change) = @_;
1773
1774 $_->change_map_light ($change)
1775 for grep $_->outdoor, values %cf::MAP;
1776} 1928}
1777 1929
1778sub decay_objects { 1930sub decay_objects {
1779 my ($self) = @_; 1931 my ($self) = @_;
1780 1932
1864sub find { 2016sub find {
1865 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1866 2018
1867 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1868 2020
1869 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1870 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1871 2023
1872 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1876 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1877 or return; 2026 or return;
1878 2027
1879 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1880 2029
1882 or return; 2031 or return;
1883 2032
1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1885 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1886 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
1887 undef $guard1; 2037 undef $guard1;
1888 undef $guard2;
1889 $map->reset; 2038 $map->reset;
1890 return find $path; 2039 return find $path;
1891 } 2040 }
1892 2041
1893 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1894 } 2043 }
1895} 2044}
1896 2045
1897sub pre_load { } 2046sub pre_load { }
1898sub post_load { } 2047#sub post_load { } # XS
1899 2048
1900sub load { 2049sub load {
1901 my ($self) = @_; 2050 my ($self) = @_;
1902 2051
1903 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
1920 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block; 2070 $f->skip_block;
1922 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
1923 or return; 2072 or return;
1924 2073
1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
1926 if delete $self->{load_original}; 2075 if delete $self->{load_original};
1927 2076
1928 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
1929 utf8::encode $uniq; 2078 utf8::encode $uniq;
1930 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
1948 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
1949 $self->decay_objects; 2098 $self->decay_objects;
1950 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
1951 $self->update_buttons; 2100 $self->update_buttons;
1952 cf::cede_to_tick; 2101 cf::cede_to_tick;
1953 $self->set_darkness_map;
1954 cf::cede_to_tick;
1955 $self->activate; 2102 $self->activate;
1956 } 2103 }
1957 2104
1958 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
1960 2107
1961 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
1962 } 2109 }
1963 2110
1964 $self->post_load; 2111 $self->post_load;
1965} 2112}
1966 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
1967sub customise_for { 2117sub customise_for {
1968 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
1969 2119
1970 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
1971 if $self->per_player; 2121 if $self->per_player;
2024 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
2025 2175
2026 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
2027 2177
2028 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2030 } 2180 }
2031 2181
2032 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
2033 2183
2034 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2185 $Coro::current->{desc} = "map prefetcher";
2186
2035 while (%MAP_PREFETCH) { 2187 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2188 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2189 if (my $map = find $k) {
2038 $map->load if $v; 2190 $map->load if $v;
2039 } 2191 }
2065 return if $self->{deny_save}; 2217 return if $self->{deny_save};
2066 2218
2067 local $self->{last_access} = $self->last_access;#d# 2219 local $self->{last_access} = $self->last_access;#d#
2068 2220
2069 cf::async { 2221 cf::async {
2222 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2071 }; 2224 };
2225
2226 cf::get_slot 0.02;
2072 2227
2073 if ($uniq) { 2228 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2075 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2076 } else { 2231 } else {
2085 $self->save; 2240 $self->save;
2086 2241
2087 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2088 2243
2089 return if $self->players; 2244 return if $self->players;
2090 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2091 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2092 2247
2093 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2094 2249
2095 $self->deactivate; 2250 $self->deactivate;
2120 2275
2121 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2122 2277
2123 return if $self->players; 2278 return if $self->players;
2124 2279
2125 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2126 2281
2127 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2128 2283
2129 # need to save uniques path 2284 # need to save uniques path
2130 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2213 2368
2214sub unique_maps() { 2369sub unique_maps() {
2215 [ 2370 [
2216 map { 2371 map {
2217 utf8::decode $_; 2372 utf8::decode $_;
2218 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2219 ? normalise $_ 2376 : normalise $_
2220 : ()
2221 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2222 ] 2378 ]
2223} 2379}
2224 2380
2225package 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}
2226 2412
2227=back 2413=back
2228 2414
2229=head3 cf::object 2415=head3 cf::object
2230 2416
2234 2420
2235=over 4 2421=over 4
2236 2422
2237=item $ob->inv_recursive 2423=item $ob->inv_recursive
2238 2424
2239Returns 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.
2240 2427
2241=cut 2428=cut
2242 2429
2243sub inv_recursive_; 2430sub inv_recursive_;
2244sub inv_recursive_ { 2431sub inv_recursive_ {
2249 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2250} 2437}
2251 2438
2252=item $ref = $ob->ref 2439=item $ref = $ob->ref
2253 2440
2254creates 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.
2255 2442
2256=item $ob = cf::object::deref ($refstring) 2443=item $ob = cf::object::deref ($refstring)
2257 2444
2258returns 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,
2259even if the object actually exists. May block. 2446even if the object actually exists. May block.
2261=cut 2448=cut
2262 2449
2263sub deref { 2450sub deref {
2264 my ($ref) = @_; 2451 my ($ref) = @_;
2265 2452
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2453 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2454 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2455 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2456 or return;
2273 $pl->ob->uuid eq $uuid 2457 $pl->ob->uuid eq $uuid
2274 or return; 2458 or return;
2294can 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
2295dialogue with the given NPC character. 2479dialogue with the given NPC character.
2296 2480
2297=cut 2481=cut
2298 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
2299# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2300# with dialog boxes. 2498# with dialog boxes.
2301#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
2302sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2303 my ($self, $npc, $msg, $flags) = @_; 2501 my ($self, $npc, $msg, $flags) = @_;
2314 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2315 $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));
2316 2514
2317 } else { 2515 } else {
2318 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2319 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2320 } 2518 }
2321 } 2519 }
2322} 2520}
2323 2521
2324=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2349 2547
2350=item $player_object->enter_link 2548=item $player_object->enter_link
2351 2549
2352Freezes 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}>).
2353 2551
2354The 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.
2355I<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.
2356 2556
2357Will never block. 2557Will never block.
2358 2558
2359=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2360 2560
2412 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2413 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2414 2614
2415 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2416 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2417 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2418 2618
2419 $map->load; 2619 $map->load;
2420 $map->load_neighbours; 2620 $map->load_neighbours;
2421 2621
2422 return unless $self->contr->active; 2622 return unless $self->contr->active;
2423 $self->activate_recursive;
2424 2623
2425 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2426 $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;
2427} 2629}
2428 2630
2429=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2430 2632
2431Moves 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
2432her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2433that 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
2434the 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
2435be called at the end of this process. 2637be called at the end of this process.
2436 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
2437=cut 2642=cut
2438 2643
2439our $GOTOGEN; 2644our $GOTOGEN;
2440 2645
2441sub cf::object::player::goto { 2646sub cf::object::player::goto {
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2651
2447 $self->enter_link; 2652 $self->enter_link;
2448 2653
2449 (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
2450 my $map = eval { 2676 my $map = eval {
2451 my $map = cf::map::find $path; 2677 my $map = defined $path ? cf::map::find $path : undef;
2452 2678
2453 if ($map) { 2679 if ($map) {
2454 $map = $map->customise_for ($self); 2680 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2681 $map = $check->($map) if $check && $map;
2456 } else { 2682 } else {
2457 $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);
2458 } 2684 }
2459 2685
2460 $map 2686 $map
2461 }; 2687 };
2462 2688
2498} 2724}
2499 2725
2500sub prepare_random_map { 2726sub prepare_random_map {
2501 my ($exit) = @_; 2727 my ($exit) = @_;
2502 2728
2503 my $guard = cf::lock_acquire "exit_prepare:$exit";
2504
2505 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2506 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2507 # that depends on the exit object 2731 # that depends on the exit object
2508 2732
2509 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2511 if ($exit->map) { 2735 if ($exit->map) {
2512 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2513 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2514 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2515 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2516 } 2742 }
2517 2743
2518 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2519 2745
2520 my $data = cf::to_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2521 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2523 2749
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2526 undef $fh; 2752 undef $fh;
2527 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2528 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2529 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2530 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2531 } 2761 }
2532} 2762}
2533 2763
2534sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2535 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2536 2766
2537 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2538 2768
2539 if ($exit->slaying eq "/!") {
2540 #TODO: this should de-fi-ni-te-ly not be a sync-job
2541 # the problem is that $exit might not survive long enough
2542 # so it needs to be done right now, right here
2543 cf::sync_job { prepare_random_map $exit };
2544 }
2545
2546 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2547 my $hp = $exit->stats->hp;
2548 my $sp = $exit->stats->sp;
2549
2550 $self->enter_link; 2769 $self->enter_link;
2551 2770
2552 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED);
2555
2556 (async { 2771 (async {
2557 $self->deactivate_recursive; # just to be sure 2772 $Coro::current->{desc} = "enter_exit";
2773
2558 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
2559 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2560 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
2561 1; 2795 1
2562 }) { 2796 }) {
2563 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2564 . "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. "
2565 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2566 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2567 2801
2568 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2585sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2586 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2587 2821
2588 utf8::encode $text; 2822 utf8::encode $text;
2589 $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);
2590} 2849}
2591 2850
2592=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2593 2852
2594Send 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
2596the 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
2597the message unless the client supports the msg packet. 2856the message unless the client supports the msg packet.
2598 2857
2599=cut 2858=cut
2600 2859
2860# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2602 "c/identify" => { 2868 "c/identify" => {
2603 id => "identify", 2869 id => "infobox",
2604 title => "Identify", 2870 title => "Identify",
2605 reply => undef, 2871 reply => undef,
2606 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2607 }, 2873 },
2608 "c/examine" => { 2874 "c/examine" => {
2609 id => "examine", 2875 id => "infobox",
2610 title => "Examine", 2876 title => "Examine",
2611 reply => undef, 2877 reply => undef,
2612 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2613 }, 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,
2614); 2972);
2615 2973
2616sub cf::client::send_msg { 2974sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2976
2619 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2620 2979
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2981
2623 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2983 if ($CHANNEL{$channel}) {
2984 $channel = $CHANNEL{$channel};
2625 2985
2986 $self->ext_msg (channel_info => $channel);
2987 $channel = $channel->{id};
2988
2626 if (ref $channel) { 2989 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2631 if $self->can_msg;
2632 } 2994 }
2633 2995
2634 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2635 } 2997 }
2636 2998
2637 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2638 3000
2639 if ($self->can_msg) {
2640 # default colour, mask it out 3001 # default colour, mask it out
2641 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2642 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2643 3004
2644 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2645 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2646 } else { 3008 );
2647 if ($color >= 0) {
2648 # replace some tags by gcfclient-compatible ones
2649 for ($msg) {
2650 1 while
2651 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2652 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2653 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2654 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2655 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2656 }
2657 3009
2658 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2659
2660 utf8::encode $msg;
2661
2662 if (0 && $msg =~ /\[/) {
2663 # COMMAND/INFO
2664 $self->send_packet ("drawextinfo $color 10 8 $msg")
2665 } else {
2666 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2667 $self->send_packet ("drawinfo $color $msg")
2668 }
2669 }
2670 }
2671} 3011}
2672 3012
2673=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2674 3014
2675Sends an ext event to the client. 3015Sends an ext event to the client.
2678 3018
2679sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2680 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2681 3021
2682 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2684 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2685 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2687 } 3027 }
2688} 3028}
2689 3029
2690=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2691 3031
2695 3035
2696sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2697 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2698 3038
2699 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2701 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2702 #TODO: version 1, remove 3042 #TODO: version 1, remove
2703 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2705 } 3045 }
2706} 3046}
2707 3047
2708=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2709 3049
2810 3150
2811 $coro 3151 $coro
2812} 3152}
2813 3153
2814cf::client->attach ( 3154cf::client->attach (
2815 on_destroy => sub { 3155 on_client_destroy => sub {
2816 my ($ns) = @_; 3156 my ($ns) = @_;
2817 3157
2818 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2819 }, 3159 },
2820); 3160);
2836our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
2837 3177
2838$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
2839 3179
2840$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
2841 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
2842 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
2843 sort time 3183 sort time
2844)); 3184));
2845 3185
2846# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
2848=pod 3188=pod
2849 3189
2850The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
2851 3191
2852 cf::object 3192 cf::object
2853 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
2854 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
2855 3196
2856 cf::object::player 3197 cf::object::player
2857 player 3198 player
2858 3199
2859 cf::player 3200 cf::player
2864 3205
2865=cut 3206=cut
2866 3207
2867for ( 3208for (
2868 ["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
2869 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
2870 decrease_ob_nr)], 3211 decrease split destroy change_exp value msg lore send_msg)],
2871 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
2873 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
2874) { 3215) {
2875 no strict 'refs'; 3216 no strict 'refs';
2876 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
2877 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2895 3236
2896 my $qcode = $code; 3237 my $qcode = $code;
2897 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2898 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
2899 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
2900 local $_; 3244 local $_;
2901 local @safe::cf::_safe_eval_args = values %vars;
2902 3245
2903 my $eval = 3246 my $eval =
2904 "do {\n" 3247 "do {\n"
2905 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2906 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
2907 . $code 3250 . $code
2908 . "\n}" 3251 . "\n}"
2909 ; 3252 ;
2910 3253
3254 if ($CFG{safe_eval}) {
2911 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
2912 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2913 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 }
2914 3263
2915 if ($@) { 3264 if ($@) {
2916 warn "$@"; 3265 warn "$@";
2917 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
2918 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
2937=cut 3286=cut
2938 3287
2939sub register_script_function { 3288sub register_script_function {
2940 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
2941 3290
2942 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
2943 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
2944} 3293}
2945 3294
2946=back 3295=back
2947 3296
2948=cut 3297=cut
2969 3318
2970 $facedata->{version} == 2 3319 $facedata->{version} == 2
2971 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
2972 3321
2973 # 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]);
2974 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
2975 type => FT_RSRC, 3325 type => FT_RSRC,
2976 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),
2977 }; 3328 };
2978 cf::cede_to_tick; 3329 cf::cede_to_tick;
2979 3330
2980 { 3331 {
2981 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
2982 3333
2983 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
2984 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336
2985 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2989 3341
2990 cf::cede_to_tick; 3342 cf::cede_to_tick;
2991 } 3343 }
2992 3344
2993 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
2994 next unless $info->{smooth}; 3346 next unless $info->{smooth};
3347
2995 my $idx = cf::face::find $face 3348 my $idx = cf::face::find $face
2996 or next; 3349 or next;
3350
2997 if (my $smooth = cf::face::find $info->{smooth}) { 3351 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth; 3352 cf::face::set_smooth $idx, $smooth;
2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3000 } else { 3354 } else {
3001 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3355 warn "smooth face '$info->{smooth}' not found for face '$face'";
3015 3369
3016 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3017 } 3371 }
3018 3372
3019 { 3373 {
3020 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3023 3375
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data;
3029 3379
3030 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3031 # prepend meta info 3381 cf::face::set_type $idx, $info->{type};
3032
3033 my $meta = $enc->encode ({
3034 name => $name,
3035 %{ $info->{meta} || {} },
3036 });
3037
3038 $data = pack "(w/a*)*", $meta, $info->{data};
3039 } else { 3382 } else {
3040 $data = $info->{data}; 3383 $RESOURCE{$name} = $info;
3041 } 3384 }
3042 3385
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
3046 cf::cede_to_tick; 3386 cf::cede_to_tick;
3047 } 3387 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
3066 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3067 3391
3068 1 3392 1
3069} 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});
3070 3414
3071register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
3072 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
3073 3417
3074 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
3076 } 3420 }
3077}; 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}
3078 3432
3079sub reload_regions { 3433sub reload_regions {
3080 # 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
3081 # for this (global event?) 3435 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
3096} 3450}
3097 3451
3098sub reload_archetypes { 3452sub reload_archetypes {
3099 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
3100 or die "unable to load archetypes\n"; 3454 or die "unable to load archetypes\n";
3101 #d# NEED to laod twice to resolve forward references
3102 # this really needs to be done in an extra post-pass
3103 # (which needs to be synchronous, so solve it differently)
3104 load_resource_file "$DATADIR/archetypes"
3105 or die "unable to load archetypes\n";
3106} 3455}
3107 3456
3108sub reload_treasures { 3457sub reload_treasures {
3109 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
3110 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
3111} 3460}
3112 3461
3113sub reload_resources { 3462sub reload_resources {
3114 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3115 3464
3465 reload_facedata;
3466 reload_archetypes;
3116 reload_regions; 3467 reload_regions;
3117 reload_facedata;
3118 #reload_archetypes;#d#
3119 reload_archetypes;
3120 reload_treasures; 3468 reload_treasures;
3121 3469
3122 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3123} 3471}
3124 3472
3125sub init {
3126 reload_resources;
3127}
3128
3129sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3130 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3131 or return; 3477 or return;
3132 3478
3133 local $/; 3479 local $/;
3134 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3135 3481
3136 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3137 3483
3138 $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};
3139 $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};
3143 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3144 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3145 }; 3491 };
3146 warn $@ if $@; 3492 warn $@ if $@;
3147 } 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;
3148} 3524}
3149 3525
3150sub 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
3151 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3153 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#
3154 (async { 3544 (async {
3155 Event::one_event; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3546 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3157 }; 3548 };
3158 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;
3159 reload_config; 3557 reload_config;
3160 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
3161 load_extensions; 3568 load_extensions;
3162 3569
3163 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3164 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;
3165} 3580}
3166 3581
3167############################################################################# 3582#############################################################################
3168# initialisation and cleanup 3583# initialisation and cleanup
3169 3584
3170# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3171BEGIN { 3586BEGIN {
3587 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3174 reentrant => 0,
3175 data => WF_AUTOCANCEL,
3176 signal => $signal,
3177 prio => 0,
3178 cb => sub {
3179 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3180 },
3181 ); 3591 };
3182 } 3592 }
3183} 3593}
3184 3594
3185sub write_runtime { 3595sub write_runtime_sync {
3186 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = AE::time;
3187 3597
3188 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3189 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3190 3600
3191 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3192 3602
3193 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3194 3604
3195 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3196 or return; 3606 or return;
3197 3607
3198 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3199 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3200 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3210 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3211 3621
3212 close $fh 3622 close $fh
3213 or return; 3623 or return;
3214 3624
3215 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3216 and return; 3626 and return;
3217 3627
3218 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3219 3629
3220 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 };
3221} 3681}
3222 3682
3223sub emergency_save() { 3683sub emergency_save() {
3224 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3225 3685
3226 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3227 3687
3228 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
3229 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3230 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3231 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3233 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3700 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3702 $pl->save;
3237 } 3703 }
3238 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3239 3705
3240 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3241 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3242 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3243 $map->valid or next; 3709 $map->valid or next;
3244 $map->save; 3710 $map->save;
3245 } 3711 }
3246 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3247 3713
3248 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3249 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3250 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";
3251 }; 3721 };
3252 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
3253 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3254} 3729}
3255 3730
3256sub post_cleanup { 3731sub post_cleanup {
3257 my ($make_core) = @_; 3732 my ($make_core) = @_;
3258 3733
3259 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3260 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#
3261} 3765}
3262 3766
3263sub do_reload_perl() { 3767sub do_reload_perl() {
3264 # can/must only be called in main 3768 # can/must only be called in main
3265 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3266 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3267 return; 3771 return;
3268 } 3772 }
3269 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = AE::time;
3777
3778 while ($RELOAD) {
3270 warn "reloading..."; 3779 warn "reloading...";
3271 3780
3272 warn "entering sync_job"; 3781 warn "entering sync_job";
3273 3782
3274 cf::sync_job { 3783 cf::sync_job {
3275 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3276 cf::emergency_save; 3785 cf::emergency_save;
3277 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3278 3787
3279 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3281 3790
3282 # 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
3283 3792
3284 warn "cancelling all WF_AUTOCANCEL watchers";
3285 for (Event::all_watchers) {
3286 $_->cancel if $_->data & WF_AUTOCANCEL;
3287 }
3288
3289 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3290 for (;;) {
3291 BDB::flush;
3292 IO::AIO::flush;
3293 Coro::cede;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3295 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3296 }
3297
3298 ++$RELOAD;
3299
3300 warn "cancelling all extension coros";
3301 $_->cancel for values %EXT_CORO;
3302 %EXT_CORO = ();
3303
3304 warn "removing commands";
3305 %COMMAND = ();
3306
3307 warn "removing ext/exti commands";
3308 %EXTCMD = ();
3309 %EXTICMD = ();
3310
3311 warn "unloading/nuking all extensions";
3312 for my $pkg (@EXTS) {
3313 warn "... unloading $pkg";
3314
3315 if (my $cb = $pkg->can ("unload")) {
3316 eval {
3317 $cb->($pkg);
3318 1
3319 } or warn "$pkg unloaded, but with errors: $@";
3320 } 3796 }
3321 3797
3322 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3323 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3324 } 3800 %EXT_CORO = ();
3325 3801
3326 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3327 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3328 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3329 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3330 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3331 delete $INC{$k};
3332 3812
3333 $k =~ s/\.pm$//;
3334 $k =~ s/\//::/g;
3335
3336 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3337 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3338 } 3822 }
3339 3823
3340 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;
3341 } 3839 }
3342 3840
3343 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3344 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3345 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);
3346 3844
3347 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3348 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3349 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3350 3848
3351 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3352 # and global variables created in xs 3850 # and global variables created in xs
3353 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3354 3852
3355 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3356 3854
3357 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3358 require cf; 3856 require cf;
3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3360 3858
3361 warn "loading config and database again"; 3859 warn "loading config and database again";
3362 cf::reload_config; 3860 cf::reload_config;
3363 3861
3364 warn "loading extensions"; 3862 warn "loading extensions";
3365 cf::load_extensions; 3863 cf::load_extensions;
3366 3864
3865 if ($REATTACH_ON_RELOAD) {
3367 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3368 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3369 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3370 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3371 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3372 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3373 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3374 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3375 3878
3376 1 3879 1
3377 } or do { 3880 } or do {
3378 warn $@; 3881 warn $@;
3379 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3380 exit 1;
3381 }; 3883 };
3382 3884
3383 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3384}; 3891};
3385 3892
3386our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3387 3894
3388sub reload_perl() { 3895sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3391 3898
3392 $RELOAD_WATCHER ||= Event->timer ( 3899 $RELOAD_WATCHER ||= cf::async {
3393 reentrant => 0, 3900 Coro::AIO::aio_wait cache_extensions;
3394 after => 0, 3901
3395 data => WF_AUTOCANCEL, 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3396 cb => sub {
3397 do_reload_perl; 3903 do_reload_perl;
3398 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3399 }, 3905 };
3400 ); 3906 };
3401} 3907}
3402 3908
3403register_command "reload" => sub { 3909register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3405 3911
3406 if ($who->flag (FLAG_WIZ)) { 3912 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3913 $who->message ("reloading server.");
3914 async {
3915 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3916 reload_perl;
3917 };
3409 } 3918 }
3410}; 3919};
3411 3920
3412unshift @INC, $LIBDIR; 3921unshift @INC, $LIBDIR;
3413 3922
3415 3924
3416our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3417our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3418 3927
3419sub wait_for_tick { 3928sub wait_for_tick {
3420 return unless $TICK_WATCHER->is_active;
3421 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3422 3930
3423 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3424 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3425 $signal->wait; 3933 $signal->wait;
3426} 3934}
3427 3935
3428sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3429 return unless $TICK_WATCHER->is_active;
3430 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3431 3938
3432 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3941 $signal->wait;
3435} 3942}
3436 3943
3437 my $min = 1e6;#d# 3944sub tick {
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer (
3440 reentrant => 0,
3441 parked => 1,
3442 prio => 0,
3443 at => $NEXT_TICK || $TICK,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3447 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"
3448 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3449 return; 3948 return;
3450 } 3949 }
3451 3950
3452 $NOW = $tick_start = Event::time;
3453
3454 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3455 3952
3456 0 && sync_job {#d# 3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3457 for(1..10) {
3458 my $t = Event::time;
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3460 or die;
3461 3954
3462 $map->width (50); 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3463 $map->height (50); 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3464 $map->alloc; 3957 Coro::async_pool {
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 3958 $Coro::current->{desc} = "runtime saver";
3466 my $t = Event::time - $t; 3959 write_runtime_sync
3467 3960 or warn "ERROR: unable to write runtime file: $!";
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 }; 3961 };
3962 }
3478 3963
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool {
3485 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 }
3489
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3965 $sig->send;
3495 } 3966 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3968 $sig->send;
3498 } 3969 }
3499 3970
3500 $NOW = Event::time; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3501
3502 # if we are delayed by four ticks or more, skip them all
3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3504
3505 $TICK_WATCHER->at ($NEXT_TICK);
3506 $TICK_WATCHER->start;
3507
3508 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3973
3511 _post_tick; 3974 if (0) {
3512 3975 if ($NEXT_TICK) {
3513 3976 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d#
3979 }
3514 }, 3980 }
3515); 3981}
3516 3982
3517{ 3983{
3518 BDB::max_poll_time $TICK * 0.1; 3984 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 3985
3520 reentrant => 0,
3521 fd => BDB::poll_fileno,
3522 poll => 'r',
3523 prio => 0,
3524 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb,
3526 );
3527 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3528 3987 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 3988 $AnyEvent::BDB::WATCHER->priority (1);
3530 my $status;
3531 my $current = $Coro::current;
3532 (
3533 sub {
3534 $status = $!;
3535 $current->ready; undef $current;
3536 },
3537 sub {
3538 Coro::schedule while defined $current;
3539 $! = $status;
3540 },
3541 )
3542 };
3543 3989
3544 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3545 $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);
3546 3997
3547 cf::sync_job { 3998 cf::sync_job {
3548 eval { 3999 eval {
3549 BDB::db_env_open 4000 BDB::db_env_open
3550 $DB_ENV, 4001 $DB_ENV,
3552 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
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4004 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 4005 0666;
3555 4006
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4007 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 4008 };
3561 4009
3562 cf::cleanup "db_env_open(db): $@" if $@; 4010 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 4011 };
3564 } 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 };
3565} 4023}
3566 4024
3567{ 4025{
4026 # configure IO::AIO
4027
3568 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 4030 undef $AnyEvent::AIO::WATCHER;
3573 reentrant => 0,
3574 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno,
3576 poll => 'r',
3577 prio => 6,
3578 cb => \&IO::AIO::poll_cb,
3579 );
3580} 4031}
3581 4032
3582my $_log_backtrace; 4033my $_log_backtrace;
3583 4034
3584sub _log_backtrace { 4035sub _log_backtrace {
3587 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3588 4039
3589 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3592 async { 4044 async {
4045 $Coro::current->{desc} = "abt $msg";
4046
3593 my @bt = fork_call { 4047 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4049 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 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 |"
3597 or die "addr2line: $!"; 4051 or die "addr2line: $!";
3605 } 4059 }
3606 4060
3607 @funcs 4061 @funcs
3608 }; 4062 };
3609 4063
3610 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3611 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3612 --$_log_backtrace; 4067 --$_log_backtrace;
3613 }; 4068 };
3614 } else { 4069 } else {
3615 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3616 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3617 } 4072 }
3618} 4073}
3619 4074
3620# load additional modules 4075# load additional modules
3621use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3622 4078
3623END { cf::emergency_save } 4079END { cf::emergency_save }
3624 4080
36251 40811
3626 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines