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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines