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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.569 by root, Wed May 4 07:36:40 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines