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.562 by root, Sat Apr 23 04:46:26 2011 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$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 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
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;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $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 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
83 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
86 132
87our %CFG; 133our %CFG;
88 134
89our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 136our $RUNTIME;
137our $NOW;
91 138
92our (%PLAYER, %PLAYER_LOADING); # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 140our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
95 142
96# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 145
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
102 155
103binmode STDOUT; 156binmode STDOUT;
104binmode STDERR; 157binmode STDERR;
105 158
106# read virtual server time, if available 159# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
111} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
112 167
113mkdir $_ 168mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 170
116our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
117 172
118sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
119 189
120############################################################################# 190#############################################################################
121 191
122=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
123 193
159 229
160The raw value load value from the last tick. 230The raw value load value from the last tick.
161 231
162=item %cf::CFG 232=item %cf::CFG
163 233
164Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 235from wherever your confdir points to.
166 236
167=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
168 238
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These 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 240returns directly I<after> the tick processing (and consequently, can only wake one thread
171per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
173=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
174 249
175This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 252that call.
178 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
179=back 260=back
180 261
181=cut 262=cut
182 263
183BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
184 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
185 my $msg = join "", @_; 271 my $msg = join "", @_;
186 272
187 $msg .= "\n" 273 $msg .= "\n"
188 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
189 275
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 277
192 LOG llevError, $msg; 278 LOG llevWarn, $msg;
193 }; 279};
194} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
195 294
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 305for my $pkg (qw(
207 cf::global cf::attachable 306 cf::global cf::attachable
208 cf::object cf::object::player 307 cf::object cf::object::player
209 cf::client cf::player 308 cf::client cf::player
210 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
211 cf::map cf::party cf::region 311 cf::party cf::region
212)) { 312)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 314}
216 315
217$Event::DIED = sub { 316$EV::DIED = sub {
218 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
219}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
220 324
221############################################################################# 325#############################################################################
222 326
223=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
224 328
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 350 $d
247 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
248} 352}
249 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
250=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
251 369
252Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
253 371
254=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
255 373
256Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
257 375
258=cut 376=cut
259 377
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 379
262sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
264 444
265=item cf::lock_wait $string 445=item cf::lock_wait $string
266 446
267Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
268 448
269=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
270 450
271Wait until the given lock is available and then acquires it and returns 451Wait 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, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
274returned. 454returned.
275 455
276Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
277deadlocked coro. 457deadlocked coro.
283 463
284Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
285 465
286=cut 466=cut
287 467
288our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
289our %LOCKER;#d#
290 469
291sub lock_wait($) { 470sub lock_wait($) {
292 my ($key) = @_; 471 $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} 472}
305 473
306sub lock_acquire($) { 474sub lock_acquire($) {
307 my ($key) = @_; 475 $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} 476}
321 477
322sub lock_active($) { 478sub lock_active($) {
323 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
324
325 ! ! $LOCK{$key}
326} 480}
327 481
328sub freeze_mainloop { 482sub freeze_mainloop {
329 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
330 484
331 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
332 $TICK_WATCHER->start; 486}
333 }; 487
334 $TICK_WATCHER->stop; 488=item cf::periodic $interval, $cb
335 $guard 489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
336} 501}
337 502
338=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
339 504
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
341This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
342of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
343 512
344The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
345used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
346 515
347Useful for short background jobs. 516Useful for short background jobs.
348 517
349=cut 518=cut
350 519
351our @SLOT_QUEUE; 520our @SLOT_QUEUE;
352our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
353 523
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
356 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
357 530
358 while () { 531 while () {
359 next_job: 532 next_job:
533
360 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
361 if ($avail > 0.01) { 535
362 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
363 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
364 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
365 $job->[2]->send; 540 $job->[2]->send;
366 Coro::cede; 541 Coro::cede;
367 goto next_job; 542 goto next_job;
368 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
369 } 545 }
370 } 546 }
371 547
372 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 551 $signal->wait;
376 } else { 552 } else {
553 $busy = 0;
377 Coro::schedule; 554 Coro::schedule;
378 } 555 }
379 } 556 }
380}; 557};
381 558
382sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
383 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
384 563
385 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
386 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
387 567
388 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
389 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
390 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
401 581
402BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
403 583
404=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
405 585
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 587is 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 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
409acceptable. 589acceptable.
410 590
411If it must be done, put the blocking parts into C<sync_job>. This will run 591If 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 592the given BLOCK in another coroutine while waiting for the result. The
416=cut 596=cut
417 597
418sub sync_job(&) { 598sub sync_job(&) {
419 my ($job) = @_; 599 my ($job) = @_;
420 600
421 if ($Coro::current == $Coro::main) { 601 if (in_main) {
422 my $time = Event::time; 602 my $time = AE::time;
423 603
424 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
426 606
427 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
428 # (but this is cancel-safe) 608
429 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
430 610
431 my $busy = 1; 611 my $busy = 1;
432 my @res; 612 my @res;
433 613
434 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 616 @res = eval { $job->() };
436 warn $@ if $@; 617 error $@ if $@;
437 undef $busy; 618 undef $busy;
438 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
439 620
440 while ($busy) { 621 while ($busy) {
441 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
442 } 626 }
627 }
443 628
444 $time = Event::time - $time; 629 my $time = AE::time - $time;
445 630
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 631 $TICK_START += $time; # do not account sync jobs to server load
450 632
451 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
452 } else { 634 } else {
453 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
454 636
474 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
475 657
476 $coro 658 $coro
477} 659}
478 660
479=item fork_call { }, $args 661=item fork_call { }, @args
480 662
481Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
485 667
486=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
487 673
488sub fork_call(&@) { 674sub fork_call(&@) {
489 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
490 676
491 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
492 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
493 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
494 680
495 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
496 reset_signals; 682 cf::post_fork;
497 &$cb 683 &$cb
498 }, @args; 684 } @args;
499 685
500 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
501} 725}
502 726
503=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
504 728
505Returns a single value from the environment database. 729Returns a single value from the environment database.
507=item cf::db_put $family => $key => $value 731=item cf::db_put $family => $key => $value
508 732
509Stores the given C<$value> in the family. It can currently store binary 733Stores 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). 734data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511 735
736=item $db = cf::db_table "name"
737
738Create and/or open a new database table. The string must not be "db" and must be unique
739within each server.
740
512=cut 741=cut
742
743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
747 my ($name) = @_;
748 my $db = BDB::db_create $DB_ENV;
749
750 eval {
751 $db->set_flags (BDB::CHKSUM);
752
753 utf8::encode $name;
754 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
755 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
756 cf::cleanup "db_open(db): $!" if $!;
757 };
758 cf::cleanup "db_open(db): $@" if $@;
759
760 $db
761}
513 762
514our $DB; 763our $DB;
515 764
516sub db_init { 765sub db_init {
517 unless ($DB) { 766 $DB ||= db_table "db";
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job {
521 eval {
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 }
531} 767}
532 768
533sub db_get($$) { 769sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
535 771
536 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
537 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
538 776
539 $! ? () 777 $! ? ()
540 : $data 778 : $data
541 }
542} 779}
543 780
544sub db_put($$$) { 781sub db_put($$$) {
545 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
546 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
574 811
575 my @data; 812 my @data;
576 my $md5; 813 my $md5;
577 814
578 for (0 .. $#$src) { 815 for (0 .. $#$src) {
579 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
580 or Carp::croak "$src->[$_]: $!";
581 } 817 }
582 818
583 # if processing is expensive, check 819 # if processing is expensive, check
584 # checksum first 820 # checksum first
585 if (1) { 821 if (1) {
602 838
603 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
604 my $data = $process->(\@data); 840 my $data = $process->(\@data);
605 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
606 842
607 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
608 844
609 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
610 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
611 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
612 848
622 858
623=cut 859=cut
624 860
625sub datalog($@) { 861sub datalog($@) {
626 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
627 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
628} 864}
629 865
630=back 866=back
631 867
632=cut 868=cut
633 869
634############################################################################# 870#############################################################################
635 871
636=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
637 873
638Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
639attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
641 877
642In the following description, CLASS can be any of C<global>, C<object> 878In 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 879C<player>, C<client> or C<map> (i.e. the attachable objects in
644Crossfire TRT). 880Deliantra).
645 881
646=over 4 882=over 4
647 883
648=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
649 885
693=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
694 930
695Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
696given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
697 933
698Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
699that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
700 936
701These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
702 938
703=over 4 939=over 4
827 1063
828 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
829 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
830 1066
831 } elsif (ref $type) { 1067 } elsif (ref $type) {
832 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
833 1069
834 } else { 1070 } else {
835 shift @arg; 1071 shift @arg;
836 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
837 } 1073 }
838 } 1074 }
839} 1075}
840 1076
841sub _object_attach { 1077sub _object_attach {
851 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
852 } 1088 }
853 1089
854 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
855 } else { 1091 } else {
856 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
857 } 1093 }
858 1094
859 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
860} 1096}
861 1097
920 1156
921 for (@$callbacks) { 1157 for (@$callbacks) {
922 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
923 1159
924 if ($@) { 1160 if ($@) {
925 warn "$@";
926 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
927 override; 1162 override;
928 } 1163 }
929 1164
930 return 1 if $override; 1165 return 1 if $override;
931 } 1166 }
932 1167
933 0 1168 0
934} 1169}
935 1170
936=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
937 1172
938=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
939 1174
940Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
941 1176
947 1182
948=cut 1183=cut
949 1184
950############################################################################# 1185#############################################################################
951# object support 1186# object support
952#
953 1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
954sub _can_merge { 1221sub _can_merge {
955 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
956 1223
957 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1225
961 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
962} 1228}
963 1229
964sub reattach { 1230sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1232 my ($obj) = @_;
967 1233
1234 # no longer needed after getting rid of delete_package?
968 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
969 1236
970 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
971 1238
972 @$registry = (); 1239 @$registry = ();
973 1240
978 for (@$attach) { 1245 for (@$attach) {
979 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
980 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
981 } 1248 }
982 } else { 1249 } else {
983 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
984 } 1251 }
985 } 1252 }
986} 1253}
987 1254
988cf::attachable->attach ( 1255cf::attachable->attach (
989 prio => -1000000, 1256 prio => -1000000,
990 on_instantiate => sub { 1257 on_instantiate => sub {
991 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
992 1259
993 $data = from_json $data; 1260 $data = decode_json $data;
994 1261
995 for (@$data) { 1262 for (@$data) {
996 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
997 1264
998 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1012); 1279);
1013 1280
1014sub object_freezer_save { 1281sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1016 1283
1017 my $guard = cf::lock_acquire "io";
1018
1019 sync_job { 1284 sync_job {
1020 if (length $$rdata) { 1285 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1023 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1024 1290
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 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;
1296 aio_fsync $fh;
1297 }
1029 close $fh; 1298 aio_close $fh;
1030 1299
1031 if (@$objs) { 1300 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 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;
1307 aio_fsync $fh;
1308 }
1037 close $fh; 1309 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1311 }
1040 } else { 1312 } else {
1041 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1042 } 1314 }
1043 1315
1044 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1320 } else {
1046 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1047 } 1322 }
1048 } else { 1323 } else {
1049 aio_unlink $filename; 1324 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1051 } 1326 }
1052 }; 1327 };
1053
1054 undef $guard;
1055} 1328}
1056 1329
1057sub object_freezer_as_string { 1330sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1059 1332
1064 1337
1065sub object_thawer_load { 1338sub object_thawer_load {
1066 my ($filename) = @_; 1339 my ($filename) = @_;
1067 1340
1068 my ($data, $av); 1341 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1342
1072 (aio_load $filename, $data) >= 0 1343 (aio_load $filename, $data) >= 0
1073 or return; 1344 or return;
1074 1345
1075 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1348 or return;
1078 1349
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1081 } 1352 }
1082 1353
1083 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1086 1358
1087 ($data, $av) 1359 ($data, $av)
1088} 1360}
1089 1361
1090=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1146 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1147 1419
1148 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1149} 1421}
1150 1422
1423use File::Glob ();
1424
1151cf::player->attach ( 1425cf::player->attach (
1152 on_command => sub { 1426 on_unknown_command => sub {
1153 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1154 1428
1155 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1156 or return; 1430 or return;
1157 1431
1180 1454
1181 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1182 if $reply; 1456 if $reply;
1183 1457
1184 } else { 1458 } else {
1185 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1186 } 1460 }
1187 1461
1188 cf::override; 1462 cf::override;
1189 }, 1463 },
1190); 1464);
1191 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1192sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1193 cf::sync_job { 1482 cf::sync_job {
1194 my %todo; 1483 my %todo;
1195 1484
1196 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1197 next unless -r $path; 1486 next unless -r $path;
1215 1504
1216 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1217 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1218 1507
1219 $ext{source} = 1508 $ext{source} =
1220 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1221 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1222 . $source 1511 . $source
1223 . "\n};\n1"; 1512 . "\n};\n1";
1224 1513
1225 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1226 } 1515 }
1227 1516
1517 my $pass = 0;
1228 my %done; 1518 my %done;
1229 while (%todo) { 1519 while (%todo) {
1230 my $progress; 1520 my $progress;
1231 1521
1522 ++$pass;
1523
1524 ext:
1232 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1233 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1234 goto skip 1527 next ext
1235 unless exists $done{$_}; 1528 unless exists $done{$_};
1236 } 1529 }
1237 1530
1238 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1239 1532
1240 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1241 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1242 : "$v->{base}: extension inactive.\n";
1243 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1244 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1245 warn $msg; 1540
1246 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1247 exit 1; 1542 delete $todo{$k};
1248 } 1543 } else {
1249 1544 $done{$k} = delete $todo{$k};
1250 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1251 } 1550 }
1252
1253 $done{$k} = delete $todo{$k};
1254 push @EXTS, $v->{pkg};
1255 $progress = 1;
1256 } 1551 }
1257 1552
1258 skip: 1553 unless ($progress) {
1259 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1260 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1261 } 1563 }
1262 }; 1564 };
1263} 1565}
1264 1566
1265############################################################################# 1567#############################################################################
1266 1568
1267=back 1569=back
1268 1570
1269=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1270 1572
1271Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1272 1574
1273=cut 1575=cut
1274 1576
1275package cf::player; 1577package cf::player;
1276 1578
1319 1621
1320sub exists($) { 1622sub exists($) {
1321 my ($login) = @_; 1623 my ($login) = @_;
1322 1624
1323 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1324 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1325} 1627}
1326 1628
1327sub find($) { 1629sub find($) {
1328 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1329 my $login = $_[0]; 1631 my $login = $_[0];
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1642
1341 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1644 or return;
1343 1645
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1346 or return; 1647 or return;
1648
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1350 } 1652 }
1351 } 1653 }
1352} 1654}
1353 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1354sub save($) { 1669sub save($) {
1355 my ($pl) = @_; 1670 my ($pl) = @_;
1356 1671
1357 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1358 1673
1361 1676
1362 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1363 1678
1364 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1365 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1366 1686
1367 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1368 cf::cede_to_tick; 1688 cf::cede_to_tick;
1369} 1689}
1370 1690
1402 my ($pl) = @_; 1722 my ($pl) = @_;
1403 1723
1404 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1405 1725
1406 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1407 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1408 1728
1409 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1410 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1411 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1412 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1413 1737
1414 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1415 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1416 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1454 1778
1455 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1456 my $path = path $login; 1780 my $path = path $login;
1457 1781
1458 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1461 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1462 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 } 1788 }
1464 1789
1468 1793
1469 \@logins 1794 \@logins
1470} 1795}
1471 1796
1472=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1473 1800
1474Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1475player. May block. 1802player. May block.
1476 1803
1477=cut 1804=cut
1495 } 1822 }
1496 1823
1497 \@paths 1824 \@paths
1498} 1825}
1499 1826
1500=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1501 1828
1502Expand crossfire pod fragments into protocol xml. 1829Expand 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 1830
1551=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1552 1832
1553Sends an ext reply to the player. 1833Sends an ext reply to the player.
1554 1834
1586 1866
1587=cut 1867=cut
1588 1868
1589sub find_by_path($) { 1869sub find_by_path($) {
1590 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1591 1873
1592 my ($match, $specificity); 1874 my ($match, $specificity);
1593 1875
1594 for my $region (list) { 1876 for my $region (list) {
1595 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1621our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1622our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1623 1905
1624sub generate_random_map { 1906sub generate_random_map {
1625 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1626 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1627 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1628 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1629 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1630 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1631 $rmp->{exit_on_final_map},
1632 $rmp->{xsize}, $rmp->{ysize},
1633 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1634 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1635 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1636 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1637 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1638 (cf::region::find $rmp->{region}), $rmp->{custom}
1639 )
1640} 1912}
1641 1913
1642=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1643 1915
1644Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1649 1921
1650sub register { 1922sub register {
1651 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1652 my $pkg = caller; 1924 my $pkg = caller;
1653 1925
1654 no strict;
1655 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1656 1927
1657 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1658} 1929}
1659 1930
1660# also paths starting with '/' 1931# also paths starting with '/'
1661$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1662 1933
1663sub thawer_merge { 1934sub thawer_merge {
1664 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1665 1936
1666 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1671} 1942}
1672 1943
1673sub normalise { 1944sub normalise {
1674 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1675 1946
1676 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1677 1948
1678 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1679 1950
1680 # map plan: 1951 # map plan:
1681 # 1952 #
1696 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1697 $path = "$base/$path"; 1968 $path = "$base/$path";
1698 } 1969 }
1699 1970
1700 for ($path) { 1971 for ($path) {
1701 redo if s{//}{/};
1702 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1703 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1704 } 1974 }
1705 1975
1706 $path 1976 $path
1720 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1721 return $self; 1991 return $self;
1722 } 1992 }
1723 } 1993 }
1724 1994
1725 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1726 () 1996 ()
1727} 1997}
1728 1998
1999# may re-bless or do other evil things
1729sub init { 2000sub init {
1730 my ($self) = @_; 2001 my ($self) = @_;
1731 2002
1732 $self 2003 $self
1733} 2004}
1752 2023
1753# the temporary/swap location 2024# the temporary/swap location
1754sub save_path { 2025sub save_path {
1755 my ($self) = @_; 2026 my ($self) = @_;
1756 2027
1757 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1758 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1759} 2030}
1760 2031
1761# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1762sub uniq_path { 2033sub uniq_path {
1763 my ($self) = @_; 2034 my ($self) = @_;
1764 2035
1765 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1766 "$UNIQUEDIR/$path" 2037 "$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} 2038}
1777 2039
1778sub decay_objects { 2040sub decay_objects {
1779 my ($self) = @_; 2041 my ($self) = @_;
1780 2042
1862 2124
1863sub find; 2125sub find;
1864sub find { 2126sub find {
1865 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
1866 2128
2129 cf::cede_to_tick;
2130
1867 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1868 2132
1869 cf::lock_wait "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1870 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1871 2135
1872 $cf::MAP{$path} || do { 2136 $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 2137 my $map = new_from_path cf::map $path
1877 or return; 2138 or return;
1878 2139
1879 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
1880 2141
1882 or return; 2143 or return;
1883 2144
1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2145 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1885 # doing this can freeze the server in a sync job, obviously 2146 # doing this can freeze the server in a sync job, obviously
1886 #$cf::WAIT_FOR_TICK->wait; 2147 #$cf::WAIT_FOR_TICK->wait;
2148 undef $guard2;
1887 undef $guard1; 2149 undef $guard1;
1888 undef $guard2;
1889 $map->reset; 2150 $map->reset;
1890 return find $path; 2151 return find $path;
1891 } 2152 }
1892 2153
1893 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1894 } 2155 }
1895} 2156}
1896 2157
1897sub pre_load { } 2158sub pre_load { }
1898sub post_load { } 2159#sub post_load { } # XS
1899 2160
1900sub load { 2161sub load {
1901 my ($self) = @_; 2162 my ($self) = @_;
1902 2163
1903 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
1915 $self->alloc; 2176 $self->alloc;
1916 2177
1917 $self->pre_load; 2178 $self->pre_load;
1918 cf::cede_to_tick; 2179 cf::cede_to_tick;
1919 2180
2181 if (exists $self->{load_path}) {
1920 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block; 2183 $f->skip_block;
1922 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
1923 or return; 2185 or return;
1924 2186
1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2187 $self->post_load_original
1926 if delete $self->{load_original}; 2188 if delete $self->{load_original};
1927 2189
1928 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
1929 utf8::encode $uniq; 2191 utf8::encode $uniq;
1930 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
1931 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
1932 $self->clear_unique_items; 2194 $self->clear_unique_items;
1933 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
1934 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
1935 } 2198 }
1936 } 2199 }
1937 }
1938 2200
1939 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
1940 2203
1941 cf::cede_to_tick; 2204 cf::cede_to_tick;
1942 # now do the right thing for maps 2205 # now do the right thing for maps
1943 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
1944 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
1948 unless ($self->{deny_activate}) { 2211 unless ($self->{deny_activate}) {
1949 $self->decay_objects; 2212 $self->decay_objects;
1950 $self->fix_auto_apply; 2213 $self->fix_auto_apply;
1951 $self->update_buttons; 2214 $self->update_buttons;
1952 cf::cede_to_tick; 2215 cf::cede_to_tick;
1953 $self->set_darkness_map;
1954 cf::cede_to_tick;
1955 $self->activate; 2216 $self->activate;
1956 } 2217 }
1957 2218
1958 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME); 2220 $self->last_access ($cf::RUNTIME);
1960 2221
1961 $self->in_memory (cf::MAP_IN_MEMORY); 2222 $self->in_memory (cf::MAP_ACTIVE);
1962 } 2223 }
1963 2224
1964 $self->post_load; 2225 $self->post_load;
1965}
1966 2226
2227 1
2228}
2229
2230# customize the map for a given player, i.e.
2231# return the _real_ map. used by e.g. per-player
2232# maps to change the path to ~playername/mappath
1967sub customise_for { 2233sub customise_for {
1968 my ($self, $ob) = @_; 2234 my ($self, $ob) = @_;
1969 2235
1970 return find "~" . $ob->name . "/" . $self->{path} 2236 return find "~" . $ob->name . "/" . $self->{path}
1971 if $self->per_player; 2237 if $self->per_player;
1987 or next; 2253 or next;
1988 $neigh = find $neigh, $map 2254 $neigh = find $neigh, $map
1989 or next; 2255 or next;
1990 $neigh->load; 2256 $neigh->load;
1991 2257
2258 # now find the diagonal neighbours
1992 push @neigh, 2259 push @neigh,
1993 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1994 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1995 } 2262 }
1996 2263
2003} 2270}
2004 2271
2005sub find_sync { 2272sub find_sync {
2006 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2007 2274
2008 cf::sync_job { find $path, $origin } 2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main;
2277
2278 find $path, $origin
2009} 2279}
2010 2280
2011sub do_load_sync { 2281sub do_load_sync {
2012 my ($map) = @_; 2282 my ($map) = @_;
2013 2283
2014 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2015 if $Coro::current == $Coro::main; 2285 if $Coro::current == $Coro::main;
2016 2286
2017 cf::sync_job { $map->load }; 2287 $map->load;
2018} 2288}
2019 2289
2020our %MAP_PREFETCH; 2290our %MAP_PREFETCH;
2021our $MAP_PREFETCHER = undef; 2291our $MAP_PREFETCHER = undef;
2022 2292
2024 my ($path, $origin, $load) = @_; 2294 my ($path, $origin, $load) = @_;
2025 2295
2026 $path = normalise $path, $origin && $origin->{path}; 2296 $path = normalise $path, $origin && $origin->{path};
2027 2297
2028 if (my $map = $cf::MAP{$path}) { 2298 if (my $map = $cf::MAP{$path}) {
2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2030 } 2300 }
2031 2301
2032 $MAP_PREFETCH{$path} |= $load; 2302 $MAP_PREFETCH{$path} |= $load;
2033 2303
2034 $MAP_PREFETCHER ||= cf::async { 2304 $MAP_PREFETCHER ||= cf::async {
2305 $Coro::current->{desc} = "map prefetcher";
2306
2035 while (%MAP_PREFETCH) { 2307 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2308 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2309 if (my $map = find $k) {
2038 $map->load if $v; 2310 $map->load if $v;
2039 } 2311 }
2046 $MAP_PREFETCHER->prio (6); 2318 $MAP_PREFETCHER->prio (6);
2047 2319
2048 () 2320 ()
2049} 2321}
2050 2322
2323# common code, used by both ->save and ->swapout
2051sub save { 2324sub _save {
2052 my ($self) = @_; 2325 my ($self) = @_;
2053
2054 my $lock = cf::lock_acquire "map_data:$self->{path}";
2055 2326
2056 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2057 2328
2058 return unless $self->dirty; 2329 return unless $self->dirty;
2059 2330
2065 return if $self->{deny_save}; 2336 return if $self->{deny_save};
2066 2337
2067 local $self->{last_access} = $self->last_access;#d# 2338 local $self->{last_access} = $self->last_access;#d#
2068 2339
2069 cf::async { 2340 cf::async {
2341 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2342 $_->contr->save for $self->players;
2071 }; 2343 };
2344
2345 cf::get_slot 0.02;
2072 2346
2073 if ($uniq) { 2347 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2348 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2075 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2349 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2076 } else { 2350 } else {
2077 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2351 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2078 } 2352 }
2079} 2353}
2080 2354
2355sub save {
2356 my ($self) = @_;
2357
2358 my $lock = cf::lock_acquire "map_data:$self->{path}";
2359
2360 $self->_save;
2361}
2362
2081sub swap_out { 2363sub swap_out {
2082 my ($self) = @_; 2364 my ($self) = @_;
2083 2365
2084 # save first because save cedes
2085 $self->save;
2086
2087 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2366 my $lock = cf::lock_acquire "map_data:$self->{path}";
2088 2367
2368 return if $self->in_memory != cf::MAP_ACTIVE;
2369 return if $self->{deny_save};
2089 return if $self->players; 2370 return if $self->players;
2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
2091 return if $self->{deny_save};
2092 2371
2372 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP;
2093 $self->in_memory (cf::MAP_SWAPPED); 2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # then atomically save
2378 $self->_save;
2379
2380 # then free the map
2381 $self->clear;
2382}
2383
2384sub reset_at {
2385 my ($self) = @_;
2386
2387 # TODO: safety, remove and allow resettable per-player maps
2388 return 1e99 if $self->{deny_reset};
2389
2390 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2391 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2392
2393 $time + $to
2394}
2395
2396sub should_reset {
2397 my ($self) = @_;
2398
2399 $self->reset_at <= $cf::RUNTIME
2400}
2401
2402sub reset {
2403 my ($self) = @_;
2404
2405 my $lock = cf::lock_acquire "map_data:$self->{path}";
2406
2407 return if $self->players;
2408
2409 cf::trace "resetting map ", $self->path, "\n";
2410
2411 $self->in_memory (cf::MAP_SWAPPED);
2412
2413 # need to save uniques path
2414 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416
2417 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2418 if $uniq;
2419 }
2420
2421 delete $cf::MAP{$self->path};
2094 2422
2095 $self->deactivate; 2423 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP; 2424 $_->clear_links_to ($self) for values %cf::MAP;
2097 $self->clear; 2425 $self->clear;
2098}
2099
2100sub reset_at {
2101 my ($self) = @_;
2102
2103 # TODO: safety, remove and allow resettable per-player maps
2104 return 1e99 if $self->{deny_reset};
2105
2106 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2107 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2108
2109 $time + $to
2110}
2111
2112sub should_reset {
2113 my ($self) = @_;
2114
2115 $self->reset_at <= $cf::RUNTIME
2116}
2117
2118sub reset {
2119 my ($self) = @_;
2120
2121 my $lock = cf::lock_acquire "map_data:$self->{path}";
2122
2123 return if $self->players;
2124
2125 warn "resetting map ", $self->path;
2126
2127 $self->in_memory (cf::MAP_SWAPPED);
2128
2129 # need to save uniques path
2130 unless ($self->{deny_save}) {
2131 my $uniq = $self->uniq_path; utf8::encode $uniq;
2132
2133 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2134 if $uniq;
2135 }
2136
2137 delete $cf::MAP{$self->path};
2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
2141 $self->clear;
2142 2426
2143 $self->unlink_save; 2427 $self->unlink_save;
2144 $self->destroy; 2428 $self->destroy;
2145} 2429}
2146 2430
2154 2438
2155 delete $cf::MAP{$self->path}; 2439 delete $cf::MAP{$self->path};
2156 2440
2157 $self->unlink_save; 2441 $self->unlink_save;
2158 2442
2159 bless $self, "cf::map"; 2443 bless $self, "cf::map::wrap";
2160 delete $self->{deny_reset}; 2444 delete $self->{deny_reset};
2161 $self->{deny_save} = 1; 2445 $self->{deny_save} = 1;
2162 $self->reset_timeout (1); 2446 $self->reset_timeout (1);
2163 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2447 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2164 2448
2213 2497
2214sub unique_maps() { 2498sub unique_maps() {
2215 [ 2499 [
2216 map { 2500 map {
2217 utf8::decode $_; 2501 utf8::decode $_;
2218 /\.map$/ 2502 s/\.map$//; # TODO future compatibility hack
2503 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2504 ? ()
2219 ? normalise $_ 2505 : normalise $_
2220 : ()
2221 } @{ aio_readdir $UNIQUEDIR or [] } 2506 } @{ aio_readdir $UNIQUEDIR or [] }
2222 ] 2507 ]
2223} 2508}
2224 2509
2225package cf; 2510=item cf::map::static_maps
2511
2512Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2513file in the shared directory excluding F</styles> and F</editor>). May
2514block.
2515
2516=cut
2517
2518sub static_maps() {
2519 my @dirs = "";
2520 my @maps;
2521
2522 while (@dirs) {
2523 my $dir = shift @dirs;
2524
2525 next if $dir eq "/styles" || $dir eq "/editor";
2526
2527 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2528 or return;
2529
2530 for (@$files) {
2531 s/\.map$// or next;
2532 utf8::decode $_;
2533 push @maps, "$dir/$_";
2534 }
2535
2536 push @dirs, map "$dir/$_", @$dirs;
2537 }
2538
2539 \@maps
2540}
2226 2541
2227=back 2542=back
2228 2543
2229=head3 cf::object 2544=head3 cf::object
2230 2545
2234 2549
2235=over 4 2550=over 4
2236 2551
2237=item $ob->inv_recursive 2552=item $ob->inv_recursive
2238 2553
2239Returns the inventory of the object _and_ their inventories, recursively. 2554Returns the inventory of the object I<and> their inventories, recursively,
2555but I<not> the object itself.
2240 2556
2241=cut 2557=cut
2242 2558
2243sub inv_recursive_; 2559sub inv_recursive_;
2244sub inv_recursive_ { 2560sub inv_recursive_ {
2249 inv_recursive_ inv $_[0] 2565 inv_recursive_ inv $_[0]
2250} 2566}
2251 2567
2252=item $ref = $ob->ref 2568=item $ref = $ob->ref
2253 2569
2254creates and returns a persistent reference to an objetc that can be stored as a string. 2570Creates and returns a persistent reference to an object that can be stored as a string.
2255 2571
2256=item $ob = cf::object::deref ($refstring) 2572=item $ob = cf::object::deref ($refstring)
2257 2573
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2574returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block. 2575even if the object actually exists. May block.
2261=cut 2577=cut
2262 2578
2263sub deref { 2579sub deref {
2264 my ($ref) = @_; 2580 my ($ref) = @_;
2265 2581
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2582 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2583 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2584 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2585 or return;
2273 $pl->ob->uuid eq $uuid 2586 $pl->ob->uuid eq $uuid
2274 or return; 2587 or return;
2294can be C<undef>. Does the right thing when the player is currently in a 2607can be C<undef>. Does the right thing when the player is currently in a
2295dialogue with the given NPC character. 2608dialogue with the given NPC character.
2296 2609
2297=cut 2610=cut
2298 2611
2612our $SAY_CHANNEL = {
2613 id => "say",
2614 title => "Map",
2615 reply => "say ",
2616 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2617};
2618
2619our $CHAT_CHANNEL = {
2620 id => "chat",
2621 title => "Chat",
2622 reply => "chat ",
2623 tooltip => "Player chat and shouts, global to the server.",
2624};
2625
2299# rough implementation of a future "reply" method that works 2626# rough implementation of a future "reply" method that works
2300# with dialog boxes. 2627# with dialog boxes.
2301#TODO: the first argument must go, split into a $npc->reply_to ( method 2628#TODO: the first argument must go, split into a $npc->reply_to ( method
2302sub cf::object::player::reply($$$;$) { 2629sub cf::object::player::reply($$$;$) {
2303 my ($self, $npc, $msg, $flags) = @_; 2630 my ($self, $npc, $msg, $flags) = @_;
2314 my $dialog = $pl->{npc_dialog}; 2641 my $dialog = $pl->{npc_dialog};
2315 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2642 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2316 2643
2317 } else { 2644 } else {
2318 $msg = $npc->name . " says: $msg" if $npc; 2645 $msg = $npc->name . " says: $msg" if $npc;
2319 $self->message ($msg, $flags); 2646 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2320 } 2647 }
2321 } 2648 }
2322} 2649}
2323 2650
2324=item $object->send_msg ($channel, $msg, $color, [extra...]) 2651=item $object->send_msg ($channel, $msg, $color, [extra...])
2349 2676
2350=item $player_object->enter_link 2677=item $player_object->enter_link
2351 2678
2352Freezes the player and moves him/her to a special map (C<{link}>). 2679Freezes the player and moves him/her to a special map (C<{link}>).
2353 2680
2354The player should be reasonably safe there for short amounts of time. You 2681The player should be reasonably safe there for short amounts of time (e.g.
2355I<MUST> call C<leave_link> as soon as possible, though. 2682for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2683though, as the player cannot control the character while it is on the link
2684map.
2356 2685
2357Will never block. 2686Will never block.
2358 2687
2359=item $player_object->leave_link ($map, $x, $y) 2688=item $player_object->leave_link ($map, $x, $y)
2360 2689
2380sub cf::object::player::enter_link { 2709sub cf::object::player::enter_link {
2381 my ($self) = @_; 2710 my ($self) = @_;
2382 2711
2383 $self->deactivate_recursive; 2712 $self->deactivate_recursive;
2384 2713
2714 ++$self->{_link_recursion};
2715
2385 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2716 return if UNIVERSAL::isa $self->map, "ext::map_link";
2386 2717
2387 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2388 if $self->map && $self->map->{path} ne "{link}"; 2719 if $self->map && $self->map->{path} ne "{link}";
2389 2720
2390 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2721 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2391} 2722}
2392 2723
2393sub cf::object::player::leave_link { 2724sub cf::object::player::leave_link {
2394 my ($self, $map, $x, $y) = @_; 2725 my ($self, $map, $x, $y) = @_;
2395 2726
2412 ($x, $y) = (-1, -1) 2743 ($x, $y) = (-1, -1)
2413 unless (defined $x) && (defined $y); 2744 unless (defined $x) && (defined $y);
2414 2745
2415 # use -1 or undef as default coordinates, not 0, 0 2746 # use -1 or undef as default coordinates, not 0, 0
2416 ($x, $y) = ($map->enter_x, $map->enter_y) 2747 ($x, $y) = ($map->enter_x, $map->enter_y)
2417 if $x <=0 && $y <= 0; 2748 if $x <= 0 && $y <= 0;
2418 2749
2419 $map->load; 2750 $map->load;
2420 $map->load_neighbours; 2751 $map->load_neighbours;
2421 2752
2422 return unless $self->contr->active; 2753 return unless $self->contr->active;
2423 $self->activate_recursive;
2424 2754
2425 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2426 $self->enter_map ($map, $x, $y); 2756 if ($self->enter_map ($map, $x, $y)) {
2427} 2757 # entering was successful
2758 delete $self->{_link_recursion};
2759 # only activate afterwards, to support waiting in hooks
2760 $self->activate_recursive;
2761 }
2428 2762
2763}
2764
2429=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2765=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2430 2766
2431Moves the player to the given map-path and coordinates by first freezing 2767Moves the player to the given map-path and coordinates by first freezing
2432her, loading and preparing them map, calling the provided $check callback 2768her, loading and preparing them map, calling the provided $check callback
2433that has to return the map if sucecssful, and then unfreezes the player on 2769that 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 2770the new (success) or old (failed) map position. In either case, $done will
2435be called at the end of this process. 2771be called at the end of this process.
2436 2772
2773Note that $check will be called with a potentially non-loaded map, so if
2774it needs a loaded map it has to call C<< ->load >>.
2775
2437=cut 2776=cut
2438 2777
2439our $GOTOGEN; 2778our $GOTOGEN;
2440 2779
2441sub cf::object::player::goto { 2780sub cf::object::player::goto {
2442 my ($self, $path, $x, $y, $check, $done) = @_; 2781 my ($self, $path, $x, $y, $check, $done) = @_;
2443 2782
2783 if ($self->{_link_recursion} >= $MAX_LINKS) {
2784 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2785 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2786 ($path, $x, $y) = @$EMERGENCY_POSITION;
2787 }
2788
2444 # do generation counting so two concurrent goto's will be executed in-order 2789 # do generation counting so two concurrent goto's will be executed in-order
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2790 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2791
2447 $self->enter_link; 2792 $self->enter_link;
2448 2793
2449 (async { 2794 (async {
2795 $Coro::current->{desc} = "player::goto $path $x $y";
2796
2797 # *tag paths override both path and x|y
2798 if ($path =~ /^\*(.*)$/) {
2799 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2800 my $ob = $obs[rand @obs];
2801
2802 # see if we actually can go there
2803 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2804 $ob = $obs[rand @obs];
2805 } else {
2806 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2807 }
2808 # else put us there anyways for now #d#
2809
2810 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2811 } else {
2812 ($path, $x, $y) = (undef, undef, undef);
2813 }
2814 }
2815
2450 my $map = eval { 2816 my $map = eval {
2451 my $map = cf::map::find $path; 2817 my $map = defined $path ? cf::map::find $path : undef;
2452 2818
2453 if ($map) { 2819 if ($map) {
2454 $map = $map->customise_for ($self); 2820 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2821 $map = $check->($map, $x, $y, $self) if $check && $map;
2456 } else { 2822 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2823 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2458 } 2824 }
2459 2825
2460 $map 2826 $map
2461 }; 2827 };
2462 2828
2468 if ($gen == $self->{_goto_generation}) { 2834 if ($gen == $self->{_goto_generation}) {
2469 delete $self->{_goto_generation}; 2835 delete $self->{_goto_generation};
2470 $self->leave_link ($map, $x, $y); 2836 $self->leave_link ($map, $x, $y);
2471 } 2837 }
2472 2838
2473 $done->() if $done; 2839 $done->($self) if $done;
2474 })->prio (1); 2840 })->prio (1);
2475} 2841}
2476 2842
2477=item $player_object->enter_exit ($exit_object) 2843=item $player_object->enter_exit ($exit_object)
2478 2844
2498} 2864}
2499 2865
2500sub prepare_random_map { 2866sub prepare_random_map {
2501 my ($exit) = @_; 2867 my ($exit) = @_;
2502 2868
2503 my $guard = cf::lock_acquire "exit_prepare:$exit";
2504
2505 # all this does is basically replace the /! path by 2869 # all this does is basically replace the /! path by
2506 # a new random map path (?random/...) with a seed 2870 # a new random map path (?random/...) with a seed
2507 # that depends on the exit object 2871 # that depends on the exit object
2508 2872
2509 my $rmp = parse_random_map_params $exit->msg; 2873 my $rmp = parse_random_map_params $exit->msg;
2511 if ($exit->map) { 2875 if ($exit->map) {
2512 $rmp->{region} = $exit->region->name; 2876 $rmp->{region} = $exit->region->name;
2513 $rmp->{origin_map} = $exit->map->path; 2877 $rmp->{origin_map} = $exit->map->path;
2514 $rmp->{origin_x} = $exit->x; 2878 $rmp->{origin_x} = $exit->x;
2515 $rmp->{origin_y} = $exit->y; 2879 $rmp->{origin_y} = $exit->y;
2880
2881 $exit->map->touch;
2516 } 2882 }
2517 2883
2518 $rmp->{random_seed} ||= $exit->random_seed; 2884 $rmp->{random_seed} ||= $exit->random_seed;
2519 2885
2520 my $data = cf::to_json $rmp; 2886 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2521 my $md5 = Digest::MD5::md5_hex $data; 2887 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2888 my $meta = "$RANDOMDIR/$md5.meta";
2523 2889
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2890 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2891 aio_write $fh, 0, (length $data), $data, 0;
2526 undef $fh; 2892 undef $fh;
2527 aio_rename "$meta~", $meta; 2893 aio_rename "$meta~", $meta;
2528 2894
2895 my $slaying = "?random/$md5";
2896
2897 if ($exit->valid) {
2529 $exit->slaying ("?random/$md5"); 2898 $exit->slaying ("?random/$md5");
2530 $exit->msg (undef); 2899 $exit->msg (undef);
2900 }
2531 } 2901 }
2532} 2902}
2533 2903
2534sub cf::object::player::enter_exit { 2904sub cf::object::player::enter_exit {
2535 my ($self, $exit) = @_; 2905 my ($self, $exit) = @_;
2536 2906
2537 return unless $self->type == cf::PLAYER; 2907 return unless $self->type == cf::PLAYER;
2538 2908
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; 2909 $self->enter_link;
2551 2910
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 { 2911 (async {
2557 $self->deactivate_recursive; # just to be sure 2912 $Coro::current->{desc} = "enter_exit";
2913
2558 unless (eval { 2914 unless (eval {
2915 $self->deactivate_recursive; # just to be sure
2916
2917 # random map handling
2918 {
2919 my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921 prepare_random_map $exit
2922 if $exit->slaying eq "/!";
2923 }
2924
2925 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2926 my $x = $exit->stats->hp;
2927 my $y = $exit->stats->sp;
2928
2559 $self->goto ($slaying, $hp, $sp); 2929 $self->goto ($map, $x, $y);
2560 2930
2931 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y)
2933 if $exit->flag (cf::FLAG_DAMNED);
2934
2561 1; 2935 1
2562 }) { 2936 }) {
2563 $self->message ("Something went wrong deep within the crossfire server. " 2937 $self->message ("Something went wrong deep within the deliantra server. "
2564 . "I'll try to bring you back to the map you were before. " 2938 . "I'll try to bring you back to the map you were before. "
2565 . "Please report this to the dungeon master!", 2939 . "Please report this to the dungeon master!",
2566 cf::NDI_UNIQUE | cf::NDI_RED); 2940 cf::NDI_UNIQUE | cf::NDI_RED);
2567 2941
2568 warn "ERROR in enter_exit: $@"; 2942 error "ERROR in enter_exit: $@";
2569 $self->leave_link; 2943 $self->leave_link;
2570 } 2944 }
2571 })->prio (1); 2945 })->prio (1);
2572} 2946}
2573 2947
2585sub cf::client::send_drawinfo { 2959sub cf::client::send_drawinfo {
2586 my ($self, $text, $flags) = @_; 2960 my ($self, $text, $flags) = @_;
2587 2961
2588 utf8::encode $text; 2962 utf8::encode $text;
2589 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2963 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2964}
2965
2966=item $client->send_big_packet ($pkt)
2967
2968Like C<send_packet>, but tries to compress large packets, and fragments
2969them as required.
2970
2971=cut
2972
2973our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2974
2975sub cf::client::send_big_packet {
2976 my ($self, $pkt) = @_;
2977
2978 # try lzf for large packets
2979 $pkt = "lzf " . Compress::LZF::compress $pkt
2980 if 1024 <= length $pkt and $self->{can_lzf};
2981
2982 # split very large packets
2983 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2984 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2985 $pkt = "frag";
2986 }
2987
2988 $self->send_packet ($pkt);
2590} 2989}
2591 2990
2592=item $client->send_msg ($channel, $msg, $color, [extra...]) 2991=item $client->send_msg ($channel, $msg, $color, [extra...])
2593 2992
2594Send a drawinfo or msg packet to the client, formatting the msg for the 2993Send 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 2995the message, with C<log> being the default. If C<$color> is negative, suppress
2597the message unless the client supports the msg packet. 2996the message unless the client supports the msg packet.
2598 2997
2599=cut 2998=cut
2600 2999
3000# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 3001our %CHANNEL = (
3002 "c/motd" => {
3003 id => "infobox",
3004 title => "MOTD",
3005 reply => undef,
3006 tooltip => "The message of the day",
3007 },
2602 "c/identify" => { 3008 "c/identify" => {
2603 id => "identify", 3009 id => "infobox",
2604 title => "Identify", 3010 title => "Identify",
2605 reply => undef, 3011 reply => undef,
2606 tooltip => "Items recently identified", 3012 tooltip => "Items recently identified",
2607 }, 3013 },
2608 "c/examine" => { 3014 "c/examine" => {
2609 id => "examine", 3015 id => "infobox",
2610 title => "Examine", 3016 title => "Examine",
2611 reply => undef, 3017 reply => undef,
2612 tooltip => "Signs and other items you examined", 3018 tooltip => "Signs and other items you examined",
2613 }, 3019 },
3020 "c/shopinfo" => {
3021 id => "infobox",
3022 title => "Shop Info",
3023 reply => undef,
3024 tooltip => "What your bargaining skill tells you about the shop",
3025 },
3026 "c/book" => {
3027 id => "infobox",
3028 title => "Book",
3029 reply => undef,
3030 tooltip => "The contents of a note or book",
3031 },
3032 "c/lookat" => {
3033 id => "infobox",
3034 title => "Look",
3035 reply => undef,
3036 tooltip => "What you saw there",
3037 },
3038 "c/who" => {
3039 id => "infobox",
3040 title => "Players",
3041 reply => undef,
3042 tooltip => "Shows players who are currently online",
3043 },
3044 "c/body" => {
3045 id => "infobox",
3046 title => "Body Parts",
3047 reply => undef,
3048 tooltip => "Shows which body parts you posess and are available",
3049 },
3050 "c/statistics" => {
3051 id => "infobox",
3052 title => "Statistics",
3053 reply => undef,
3054 tooltip => "Shows your primary statistics",
3055 },
3056 "c/skills" => {
3057 id => "infobox",
3058 title => "Skills",
3059 reply => undef,
3060 tooltip => "Shows your experience per skill and item power",
3061 },
3062 "c/shopitems" => {
3063 id => "infobox",
3064 title => "Shop Items",
3065 reply => undef,
3066 tooltip => "Shows the items currently for sale in this shop",
3067 },
3068 "c/resistances" => {
3069 id => "infobox",
3070 title => "Resistances",
3071 reply => undef,
3072 tooltip => "Shows your resistances",
3073 },
3074 "c/pets" => {
3075 id => "infobox",
3076 title => "Pets",
3077 reply => undef,
3078 tooltip => "Shows information abotu your pets/a specific pet",
3079 },
3080 "c/perceiveself" => {
3081 id => "infobox",
3082 title => "Perceive Self",
3083 reply => undef,
3084 tooltip => "You gained detailed knowledge about yourself",
3085 },
3086 "c/uptime" => {
3087 id => "infobox",
3088 title => "Uptime",
3089 reply => undef,
3090 tooltip => "How long the server has been running since last restart",
3091 },
3092 "c/mapinfo" => {
3093 id => "infobox",
3094 title => "Map Info",
3095 reply => undef,
3096 tooltip => "Information related to the maps",
3097 },
3098 "c/party" => {
3099 id => "party",
3100 title => "Party",
3101 reply => "gsay ",
3102 tooltip => "Messages and chat related to your party",
3103 },
3104 "c/death" => {
3105 id => "death",
3106 title => "Death",
3107 reply => undef,
3108 tooltip => "Reason for and more info about your most recent death",
3109 },
3110 "c/say" => $SAY_CHANNEL,
3111 "c/chat" => $CHAT_CHANNEL,
2614); 3112);
2615 3113
2616sub cf::client::send_msg { 3114sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 3115 my ($self, $channel, $msg, $color, @extra) = @_;
2618 3116
2619 $msg = $self->pl->expand_cfpod ($msg); 3117 $msg = $self->pl->expand_cfpod ($msg)
3118 unless $color & cf::NDI_VERBATIM;
2620 3119
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 3120 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 3121
2623 # check predefined channels, for the benefit of C 3122 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3123 if ($CHANNEL{$channel}) {
3124 $channel = $CHANNEL{$channel};
2625 3125
3126 $self->ext_msg (channel_info => $channel);
3127 $channel = $channel->{id};
3128
2626 if (ref $channel) { 3129 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 3130 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 3131 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 3132 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 3133 $self->ext_msg (channel_info => $channel);
2631 if $self->can_msg;
2632 } 3134 }
2633 3135
2634 $channel = $channel->{id}; 3136 $channel = $channel->{id};
2635 } 3137 }
2636 3138
2637 return unless @extra || length $msg; 3139 return unless @extra || length $msg;
2638 3140
2639 if ($self->can_msg) {
2640 # default colour, mask it out 3141 # default colour, mask it out
2641 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3142 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2642 if $color & cf::NDI_DEF; 3143 if $color & cf::NDI_DEF;
2643 3144
2644 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3145 my $pkt = "msg "
3146 . $self->{json_coder}->encode (
2645 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3147 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2646 } else { 3148 );
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 3149
2658 $color &= cf::NDI_COLOR_MASK; 3150 $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} 3151}
2672 3152
2673=item $client->ext_msg ($type, @msg) 3153=item $client->ext_msg ($type, @msg)
2674 3154
2675Sends an ext event to the client. 3155Sends an ext event to the client.
2678 3158
2679sub cf::client::ext_msg($$@) { 3159sub cf::client::ext_msg($$@) {
2680 my ($self, $type, @msg) = @_; 3160 my ($self, $type, @msg) = @_;
2681 3161
2682 if ($self->extcmd == 2) { 3162 if ($self->extcmd == 2) {
2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3163 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2684 } elsif ($self->extcmd == 1) { # TODO: remove 3164 } elsif ($self->extcmd == 1) { # TODO: remove
2685 push @msg, msgtype => "event_$type"; 3165 push @msg, msgtype => "event_$type";
2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3166 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2687 } 3167 }
2688} 3168}
2689 3169
2690=item $client->ext_reply ($msgid, @msg) 3170=item $client->ext_reply ($msgid, @msg)
2691 3171
2695 3175
2696sub cf::client::ext_reply($$@) { 3176sub cf::client::ext_reply($$@) {
2697 my ($self, $id, @msg) = @_; 3177 my ($self, $id, @msg) = @_;
2698 3178
2699 if ($self->extcmd == 2) { 3179 if ($self->extcmd == 2) {
2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2701 } elsif ($self->extcmd == 1) { 3181 } elsif ($self->extcmd == 1) {
2702 #TODO: version 1, remove 3182 #TODO: version 1, remove
2703 unshift @msg, msgtype => "reply", msgid => $id; 3183 unshift @msg, msgtype => "reply", msgid => $id;
2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2705 } 3185 }
2706} 3186}
2707 3187
2708=item $success = $client->query ($flags, "text", \&cb) 3188=item $success = $client->query ($flags, "text", \&cb)
2709 3189
2780 3260
2781 $ns->ext_reply ($reply, @reply) 3261 $ns->ext_reply ($reply, @reply)
2782 if $reply; 3262 if $reply;
2783 3263
2784 } else { 3264 } else {
2785 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3265 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2786 } 3266 }
2787 3267
2788 cf::override; 3268 cf::override;
2789 }, 3269 },
2790); 3270);
2810 3290
2811 $coro 3291 $coro
2812} 3292}
2813 3293
2814cf::client->attach ( 3294cf::client->attach (
2815 on_destroy => sub { 3295 on_client_destroy => sub {
2816 my ($ns) = @_; 3296 my ($ns) = @_;
2817 3297
2818 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3298 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2819 }, 3299 },
2820); 3300);
2836our $safe_hole = new Safe::Hole; 3316our $safe_hole = new Safe::Hole;
2837 3317
2838$SIG{FPE} = 'IGNORE'; 3318$SIG{FPE} = 'IGNORE';
2839 3319
2840$safe->permit_only (Opcode::opset qw( 3320$safe->permit_only (Opcode::opset qw(
2841 :base_core :base_mem :base_orig :base_math 3321 :base_core :base_mem :base_orig :base_math :base_loop
2842 grepstart grepwhile mapstart mapwhile 3322 grepstart grepwhile mapstart mapwhile
2843 sort time 3323 sort time
2844)); 3324));
2845 3325
2846# here we export the classes and methods available to script code 3326# here we export the classes and methods available to script code
2848=pod 3328=pod
2849 3329
2850The following functions and methods are available within a safe environment: 3330The following functions and methods are available within a safe environment:
2851 3331
2852 cf::object 3332 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 3333 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 3334 insert remove name archname title slaying race decrease split
3335 value
2855 3336
2856 cf::object::player 3337 cf::object::player
2857 player 3338 player
2858 3339
2859 cf::player 3340 cf::player
2864 3345
2865=cut 3346=cut
2866 3347
2867for ( 3348for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3349 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 3350 insert remove inv nrof name archname title slaying race
2870 decrease_ob_nr)], 3351 decrease split destroy change_exp value msg lore send_msg)],
2871 ["cf::object::player" => qw(player)], 3352 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3353 ["cf::player" => qw(peaceful send_msg)],
2873 ["cf::map" => qw(trigger)], 3354 ["cf::map" => qw(trigger)],
2874) { 3355) {
2875 no strict 'refs';
2876 my ($pkg, @funs) = @$_; 3356 my ($pkg, @funs) = @$_;
2877 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3357 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2878 for @funs; 3358 for @funs;
2879} 3359}
2880 3360
2895 3375
2896 my $qcode = $code; 3376 my $qcode = $code;
2897 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3377 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2898 $qcode =~ s/\n/\\n/g; 3378 $qcode =~ s/\n/\\n/g;
2899 3379
3380 %vars = (_dummy => 0) unless %vars;
3381
3382 my @res;
2900 local $_; 3383 local $_;
2901 local @safe::cf::_safe_eval_args = values %vars;
2902 3384
2903 my $eval = 3385 my $eval =
2904 "do {\n" 3386 "do {\n"
2905 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3387 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2906 . "#line 0 \"{$qcode}\"\n" 3388 . "#line 0 \"{$qcode}\"\n"
2907 . $code 3389 . $code
2908 . "\n}" 3390 . "\n}"
2909 ; 3391 ;
2910 3392
3393 if ($CFG{safe_eval}) {
2911 sub_generation_inc; 3394 sub_generation_inc;
3395 local @safe::cf::_safe_eval_args = values %vars;
2912 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3396 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2913 sub_generation_inc; 3397 sub_generation_inc;
3398 } else {
3399 local @cf::_safe_eval_args = values %vars;
3400 @res = wantarray ? eval eval : scalar eval $eval;
3401 }
2914 3402
2915 if ($@) { 3403 if ($@) {
2916 warn "$@"; 3404 warn "$@",
2917 warn "while executing safe code '$code'\n"; 3405 "while executing safe code '$code'\n",
2918 warn "with arguments " . (join " ", %vars) . "\n"; 3406 "with arguments " . (join " ", %vars) . "\n";
2919 } 3407 }
2920 3408
2921 wantarray ? @res : $res[0] 3409 wantarray ? @res : $res[0]
2922} 3410}
2923 3411
2937=cut 3425=cut
2938 3426
2939sub register_script_function { 3427sub register_script_function {
2940 my ($fun, $cb) = @_; 3428 my ($fun, $cb) = @_;
2941 3429
2942 no strict 'refs'; 3430 $fun = "safe::$fun" if $CFG{safe_eval};
2943 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3431 *$fun = $safe_hole->wrap ($cb);
2944} 3432}
2945 3433
2946=back 3434=back
2947 3435
2948=cut 3436=cut
2957 # for this (global event?) 3445 # for this (global event?)
2958 %ext::player_env::MUSIC_FACE_CACHE = (); 3446 %ext::player_env::MUSIC_FACE_CACHE = ();
2959 3447
2960 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2961 3449
2962 warn "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
2963 3451
2964 my $facedata; 3452 my $facedata = decode_storable load_file $path;
2965 0 < aio_load $path, $facedata
2966 or die "$path: $!";
2967
2968 $facedata = Coro::Storable::thaw $facedata;
2969 3453
2970 $facedata->{version} == 2 3454 $facedata->{version} == 2
2971 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
2972 3456
2973 # patch in the exptable 3457 # patch in the exptable
3458 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2974 $facedata->{resource}{"res/exp_table"} = { 3459 $facedata->{resource}{"res/exp_table"} = {
2975 type => FT_RSRC, 3460 type => FT_RSRC,
2976 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3461 data => $exp_table,
3462 hash => (Digest::MD5::md5 $exp_table),
2977 }; 3463 };
2978 cf::cede_to_tick; 3464 cf::cede_to_tick;
2979 3465
2980 { 3466 {
2981 my $faces = $facedata->{faceinfo}; 3467 my $faces = $facedata->{faceinfo};
2982 3468
2983 while (my ($face, $info) = each %$faces) { 3469 while (my ($face, $info) = each %$faces) {
2984 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3470 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3471
2985 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2989 3477
2990 cf::cede_to_tick; 3478 cf::cede_to_tick;
2991 } 3479 }
2992 3480
2993 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
2994 next unless $info->{smooth}; 3482 next unless $info->{smooth};
3483
2995 my $idx = cf::face::find $face 3484 my $idx = cf::face::find $face
2996 or next; 3485 or next;
3486
2997 if (my $smooth = cf::face::find $info->{smooth}) { 3487 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth; 3488 cf::face::set_smooth $idx, $smooth;
2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3489 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3000 } else { 3490 } else {
3001 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3491 error "smooth face '$info->{smooth}' not found for face '$face'";
3002 } 3492 }
3003 3493
3004 cf::cede_to_tick; 3494 cf::cede_to_tick;
3005 } 3495 }
3006 } 3496 }
3015 3505
3016 cf::anim::invalidate_all; # d'oh 3506 cf::anim::invalidate_all; # d'oh
3017 } 3507 }
3018 3508
3019 { 3509 {
3020 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource}; 3510 my $res = $facedata->{resource};
3023 3511
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) { 3512 while (my ($name, $info) = each %$res) {
3513 if (defined $info->{type}) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3514 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data;
3029 3515
3030 if ($info->{type} & 1) { 3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3031 # prepend meta info 3517 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 { 3518 } else {
3040 $data = $info->{data}; 3519 $RESOURCE{$name} = $info; # unused
3041 } 3520 }
3042 3521
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; 3522 cf::cede_to_tick;
3047 } 3523 }
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 } 3524 }
3525
3526 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3067 3527
3068 1 3528 1
3069} 3529}
3070 3530
3071register_exticmd fx_want => sub { 3531register_exticmd fx_want => sub {
3073 3533
3074 while (my ($k, $v) = each %$want) { 3534 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v); 3535 $ns->fx_want ($k, $v);
3076 } 3536 }
3077}; 3537};
3538
3539sub load_resource_file($) {
3540 my $guard = lock_acquire "load_resource_file";
3541
3542 my $status = load_resource_file_ $_[0];
3543 get_slot 0.1, 100;
3544 cf::arch::commit_load;
3545
3546 $status
3547}
3078 3548
3079sub reload_regions { 3549sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework 3550 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?) 3551 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = (); 3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3096} 3566}
3097 3567
3098sub reload_archetypes { 3568sub reload_archetypes {
3099 load_resource_file "$DATADIR/archetypes" 3569 load_resource_file "$DATADIR/archetypes"
3100 or die "unable to load archetypes\n"; 3570 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} 3571}
3107 3572
3108sub reload_treasures { 3573sub reload_treasures {
3109 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
3110 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
3111} 3576}
3112 3577
3578sub reload_sound {
3579 trace "loading sound config from $DATADIR/sound\n";
3580
3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3582
3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3584 my $sound = $soundconf->{compat}[$_]
3585 or next;
3586
3587 my $face = cf::face::find "sound/$sound->[1]";
3588 cf::sound::set $sound->[0] => $face;
3589 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3590 }
3591
3592 while (my ($k, $v) = each %{$soundconf->{event}}) {
3593 my $face = cf::face::find "sound/$v";
3594 cf::sound::set $k => $face;
3595 }
3596}
3597
3113sub reload_resources { 3598sub reload_resources {
3114 warn "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3115 3600
3601 reload_exp_table;
3602 reload_materials;
3603 reload_facedata;
3604 reload_sound;
3605 reload_archetypes;
3116 reload_regions; 3606 reload_regions;
3117 reload_facedata;
3118 #reload_archetypes;#d#
3119 reload_archetypes;
3120 reload_treasures; 3607 reload_treasures;
3121 3608
3122 warn "finished reloading resource files\n"; 3609 trace "finished reloading resource files\n";
3123}
3124
3125sub init {
3126 reload_resources;
3127} 3610}
3128 3611
3129sub reload_config { 3612sub reload_config {
3130 open my $fh, "<:utf8", "$CONFDIR/config" 3613 trace "reloading config file...\n";
3131 or return;
3132 3614
3133 local $/; 3615 my $config = load_file "$CONFDIR/config";
3134 *CFG = YAML::Syck::Load <$fh>; 3616 utf8::decode $config;
3617 *CFG = decode_yaml $config;
3135 3618
3136 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3137 3620
3138 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $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}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3140 3623
3141 if (exists $CFG{mlockall}) { 3624 if (exists $CFG{mlockall}) {
3145 }; 3628 };
3146 warn $@ if $@; 3629 warn $@ if $@;
3147 } 3630 }
3148} 3631}
3149 3632
3633sub pidfile() {
3634 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3635 or die "$PIDFILE: $!";
3636 flock $fh, &Fcntl::LOCK_EX
3637 or die "$PIDFILE: flock: $!";
3638 $fh
3639}
3640
3641# make sure only one server instance is running at any one time
3642sub atomic {
3643 my $fh = pidfile;
3644
3645 my $pid = <$fh>;
3646 kill 9, $pid if $pid > 0;
3647
3648 seek $fh, 0, 0;
3649 print $fh $$;
3650}
3651
3652sub main_loop {
3653 trace "EV::loop starting\n";
3654 if (1) {
3655 EV::loop;
3656 }
3657 trace "EV::loop returned\n";
3658 goto &main_loop unless $REALLY_UNLOOP;
3659}
3660
3150sub main { 3661sub main {
3662 cf::init_globals; # initialise logging
3663
3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668
3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3670
3151 # we must not ever block the main coroutine 3671 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3672 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3673 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3674 (async {
3155 Event::one_event; 3675 $Coro::current->{desc} = "IDLE BUG HANDLER";
3676 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3677 })->prio (Coro::PRIO_MAX);
3157 }; 3678 };
3158 3679
3680 evthread_start IO::AIO::poll_fileno;
3681
3682 cf::sync_job {
3683 cf::incloader::init ();
3684
3685 cf::init_anim;
3686 cf::init_attackmess;
3687 cf::init_dynamic;
3688
3689 cf::load_settings;
3690
3691 reload_resources;
3159 reload_config; 3692 reload_config;
3160 db_init; 3693 db_init;
3694
3695 cf::init_uuid;
3696 cf::init_signals;
3697 cf::init_skills;
3698
3699 cf::init_beforeplay;
3700
3701 atomic;
3702
3161 load_extensions; 3703 load_extensions;
3162 3704
3163 $TICK_WATCHER->start; 3705 utime time, time, $RUNTIMEFILE;
3164 Event::loop; 3706
3707 # no (long-running) fork's whatsoever before this point(!)
3708 use POSIX ();
3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3710
3711 cf::_post_init 0;
3712 };
3713
3714 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n";
3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3722 goto &main_loop;
3165} 3723}
3166 3724
3167############################################################################# 3725#############################################################################
3168# initialisation and cleanup 3726# initialisation and cleanup
3169 3727
3170# install some emergency cleanup handlers 3728# install some emergency cleanup handlers
3171BEGIN { 3729BEGIN {
3730 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3731 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3732 $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"; 3733 cf::cleanup "SIG$signal";
3180 },
3181 ); 3734 };
3182 } 3735 }
3183} 3736}
3184 3737
3185sub write_runtime { 3738sub write_runtime_sync {
3186 my $runtime = "$LOCALDIR/runtime"; 3739 my $t0 = AE::time;
3187 3740
3188 # first touch the runtime file to show we are still running: 3741 # first touch the runtime file to show we are still running:
3189 # the fsync below can take a very very long time. 3742 # the fsync below can take a very very long time.
3190 3743
3191 IO::AIO::aio_utime $runtime, undef, undef; 3744 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3192 3745
3193 my $guard = cf::lock_acquire "write_runtime"; 3746 my $guard = cf::lock_acquire "write_runtime";
3194 3747
3195 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3748 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3196 or return; 3749 or return;
3197 3750
3198 my $value = $cf::RUNTIME + 90 + 10; 3751 my $value = $cf::RUNTIME + 90 + 10;
3199 # 10 is the runtime save interval, for a monotonic clock 3752 # 10 is the runtime save interval, for a monotonic clock
3200 # 60 allows for the watchdog to kill the server. 3753 # 60 allows for the watchdog to kill the server.
3210 aio_utime $fh, undef, undef; 3763 aio_utime $fh, undef, undef;
3211 3764
3212 close $fh 3765 close $fh
3213 or return; 3766 or return;
3214 3767
3215 aio_rename "$runtime~", $runtime 3768 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3216 and return; 3769 and return;
3217 3770
3218 warn "runtime file written.\n"; 3771 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3219 3772
3220 1 3773 1
3774}
3775
3776our $uuid_lock;
3777our $uuid_skip;
3778
3779sub write_uuid_sync($) {
3780 $uuid_skip ||= $_[0];
3781
3782 return if $uuid_lock;
3783 local $uuid_lock = 1;
3784
3785 my $uuid = "$LOCALDIR/uuid";
3786
3787 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3788 or return;
3789
3790 my $value = uuid_seq uuid_cur;
3791
3792 unless ($value) {
3793 info "cowardly refusing to write zero uuid value!\n";
3794 return;
3795 }
3796
3797 my $value = uuid_str $value + $uuid_skip;
3798 $uuid_skip = 0;
3799
3800 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3801 and return;
3802
3803 # always fsync - this file is important
3804 aio_fsync $fh
3805 and return;
3806
3807 close $fh
3808 or return;
3809
3810 aio_rename "$uuid~", $uuid
3811 and return;
3812
3813 trace "uuid file written ($value).\n";
3814
3815 1
3816
3817}
3818
3819sub write_uuid($$) {
3820 my ($skip, $sync) = @_;
3821
3822 $sync ? write_uuid_sync $skip
3823 : async { write_uuid_sync $skip };
3221} 3824}
3222 3825
3223sub emergency_save() { 3826sub emergency_save() {
3224 my $freeze_guard = cf::freeze_mainloop; 3827 my $freeze_guard = cf::freeze_mainloop;
3225 3828
3226 warn "enter emergency perl save\n"; 3829 info "emergency_perl_save: enter\n";
3830
3831 # this is a trade-off: we want to be very quick here, so
3832 # save all maps without fsync, and later call a global sync
3833 # (which in turn might be very very slow)
3834 local $USE_FSYNC = 0;
3227 3835
3228 cf::sync_job { 3836 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838
3229 # use a peculiar iteration method to avoid tripping on perl 3839 # use a peculiar iteration method to avoid tripping on perl
3230 # refcount bugs in for. also avoids problems with players 3840 # refcount bugs in for. also avoids problems with players
3231 # and maps saved/destroyed asynchronously. 3841 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3842 info "emergency_perl_save: begin player save\n";
3233 for my $login (keys %cf::PLAYER) { 3843 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3844 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3845 $pl->valid or next;
3846 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3847 $pl->save;
3237 } 3848 }
3238 warn "end emergency player save\n"; 3849 info "emergency_perl_save: end player save\n";
3239 3850
3240 warn "begin emergency map save\n"; 3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 info "emergency_perl_save: begin map save\n";
3241 for my $path (keys %cf::MAP) { 3854 for my $path (keys %cf::MAP) {
3242 my $map = $cf::MAP{$path} or next; 3855 my $map = $cf::MAP{$path} or next;
3243 $map->valid or next; 3856 $map->valid or next;
3244 $map->save; 3857 $map->save;
3245 } 3858 }
3246 warn "end emergency map save\n"; 3859 info "emergency_perl_save: end map save\n";
3247 3860
3248 warn "begin emergency database checkpoint\n"; 3861 cf::write_runtime_sync; # external watchdog should not bark
3862
3863 info "emergency_perl_save: begin database checkpoint\n";
3249 BDB::db_env_txn_checkpoint $DB_ENV; 3864 BDB::db_env_txn_checkpoint $DB_ENV;
3250 warn "end emergency database checkpoint\n"; 3865 info "emergency_perl_save: end database checkpoint\n";
3866
3867 info "emergency_perl_save: begin write uuid\n";
3868 write_uuid_sync 1;
3869 info "emergency_perl_save: end write uuid\n";
3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 trace "emergency_perl_save: syncing database to disk";
3874 BDB::db_env_txn_checkpoint $DB_ENV;
3875
3876 info "emergency_perl_save: starting sync\n";
3877 IO::AIO::aio_sync sub {
3878 info "emergency_perl_save: finished sync\n";
3879 };
3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3886 }
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3251 }; 3889 };
3252 3890
3253 warn "leave emergency perl save\n"; 3891 info "emergency_perl_save: leave\n";
3254} 3892}
3255 3893
3256sub post_cleanup { 3894sub post_cleanup {
3257 my ($make_core) = @_; 3895 my ($make_core) = @_;
3258 3896
3897 IO::AIO::flush;
3898
3259 warn Carp::longmess "post_cleanup backtrace" 3899 error Carp::longmess "post_cleanup backtrace"
3260 if $make_core; 3900 if $make_core;
3901
3902 my $fh = pidfile;
3903 unlink $PIDFILE if <$fh> == $$;
3904}
3905
3906# a safer delete_package, copied from Symbol
3907sub clear_package($) {
3908 my $pkg = shift;
3909
3910 # expand to full symbol table name if needed
3911 unless ($pkg =~ /^main::.*::$/) {
3912 $pkg = "main$pkg" if $pkg =~ /^::/;
3913 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3914 $pkg .= '::' unless $pkg =~ /::$/;
3915 }
3916
3917 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3918 my $stem_symtab = *{$stem}{HASH};
3919
3920 defined $stem_symtab and exists $stem_symtab->{$leaf}
3921 or return;
3922
3923 # clear all symbols
3924 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3925 for my $name (keys %$leaf_symtab) {
3926 _gv_clear *{"$pkg$name"};
3927# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3928 }
3261} 3929}
3262 3930
3263sub do_reload_perl() { 3931sub do_reload_perl() {
3264 # can/must only be called in main 3932 # can/must only be called in main
3265 if ($Coro::current != $Coro::main) { 3933 unless (in_main) {
3266 warn "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3267 return; 3935 return;
3268 } 3936 }
3269 3937
3270 warn "reloading..."; 3938 return if $RELOAD++;
3271 3939
3272 warn "entering sync_job"; 3940 my $t1 = AE::time;
3273 3941
3942 while ($RELOAD) {
3943 cf::get_slot 0.1, -1, "reload_perl";
3944 info "perl_reload: reloading...";
3945
3946 trace "perl_reload: entering sync_job";
3947
3274 cf::sync_job { 3948 cf::sync_job {
3275 cf::write_runtime; # external watchdog should not bark
3276 cf::emergency_save; 3949 #cf::emergency_save;
3277 cf::write_runtime; # external watchdog should not bark
3278 3950
3279 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV;
3281
3282 # if anything goes wrong in here, we should simply crash as we already saved
3283
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";
3290 for (;;) {
3291 BDB::flush;
3292 IO::AIO::flush;
3293 Coro::cede;
3294 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate...";
3296 }
3297
3298 ++$RELOAD;
3299
3300 warn "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3301 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3302 %EXT_CORO = (); 3953 %EXT_CORO = ();
3303 3954
3304 warn "removing commands"; 3955 trace "perl_reload: removing commands";
3305 %COMMAND = (); 3956 %COMMAND = ();
3306 3957
3307 warn "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3308 %EXTCMD = (); 3959 %EXTCMD = ();
3309 %EXTICMD = (); 3960 %EXTICMD = ();
3310 3961
3311 warn "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3312 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3313 warn "... unloading $pkg"; 3964 trace "... unloading $pkg";
3314 3965
3315 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3316 eval { 3967 eval {
3317 $cb->($pkg); 3968 $cb->($pkg);
3318 1 3969 1
3319 } or warn "$pkg unloaded, but with errors: $@"; 3970 } or error "$pkg unloaded, but with errors: $@";
3971 }
3972
3973 trace "... clearing $pkg";
3974 clear_package $pkg;
3320 } 3975 }
3321 3976
3322 warn "... nuking $pkg";
3323 Symbol::delete_package $pkg;
3324 }
3325
3326 warn "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3327 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3328 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3329 3980
3330 warn "... unloading $k"; 3981 trace "... unloading $k";
3331 delete $INC{$k}; 3982 delete $INC{$k};
3332 3983
3333 $k =~ s/\.pm$//; 3984 $k =~ s/\.pm$//;
3334 $k =~ s/\//::/g; 3985 $k =~ s/\//::/g;
3335 3986
3336 if (my $cb = $k->can ("unload_module")) { 3987 if (my $cb = $k->can ("unload_module")) {
3337 $cb->(); 3988 $cb->();
3989 }
3990
3991 clear_package $k;
3338 } 3992 }
3339 3993
3340 Symbol::delete_package $k;
3341 }
3342
3343 warn "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3344 Symbol::delete_package "safe::$_" 3995 clear_package "safe::$_"
3345 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3346 3997
3347 warn "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3348 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3349 delete $INC{"cf/pod.pm"}; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3350 4001
3351 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3352 # and global variables created in xs 4003 # and global variables created in xs
3353 #Symbol::delete_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3354 4005
3355 warn "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3356 4007
3357 warn "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3358 require cf; 4009 require cf;
3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4010 cf::_connect_to_perl_1;
3360 4011
3361 warn "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3362 cf::reload_config; 4013 cf::reload_config;
3363 4014
3364 warn "loading extensions"; 4015 trace "perl_reload: loading extensions";
3365 cf::load_extensions; 4016 cf::load_extensions;
3366 4017
4018 if ($REATTACH_ON_RELOAD) {
3367 warn "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3368 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3369 warn "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3370 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3371 warn "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3372 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
4025 }
3373 4026
3374 warn "leaving sync_job"; 4027 cf::_post_init 1;
3375 4028
4029 trace "perl_reload: leaving sync_job";
4030
3376 1 4031 1
3377 } or do { 4032 } or do {
3378 warn $@; 4033 error $@;
3379 warn "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3380 exit 1; 4035 };
4036
4037 --$RELOAD;
3381 }; 4038 }
3382 4039
3383 warn "reloaded"; 4040 $t1 = AE::time - $t1;
4041 info "perl_reload: completed in ${t1}s\n";
3384}; 4042};
3385 4043
3386our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3387 4045
3388sub reload_perl() { 4046sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 4047 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 4048 # coro crashes during coro_state_free->destroy here.
3391 4049
3392 $RELOAD_WATCHER ||= Event->timer ( 4050 $RELOAD_WATCHER ||= cf::async {
3393 reentrant => 0, 4051 Coro::AIO::aio_wait cache_extensions;
3394 after => 0, 4052
3395 data => WF_AUTOCANCEL, 4053 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3396 cb => sub {
3397 do_reload_perl; 4054 do_reload_perl;
3398 undef $RELOAD_WATCHER; 4055 undef $RELOAD_WATCHER;
3399 }, 4056 };
3400 ); 4057 };
3401} 4058}
3402 4059
3403register_command "reload" => sub { 4060register_command "reload" => sub {
3404 my ($who, $arg) = @_; 4061 my ($who, $arg) = @_;
3405 4062
3406 if ($who->flag (FLAG_WIZ)) { 4063 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 4064 $who->message ("reloading server.");
4065 async {
4066 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 4067 reload_perl;
4068 };
3409 } 4069 }
3410}; 4070};
3411 4071
3412unshift @INC, $LIBDIR; 4072#############################################################################
3413 4073
3414my $bug_warning = 0; 4074my $bug_warning = 0;
3415 4075
3416our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
3417our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
3418 4078
3419sub wait_for_tick { 4079sub wait_for_tick() {
3420 return unless $TICK_WATCHER->is_active;
3421 return if $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3422 4081
3423 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
3424 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
3425 $signal->wait; 4084 $signal->wait;
3426} 4085}
3427 4086
3428sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3429 return unless $TICK_WATCHER->is_active;
3430 return if $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3431 4089
3432 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 4092 $signal->wait;
3435} 4093}
3436 4094
3437 my $min = 1e6;#d# 4095sub 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) { 4096 if ($Coro::current != $Coro::main) {
3447 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3448 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3449 return; 4099 return;
3450 } 4100 }
3451 4101
3452 $NOW = $tick_start = Event::time;
3453
3454 cf::server_tick; # one server iteration 4102 cf::server_tick; # one server iteration
3455 4103
3456 0 && sync_job {#d# 4104 #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 4105
3462 $map->width (50); 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3463 $map->height (50); 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3464 $map->alloc; 4108 Coro::async_pool {
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 4109 $Coro::current->{desc} = "runtime saver";
3466 my $t = Event::time - $t; 4110 write_runtime_sync
3467 4111 or error "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 }; 4112 };
4113 }
3478 4114
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) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 4116 $sig->send;
3495 } 4117 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 4118 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 4119 $sig->send;
3498 } 4120 }
3499 4121
3500 $NOW = Event::time; 4122 $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; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 4124
3511 _post_tick; 4125 if (0) {
3512 4126 if ($NEXT_TICK) {
3513 4127 my $jitter = $TICK_START - $NEXT_TICK;
4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4129 debug "jitter $JITTER\n";#d#
4130 }
3514 }, 4131 }
3515); 4132}
3516 4133
3517{ 4134{
3518 BDB::max_poll_time $TICK * 0.1; 4135 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 4136
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; 4137 BDB::min_parallel 16;
3528 4138 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 4139 $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 4140
3544 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4145 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4146 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4147 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 4148
3547 cf::sync_job { 4149 cf::sync_job {
3548 eval { 4150 eval {
3549 BDB::db_env_open 4151 BDB::db_env_open
3550 $DB_ENV, 4152 $DB_ENV,
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4154 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4155 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 4156 0666;
3555 4157
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4158 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 }; 4159 };
3561 4160
3562 cf::cleanup "db_env_open(db): $@" if $@; 4161 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 4162 };
3564 } 4163 }
4164
4165 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4166 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4167 };
4168 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4169 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170 };
4171 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173 };
3565} 4174}
3566 4175
3567{ 4176{
4177 # configure IO::AIO
4178
3568 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 4181 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} 4182}
3581 4183
3582my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3583 4186
3584sub _log_backtrace { 4187sub _log_backtrace {
3585 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3586 4189
3587 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3588 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3589 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3591 ++$_log_backtrace; 4198 ++$_log_backtrace;
4199 my $perl_bt = Carp::longmess $msg;
3592 async { 4200 async {
4201 $Coro::current->{desc} = "abt $msg";
4202
3593 my @bt = fork_call { 4203 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 4204 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 4207 or die "addr2line: $!";
3605 } 4215 }
3606 4216
3607 @funcs 4217 @funcs
3608 }; 4218 };
3609 4219
3610 LOG llevInfo, "[ABT] $msg\n"; 4220 LOG llevInfo, "[ABT] $perl_bt\n";
4221 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3611 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3612 --$_log_backtrace; 4223 --$_log_backtrace;
3613 }; 4224 };
3614 } else { 4225 } else {
3615 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3616 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3617 } 4228 }
3618} 4229}
3619 4230
3620# load additional modules 4231# load additional modules
3621use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3622 4234
3623END { cf::emergency_save } 4235END { cf::emergency_save }
3624 4236
36251 42371
3626 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines