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.340 by root, Fri Aug 24 00:40:31 2007 UTC vs.
Revision 1.563 by root, Sat Apr 23 04:56:51 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;
2062
2063 $self->_load_header ($f)
2064 or return;
2065
2066 local $MAP_LOADING{$self->{path}} = $self;
2067 $f->resolve_delayed_derefs;
1756 2068
1757 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1758 2070
1759 1 2071 1
1760} 2072}
1812 2124
1813sub find; 2125sub find;
1814sub find { 2126sub find {
1815 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
1816 2128
2129 cf::cede_to_tick;
2130
1817 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1818 2132
2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1820 2135
1821 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path";
1823 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
1824 or return; 2138 or return;
1825 2139
1826 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
1827 2141
1829 or return; 2143 or return;
1830 2144
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2145 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 2146 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 2147 #$cf::WAIT_FOR_TICK->wait;
2148 undef $guard2;
2149 undef $guard1;
1834 $map->reset; 2150 $map->reset;
1835 undef $guard;
1836 return find $path; 2151 return find $path;
1837 } 2152 }
1838 2153
1839 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1840 } 2155 }
1841} 2156}
1842 2157
1843sub pre_load { } 2158sub pre_load { }
1844sub post_load { } 2159#sub post_load { } # XS
1845 2160
1846sub load { 2161sub load {
1847 my ($self) = @_; 2162 my ($self) = @_;
1848 2163
1849 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
1850 2165
1851 my $path = $self->{path}; 2166 my $path = $self->{path};
1852 2167
1853 { 2168 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2169 my $guard = cf::lock_acquire "map_data:$path";
1855 2170
2171 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2172 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2173
1858 $self->in_memory (cf::MAP_LOADING); 2174 $self->in_memory (cf::MAP_LOADING);
1859 2175
1860 $self->alloc; 2176 $self->alloc;
1861 2177
1862 $self->pre_load; 2178 $self->pre_load;
1863 Coro::cede; 2179 cf::cede_to_tick;
1864 2180
1865 $self->_load_objects ($self->{load_path}, 1) 2181 if (exists $self->{load_path}) {
2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2183 $f->skip_block;
2184 $self->_load_objects ($f)
1866 or return; 2185 or return;
1867 2186
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2187 $self->post_load_original
1869 if delete $self->{load_original}; 2188 if delete $self->{load_original};
1870 2189
1871 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2191 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2192 unless (aio_stat $uniq) {
2193 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2194 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2195 $self->_load_objects ($f);
2196 $f->resolve_delayed_derefs;
2197 }
2198 }
1876 } 2199 }
1877 }
1878 2200
1879 Coro::cede; 2201 $f->resolve_delayed_derefs;
2202 }
2203
2204 cf::cede_to_tick;
1880 # now do the right thing for maps 2205 # now do the right thing for maps
1881 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2208 unless $self->difficulty;
1884 Coro::cede; 2209 cf::cede_to_tick;
1885 2210
1886 unless ($self->{deny_activate}) { 2211 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2212 $self->decay_objects;
1888 $self->fix_auto_apply; 2213 $self->fix_auto_apply;
1889 $self->update_buttons; 2214 $self->update_buttons;
1890 Coro::cede; 2215 cf::cede_to_tick;
1891 $self->set_darkness_map;
1892 Coro::cede;
1893 $self->activate; 2216 $self->activate;
1894 } 2217 }
1895 2218
1896 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2220 $self->last_access ($cf::RUNTIME);
1898 2221
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2222 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2223 }
1901 2224
1902 $self->post_load; 2225 $self->post_load;
1903}
1904 2226
2227 1
2228}
2229
2230# customize the map for a given player, i.e.
2231# return the _real_ map. used by e.g. per-player
2232# maps to change the path to ~playername/mappath
1905sub customise_for { 2233sub customise_for {
1906 my ($self, $ob) = @_; 2234 my ($self, $ob) = @_;
1907 2235
1908 return find "~" . $ob->name . "/" . $self->{path} 2236 return find "~" . $ob->name . "/" . $self->{path}
1909 if $self->per_player; 2237 if $self->per_player;
1925 or next; 2253 or next;
1926 $neigh = find $neigh, $map 2254 $neigh = find $neigh, $map
1927 or next; 2255 or next;
1928 $neigh->load; 2256 $neigh->load;
1929 2257
2258 # now find the diagonal neighbours
1930 push @neigh, 2259 push @neigh,
1931 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1932 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1933 } 2262 }
1934 2263
1941} 2270}
1942 2271
1943sub find_sync { 2272sub find_sync {
1944 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
1945 2274
1946 cf::sync_job { find $path, $origin } 2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main;
2277
2278 find $path, $origin
1947} 2279}
1948 2280
1949sub do_load_sync { 2281sub do_load_sync {
1950 my ($map) = @_; 2282 my ($map) = @_;
1951 2283
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2285 if $Coro::current == $Coro::main;
1954 2286
1955 cf::sync_job { $map->load }; 2287 $map->load;
1956} 2288}
1957 2289
1958our %MAP_PREFETCH; 2290our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2291our $MAP_PREFETCHER = undef;
1960 2292
1962 my ($path, $origin, $load) = @_; 2294 my ($path, $origin, $load) = @_;
1963 2295
1964 $path = normalise $path, $origin && $origin->{path}; 2296 $path = normalise $path, $origin && $origin->{path};
1965 2297
1966 if (my $map = $cf::MAP{$path}) { 2298 if (my $map = $cf::MAP{$path}) {
1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2300 }
1969 2301
1970 $MAP_PREFETCH{$path} |= $load; 2302 $MAP_PREFETCH{$path} |= $load;
1971 2303
1972 $MAP_PREFETCHER ||= cf::async { 2304 $MAP_PREFETCHER ||= cf::async {
2305 $Coro::current->{desc} = "map prefetcher";
2306
1973 while (%MAP_PREFETCH) { 2307 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2308 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2309 if (my $map = find $k) {
1976 $map->load if $v; 2310 $map->load if $v;
1977 } 2311 }
1984 $MAP_PREFETCHER->prio (6); 2318 $MAP_PREFETCHER->prio (6);
1985 2319
1986 () 2320 ()
1987} 2321}
1988 2322
2323# common code, used by both ->save and ->swapout
1989sub save { 2324sub _save {
1990 my ($self) = @_; 2325 my ($self) = @_;
1991
1992 my $lock = cf::lock_acquire "map_data:" . $self->path;
1993 2326
1994 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
1995 2328
1996 return unless $self->dirty; 2329 return unless $self->dirty;
1997 2330
2003 return if $self->{deny_save}; 2336 return if $self->{deny_save};
2004 2337
2005 local $self->{last_access} = $self->last_access;#d# 2338 local $self->{last_access} = $self->last_access;#d#
2006 2339
2007 cf::async { 2340 cf::async {
2341 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2342 $_->contr->save for $self->players;
2009 }; 2343 };
2344
2345 cf::get_slot 0.02;
2010 2346
2011 if ($uniq) { 2347 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2348 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2349 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2014 } else { 2350 } else {
2015 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2351 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2016 } 2352 }
2017} 2353}
2018 2354
2355sub save {
2356 my ($self) = @_;
2357
2358 my $lock = cf::lock_acquire "map_data:$self->{path}";
2359
2360 $self->_save;
2361}
2362
2019sub swap_out { 2363sub swap_out {
2020 my ($self) = @_; 2364 my ($self) = @_;
2021 2365
2022 # save first because save cedes
2023 $self->save;
2024
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2366 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2367
2368 return if $self->in_memory != cf::MAP_ACTIVE;
2369 return if $self->{deny_save};
2027 return if $self->players; 2370 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save};
2030 2371
2372 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP;
2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # then atomically save
2378 $self->_save;
2379
2380 # then free the map
2031 $self->clear; 2381 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2382}
2034 2383
2035sub reset_at { 2384sub reset_at {
2036 my ($self) = @_; 2385 my ($self) = @_;
2037 2386
2055 2404
2056 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2405 my $lock = cf::lock_acquire "map_data:$self->{path}";
2057 2406
2058 return if $self->players; 2407 return if $self->players;
2059 2408
2060 warn "resetting map ", $self->path; 2409 cf::trace "resetting map ", $self->path, "\n";
2061 2410
2062 $self->in_memory (cf::MAP_SWAPPED); 2411 $self->in_memory (cf::MAP_SWAPPED);
2063 2412
2064 # need to save uniques path 2413 # need to save uniques path
2065 unless ($self->{deny_save}) { 2414 unless ($self->{deny_save}) {
2069 if $uniq; 2418 if $uniq;
2070 } 2419 }
2071 2420
2072 delete $cf::MAP{$self->path}; 2421 delete $cf::MAP{$self->path};
2073 2422
2423 $self->deactivate;
2424 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2425 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2426
2078 $self->unlink_save; 2427 $self->unlink_save;
2079 $self->destroy; 2428 $self->destroy;
2080} 2429}
2081 2430
2082my $nuke_counter = "aaaa"; 2431my $nuke_counter = "aaaa";
2083 2432
2084sub nuke { 2433sub nuke {
2085 my ($self) = @_; 2434 my ($self) = @_;
2086 2435
2436 {
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2087 delete $cf::MAP{$self->path}; 2439 delete $cf::MAP{$self->path};
2088 2440
2089 $self->unlink_save; 2441 $self->unlink_save;
2090 2442
2091 bless $self, "cf::map"; 2443 bless $self, "cf::map::wrap";
2092 delete $self->{deny_reset}; 2444 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2445 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2446 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2447 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2448
2097 $cf::MAP{$self->path} = $self; 2449 $cf::MAP{$self->path} = $self;
2450 }
2098 2451
2099 $self->reset; # polite request, might not happen 2452 $self->reset; # polite request, might not happen
2100} 2453}
2101 2454
2102=item $maps = cf::map::tmp_maps 2455=item $maps = cf::map::tmp_maps
2144 2497
2145sub unique_maps() { 2498sub unique_maps() {
2146 [ 2499 [
2147 map { 2500 map {
2148 utf8::decode $_; 2501 utf8::decode $_;
2149 /\.map$/ 2502 s/\.map$//; # TODO future compatibility hack
2503 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2504 ? ()
2150 ? normalise $_ 2505 : normalise $_
2151 : ()
2152 } @{ aio_readdir $UNIQUEDIR or [] } 2506 } @{ aio_readdir $UNIQUEDIR or [] }
2153 ] 2507 ]
2154} 2508}
2155 2509
2156package cf; 2510=item cf::map::static_maps
2511
2512Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2513file in the shared directory excluding F</styles> and F</editor>). May
2514block.
2515
2516=cut
2517
2518sub static_maps() {
2519 my @dirs = "";
2520 my @maps;
2521
2522 while (@dirs) {
2523 my $dir = shift @dirs;
2524
2525 next if $dir eq "/styles" || $dir eq "/editor";
2526
2527 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2528 or return;
2529
2530 for (@$files) {
2531 s/\.map$// or next;
2532 utf8::decode $_;
2533 push @maps, "$dir/$_";
2534 }
2535
2536 push @dirs, map "$dir/$_", @$dirs;
2537 }
2538
2539 \@maps
2540}
2157 2541
2158=back 2542=back
2159 2543
2160=head3 cf::object 2544=head3 cf::object
2161 2545
2165 2549
2166=over 4 2550=over 4
2167 2551
2168=item $ob->inv_recursive 2552=item $ob->inv_recursive
2169 2553
2170Returns the inventory of the object _and_ their inventories, recursively. 2554Returns the inventory of the object I<and> their inventories, recursively,
2555but I<not> the object itself.
2171 2556
2172=cut 2557=cut
2173 2558
2174sub inv_recursive_; 2559sub inv_recursive_;
2175sub inv_recursive_ { 2560sub inv_recursive_ {
2178 2563
2179sub inv_recursive { 2564sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2565 inv_recursive_ inv $_[0]
2181} 2566}
2182 2567
2568=item $ref = $ob->ref
2569
2570Creates and returns a persistent reference to an object that can be stored as a string.
2571
2572=item $ob = cf::object::deref ($refstring)
2573
2574returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2575even if the object actually exists. May block.
2576
2577=cut
2578
2579sub deref {
2580 my ($ref) = @_;
2581
2582 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2583 my ($uuid, $name) = ($1, $2);
2584 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2585 or return;
2586 $pl->ob->uuid eq $uuid
2587 or return;
2588
2589 $pl->ob
2590 } else {
2591 warn "$ref: cannot resolve object reference\n";
2592 undef
2593 }
2594}
2595
2183package cf; 2596package cf;
2184 2597
2185=back 2598=back
2186 2599
2187=head3 cf::object::player 2600=head3 cf::object::player
2193Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2606Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2194can be C<undef>. Does the right thing when the player is currently in a 2607can be C<undef>. Does the right thing when the player is currently in a
2195dialogue with the given NPC character. 2608dialogue with the given NPC character.
2196 2609
2197=cut 2610=cut
2611
2612our $SAY_CHANNEL = {
2613 id => "say",
2614 title => "Map",
2615 reply => "say ",
2616 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2617};
2618
2619our $CHAT_CHANNEL = {
2620 id => "chat",
2621 title => "Chat",
2622 reply => "chat ",
2623 tooltip => "Player chat and shouts, global to the server.",
2624};
2198 2625
2199# rough implementation of a future "reply" method that works 2626# rough implementation of a future "reply" method that works
2200# with dialog boxes. 2627# with dialog boxes.
2201#TODO: the first argument must go, split into a $npc->reply_to ( method 2628#TODO: the first argument must go, split into a $npc->reply_to ( method
2202sub cf::object::player::reply($$$;$) { 2629sub cf::object::player::reply($$$;$) {
2214 my $dialog = $pl->{npc_dialog}; 2641 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2642 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216 2643
2217 } else { 2644 } else {
2218 $msg = $npc->name . " says: $msg" if $npc; 2645 $msg = $npc->name . " says: $msg" if $npc;
2219 $self->message ($msg, $flags); 2646 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2220 } 2647 }
2221 } 2648 }
2222} 2649}
2223 2650
2224=item $object->send_msg ($channel, $msg, $color, [extra...]) 2651=item $object->send_msg ($channel, $msg, $color, [extra...])
2249 2676
2250=item $player_object->enter_link 2677=item $player_object->enter_link
2251 2678
2252Freezes the player and moves him/her to a special map (C<{link}>). 2679Freezes the player and moves him/her to a special map (C<{link}>).
2253 2680
2254The player should be reasonably safe there for short amounts of time. You 2681The player should be reasonably safe there for short amounts of time (e.g.
2255I<MUST> call C<leave_link> as soon as possible, though. 2682for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2683though, as the player cannot control the character while it is on the link
2684map.
2256 2685
2257Will never block. 2686Will never block.
2258 2687
2259=item $player_object->leave_link ($map, $x, $y) 2688=item $player_object->leave_link ($map, $x, $y)
2260 2689
2280sub cf::object::player::enter_link { 2709sub cf::object::player::enter_link {
2281 my ($self) = @_; 2710 my ($self) = @_;
2282 2711
2283 $self->deactivate_recursive; 2712 $self->deactivate_recursive;
2284 2713
2714 ++$self->{_link_recursion};
2715
2285 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2716 return if UNIVERSAL::isa $self->map, "ext::map_link";
2286 2717
2287 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2288 if $self->map && $self->map->{path} ne "{link}"; 2719 if $self->map && $self->map->{path} ne "{link}";
2289 2720
2290 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2721 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2291} 2722}
2292 2723
2293sub cf::object::player::leave_link { 2724sub cf::object::player::leave_link {
2294 my ($self, $map, $x, $y) = @_; 2725 my ($self, $map, $x, $y) = @_;
2295 2726
2312 ($x, $y) = (-1, -1) 2743 ($x, $y) = (-1, -1)
2313 unless (defined $x) && (defined $y); 2744 unless (defined $x) && (defined $y);
2314 2745
2315 # use -1 or undef as default coordinates, not 0, 0 2746 # use -1 or undef as default coordinates, not 0, 0
2316 ($x, $y) = ($map->enter_x, $map->enter_y) 2747 ($x, $y) = ($map->enter_x, $map->enter_y)
2317 if $x <=0 && $y <= 0; 2748 if $x <= 0 && $y <= 0;
2318 2749
2319 $map->load; 2750 $map->load;
2320 $map->load_neighbours; 2751 $map->load_neighbours;
2321 2752
2322 return unless $self->contr->active; 2753 return unless $self->contr->active;
2323 $self->activate_recursive;
2324 2754
2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2326 $self->enter_map ($map, $x, $y); 2756 if ($self->enter_map ($map, $x, $y)) {
2327} 2757 # entering was successful
2758 delete $self->{_link_recursion};
2759 # only activate afterwards, to support waiting in hooks
2760 $self->activate_recursive;
2761 }
2328 2762
2763}
2764
2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2765=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2330 2766
2331Moves the player to the given map-path and coordinates by first freezing 2767Moves the player to the given map-path and coordinates by first freezing
2332her, loading and preparing them map, calling the provided $check callback 2768her, loading and preparing them map, calling the provided $check callback
2333that has to return the map if sucecssful, and then unfreezes the player on 2769that has to return the map if sucecssful, and then unfreezes the player on
2334the new (success) or old (failed) map position. In either case, $done will 2770the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process. 2771be called at the end of this process.
2336 2772
2773Note that $check will be called with a potentially non-loaded map, so if
2774it needs a loaded map it has to call C<< ->load >>.
2775
2337=cut 2776=cut
2338 2777
2339our $GOTOGEN; 2778our $GOTOGEN;
2340 2779
2341sub cf::object::player::goto { 2780sub cf::object::player::goto {
2342 my ($self, $path, $x, $y, $check, $done) = @_; 2781 my ($self, $path, $x, $y, $check, $done) = @_;
2343 2782
2783 if ($self->{_link_recursion} >= $MAX_LINKS) {
2784 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2785 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2786 ($path, $x, $y) = @$EMERGENCY_POSITION;
2787 }
2788
2344 # do generation counting so two concurrent goto's will be executed in-order 2789 # do generation counting so two concurrent goto's will be executed in-order
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2790 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2791
2347 $self->enter_link; 2792 $self->enter_link;
2348 2793
2349 (async { 2794 (async {
2795 $Coro::current->{desc} = "player::goto $path $x $y";
2796
2797 # *tag paths override both path and x|y
2798 if ($path =~ /^\*(.*)$/) {
2799 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2800 my $ob = $obs[rand @obs];
2801
2802 # see if we actually can go there
2803 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2804 $ob = $obs[rand @obs];
2805 } else {
2806 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2807 }
2808 # else put us there anyways for now #d#
2809
2810 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2811 } else {
2812 ($path, $x, $y) = (undef, undef, undef);
2813 }
2814 }
2815
2350 my $map = eval { 2816 my $map = eval {
2351 my $map = cf::map::find $path; 2817 my $map = defined $path ? cf::map::find $path : undef;
2352 2818
2353 if ($map) { 2819 if ($map) {
2354 $map = $map->customise_for ($self); 2820 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2821 $map = $check->($map, $x, $y, $self) if $check && $map;
2356 } else { 2822 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2823 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2824 }
2359 2825
2360 $map 2826 $map
2361 }; 2827 };
2362 2828
2368 if ($gen == $self->{_goto_generation}) { 2834 if ($gen == $self->{_goto_generation}) {
2369 delete $self->{_goto_generation}; 2835 delete $self->{_goto_generation};
2370 $self->leave_link ($map, $x, $y); 2836 $self->leave_link ($map, $x, $y);
2371 } 2837 }
2372 2838
2373 $done->() if $done; 2839 $done->($self) if $done;
2374 })->prio (1); 2840 })->prio (1);
2375} 2841}
2376 2842
2377=item $player_object->enter_exit ($exit_object) 2843=item $player_object->enter_exit ($exit_object)
2378 2844
2398} 2864}
2399 2865
2400sub prepare_random_map { 2866sub prepare_random_map {
2401 my ($exit) = @_; 2867 my ($exit) = @_;
2402 2868
2403 my $guard = cf::lock_acquire "exit_prepare:$exit";
2404
2405 # all this does is basically replace the /! path by 2869 # all this does is basically replace the /! path by
2406 # a new random map path (?random/...) with a seed 2870 # a new random map path (?random/...) with a seed
2407 # that depends on the exit object 2871 # that depends on the exit object
2408 2872
2409 my $rmp = parse_random_map_params $exit->msg; 2873 my $rmp = parse_random_map_params $exit->msg;
2411 if ($exit->map) { 2875 if ($exit->map) {
2412 $rmp->{region} = $exit->region->name; 2876 $rmp->{region} = $exit->region->name;
2413 $rmp->{origin_map} = $exit->map->path; 2877 $rmp->{origin_map} = $exit->map->path;
2414 $rmp->{origin_x} = $exit->x; 2878 $rmp->{origin_x} = $exit->x;
2415 $rmp->{origin_y} = $exit->y; 2879 $rmp->{origin_y} = $exit->y;
2880
2881 $exit->map->touch;
2416 } 2882 }
2417 2883
2418 $rmp->{random_seed} ||= $exit->random_seed; 2884 $rmp->{random_seed} ||= $exit->random_seed;
2419 2885
2420 my $data = cf::to_json $rmp; 2886 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2421 my $md5 = Digest::MD5::md5_hex $data; 2887 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2888 my $meta = "$RANDOMDIR/$md5.meta";
2423 2889
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2890 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2891 aio_write $fh, 0, (length $data), $data, 0;
2426 undef $fh; 2892 undef $fh;
2427 aio_rename "$meta~", $meta; 2893 aio_rename "$meta~", $meta;
2428 2894
2895 my $slaying = "?random/$md5";
2896
2897 if ($exit->valid) {
2429 $exit->slaying ("?random/$md5"); 2898 $exit->slaying ("?random/$md5");
2430 $exit->msg (undef); 2899 $exit->msg (undef);
2900 }
2431 } 2901 }
2432} 2902}
2433 2903
2434sub cf::object::player::enter_exit { 2904sub cf::object::player::enter_exit {
2435 my ($self, $exit) = @_; 2905 my ($self, $exit) = @_;
2436 2906
2437 return unless $self->type == cf::PLAYER; 2907 return unless $self->type == cf::PLAYER;
2438 2908
2439 if ($exit->slaying eq "/!") {
2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
2443 cf::sync_job { prepare_random_map $exit };
2444 }
2445
2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2447 my $hp = $exit->stats->hp;
2448 my $sp = $exit->stats->sp;
2449
2450 $self->enter_link; 2909 $self->enter_link;
2451 2910
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2456 (async { 2911 (async {
2457 $self->deactivate_recursive; # just to be sure 2912 $Coro::current->{desc} = "enter_exit";
2913
2458 unless (eval { 2914 unless (eval {
2915 $self->deactivate_recursive; # just to be sure
2916
2917 # random map handling
2918 {
2919 my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921 prepare_random_map $exit
2922 if $exit->slaying eq "/!";
2923 }
2924
2925 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2926 my $x = $exit->stats->hp;
2927 my $y = $exit->stats->sp;
2928
2459 $self->goto ($slaying, $hp, $sp); 2929 $self->goto ($map, $x, $y);
2460 2930
2931 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y)
2933 if $exit->flag (cf::FLAG_DAMNED);
2934
2461 1; 2935 1
2462 }) { 2936 }) {
2463 $self->message ("Something went wrong deep within the crossfire server. " 2937 $self->message ("Something went wrong deep within the deliantra server. "
2464 . "I'll try to bring you back to the map you were before. " 2938 . "I'll try to bring you back to the map you were before. "
2465 . "Please report this to the dungeon master!", 2939 . "Please report this to the dungeon master!",
2466 cf::NDI_UNIQUE | cf::NDI_RED); 2940 cf::NDI_UNIQUE | cf::NDI_RED);
2467 2941
2468 warn "ERROR in enter_exit: $@"; 2942 error "ERROR in enter_exit: $@";
2469 $self->leave_link; 2943 $self->leave_link;
2470 } 2944 }
2471 })->prio (1); 2945 })->prio (1);
2472} 2946}
2473 2947
2485sub cf::client::send_drawinfo { 2959sub cf::client::send_drawinfo {
2486 my ($self, $text, $flags) = @_; 2960 my ($self, $text, $flags) = @_;
2487 2961
2488 utf8::encode $text; 2962 utf8::encode $text;
2489 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2963 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2964}
2965
2966=item $client->send_big_packet ($pkt)
2967
2968Like C<send_packet>, but tries to compress large packets, and fragments
2969them as required.
2970
2971=cut
2972
2973our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2974
2975sub cf::client::send_big_packet {
2976 my ($self, $pkt) = @_;
2977
2978 # try lzf for large packets
2979 $pkt = "lzf " . Compress::LZF::compress $pkt
2980 if 1024 <= length $pkt and $self->{can_lzf};
2981
2982 # split very large packets
2983 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2984 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2985 $pkt = "frag";
2986 }
2987
2988 $self->send_packet ($pkt);
2490} 2989}
2491 2990
2492=item $client->send_msg ($channel, $msg, $color, [extra...]) 2991=item $client->send_msg ($channel, $msg, $color, [extra...])
2493 2992
2494Send a drawinfo or msg packet to the client, formatting the msg for the 2993Send a drawinfo or msg packet to the client, formatting the msg for the
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2995the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2996the message unless the client supports the msg packet.
2498 2997
2499=cut 2998=cut
2500 2999
3000# non-persistent channels (usually the info channel)
3001our %CHANNEL = (
3002 "c/motd" => {
3003 id => "infobox",
3004 title => "MOTD",
3005 reply => undef,
3006 tooltip => "The message of the day",
3007 },
3008 "c/identify" => {
3009 id => "infobox",
3010 title => "Identify",
3011 reply => undef,
3012 tooltip => "Items recently identified",
3013 },
3014 "c/examine" => {
3015 id => "infobox",
3016 title => "Examine",
3017 reply => undef,
3018 tooltip => "Signs and other items you examined",
3019 },
3020 "c/shopinfo" => {
3021 id => "infobox",
3022 title => "Shop Info",
3023 reply => undef,
3024 tooltip => "What your bargaining skill tells you about the shop",
3025 },
3026 "c/book" => {
3027 id => "infobox",
3028 title => "Book",
3029 reply => undef,
3030 tooltip => "The contents of a note or book",
3031 },
3032 "c/lookat" => {
3033 id => "infobox",
3034 title => "Look",
3035 reply => undef,
3036 tooltip => "What you saw there",
3037 },
3038 "c/who" => {
3039 id => "infobox",
3040 title => "Players",
3041 reply => undef,
3042 tooltip => "Shows players who are currently online",
3043 },
3044 "c/body" => {
3045 id => "infobox",
3046 title => "Body Parts",
3047 reply => undef,
3048 tooltip => "Shows which body parts you posess and are available",
3049 },
3050 "c/statistics" => {
3051 id => "infobox",
3052 title => "Statistics",
3053 reply => undef,
3054 tooltip => "Shows your primary statistics",
3055 },
3056 "c/skills" => {
3057 id => "infobox",
3058 title => "Skills",
3059 reply => undef,
3060 tooltip => "Shows your experience per skill and item power",
3061 },
3062 "c/shopitems" => {
3063 id => "infobox",
3064 title => "Shop Items",
3065 reply => undef,
3066 tooltip => "Shows the items currently for sale in this shop",
3067 },
3068 "c/resistances" => {
3069 id => "infobox",
3070 title => "Resistances",
3071 reply => undef,
3072 tooltip => "Shows your resistances",
3073 },
3074 "c/pets" => {
3075 id => "infobox",
3076 title => "Pets",
3077 reply => undef,
3078 tooltip => "Shows information abotu your pets/a specific pet",
3079 },
3080 "c/perceiveself" => {
3081 id => "infobox",
3082 title => "Perceive Self",
3083 reply => undef,
3084 tooltip => "You gained detailed knowledge about yourself",
3085 },
3086 "c/uptime" => {
3087 id => "infobox",
3088 title => "Uptime",
3089 reply => undef,
3090 tooltip => "How long the server has been running since last restart",
3091 },
3092 "c/mapinfo" => {
3093 id => "infobox",
3094 title => "Map Info",
3095 reply => undef,
3096 tooltip => "Information related to the maps",
3097 },
3098 "c/party" => {
3099 id => "party",
3100 title => "Party",
3101 reply => "gsay ",
3102 tooltip => "Messages and chat related to your party",
3103 },
3104 "c/death" => {
3105 id => "death",
3106 title => "Death",
3107 reply => undef,
3108 tooltip => "Reason for and more info about your most recent death",
3109 },
3110 "c/say" => $SAY_CHANNEL,
3111 "c/chat" => $CHAT_CHANNEL,
3112);
3113
2501sub cf::client::send_msg { 3114sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 3115 my ($self, $channel, $msg, $color, @extra) = @_;
2503 3116
2504 $msg = $self->pl->expand_cfpod ($msg); 3117 $msg = $self->pl->expand_cfpod ($msg)
3118 unless $color & cf::NDI_VERBATIM;
2505 3119
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 3120 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 3121
3122 # check predefined channels, for the benefit of C
3123 if ($CHANNEL{$channel}) {
3124 $channel = $CHANNEL{$channel};
3125
3126 $self->ext_msg (channel_info => $channel);
3127 $channel = $channel->{id};
3128
2508 if (ref $channel) { 3129 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 3130 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 3131 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 3132 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 3133 $self->ext_msg (channel_info => $channel);
2513 } 3134 }
2515 $channel = $channel->{id}; 3136 $channel = $channel->{id};
2516 } 3137 }
2517 3138
2518 return unless @extra || length $msg; 3139 return unless @extra || length $msg;
2519 3140
2520 if ($self->can_msg) {
2521 # default colour, mask it out 3141 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3142 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF; 3143 if $color & cf::NDI_DEF;
2524 3144
2525 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3145 my $pkt = "msg "
3146 . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3147 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2527 } else { 3148 );
2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538 3149
2539 $color &= cf::NDI_COLOR_MASK; 3150 $self->send_big_packet ($pkt);
2540
2541 utf8::encode $msg;
2542
2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2546 } else {
2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2548 $self->send_packet ("drawinfo $color $msg")
2549 }
2550 }
2551 }
2552} 3151}
2553 3152
2554=item $client->ext_msg ($type, @msg) 3153=item $client->ext_msg ($type, @msg)
2555 3154
2556Sends an ext event to the client. 3155Sends an ext event to the client.
2558=cut 3157=cut
2559 3158
2560sub cf::client::ext_msg($$@) { 3159sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 3160 my ($self, $type, @msg) = @_;
2562 3161
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 3162 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3163 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 3164 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 3165 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3166 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 3167 }
2571} 3168}
2572 3169
2573=item $client->ext_reply ($msgid, @msg) 3170=item $client->ext_reply ($msgid, @msg)
2574 3171
2578 3175
2579sub cf::client::ext_reply($$@) { 3176sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 3177 my ($self, $id, @msg) = @_;
2581 3178
2582 if ($self->extcmd == 2) { 3179 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 3181 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 3182 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 3183 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 3185 }
2589} 3186}
2590 3187
2591=item $success = $client->query ($flags, "text", \&cb) 3188=item $success = $client->query ($flags, "text", \&cb)
2592 3189
2663 3260
2664 $ns->ext_reply ($reply, @reply) 3261 $ns->ext_reply ($reply, @reply)
2665 if $reply; 3262 if $reply;
2666 3263
2667 } else { 3264 } else {
2668 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3265 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2669 } 3266 }
2670 3267
2671 cf::override; 3268 cf::override;
2672 }, 3269 },
2673); 3270);
2693 3290
2694 $coro 3291 $coro
2695} 3292}
2696 3293
2697cf::client->attach ( 3294cf::client->attach (
2698 on_destroy => sub { 3295 on_client_destroy => sub {
2699 my ($ns) = @_; 3296 my ($ns) = @_;
2700 3297
2701 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3298 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2702 }, 3299 },
2703); 3300);
2719our $safe_hole = new Safe::Hole; 3316our $safe_hole = new Safe::Hole;
2720 3317
2721$SIG{FPE} = 'IGNORE'; 3318$SIG{FPE} = 'IGNORE';
2722 3319
2723$safe->permit_only (Opcode::opset qw( 3320$safe->permit_only (Opcode::opset qw(
2724 :base_core :base_mem :base_orig :base_math 3321 :base_core :base_mem :base_orig :base_math :base_loop
2725 grepstart grepwhile mapstart mapwhile 3322 grepstart grepwhile mapstart mapwhile
2726 sort time 3323 sort time
2727)); 3324));
2728 3325
2729# here we export the classes and methods available to script code 3326# here we export the classes and methods available to script code
2731=pod 3328=pod
2732 3329
2733The following functions and methods are available within a safe environment: 3330The following functions and methods are available within a safe environment:
2734 3331
2735 cf::object 3332 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3333 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race 3334 insert remove name archname title slaying race decrease split
3335 value
2738 3336
2739 cf::object::player 3337 cf::object::player
2740 player 3338 player
2741 3339
2742 cf::player 3340 cf::player
2747 3345
2748=cut 3346=cut
2749 3347
2750for ( 3348for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3349 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)], 3350 insert remove inv nrof name archname title slaying race
3351 decrease split destroy change_exp value msg lore send_msg)],
2753 ["cf::object::player" => qw(player)], 3352 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 3353 ["cf::player" => qw(peaceful send_msg)],
2755 ["cf::map" => qw(trigger)], 3354 ["cf::map" => qw(trigger)],
2756) { 3355) {
2757 no strict 'refs';
2758 my ($pkg, @funs) = @$_; 3356 my ($pkg, @funs) = @$_;
2759 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3357 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2760 for @funs; 3358 for @funs;
2761} 3359}
2762 3360
2777 3375
2778 my $qcode = $code; 3376 my $qcode = $code;
2779 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3377 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2780 $qcode =~ s/\n/\\n/g; 3378 $qcode =~ s/\n/\\n/g;
2781 3379
3380 %vars = (_dummy => 0) unless %vars;
3381
3382 my @res;
2782 local $_; 3383 local $_;
2783 local @safe::cf::_safe_eval_args = values %vars;
2784 3384
2785 my $eval = 3385 my $eval =
2786 "do {\n" 3386 "do {\n"
2787 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3387 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2788 . "#line 0 \"{$qcode}\"\n" 3388 . "#line 0 \"{$qcode}\"\n"
2789 . $code 3389 . $code
2790 . "\n}" 3390 . "\n}"
2791 ; 3391 ;
2792 3392
3393 if ($CFG{safe_eval}) {
2793 sub_generation_inc; 3394 sub_generation_inc;
3395 local @safe::cf::_safe_eval_args = values %vars;
2794 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3396 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2795 sub_generation_inc; 3397 sub_generation_inc;
3398 } else {
3399 local @cf::_safe_eval_args = values %vars;
3400 @res = wantarray ? eval eval : scalar eval $eval;
3401 }
2796 3402
2797 if ($@) { 3403 if ($@) {
2798 warn "$@"; 3404 warn "$@",
2799 warn "while executing safe code '$code'\n"; 3405 "while executing safe code '$code'\n",
2800 warn "with arguments " . (join " ", %vars) . "\n"; 3406 "with arguments " . (join " ", %vars) . "\n";
2801 } 3407 }
2802 3408
2803 wantarray ? @res : $res[0] 3409 wantarray ? @res : $res[0]
2804} 3410}
2805 3411
2819=cut 3425=cut
2820 3426
2821sub register_script_function { 3427sub register_script_function {
2822 my ($fun, $cb) = @_; 3428 my ($fun, $cb) = @_;
2823 3429
2824 no strict 'refs'; 3430 $fun = "safe::$fun" if $CFG{safe_eval};
2825 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3431 *$fun = $safe_hole->wrap ($cb);
2826} 3432}
2827 3433
2828=back 3434=back
2829 3435
2830=cut 3436=cut
2833# the server's init and main functions 3439# the server's init and main functions
2834 3440
2835sub load_facedata($) { 3441sub load_facedata($) {
2836 my ($path) = @_; 3442 my ($path) = @_;
2837 3443
3444 # HACK to clear player env face cache, we need some signal framework
3445 # for this (global event?)
3446 %ext::player_env::MUSIC_FACE_CACHE = ();
3447
2838 my $enc = JSON::XS->new->utf8->canonical; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 3449
2840 warn "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
2841 3451
2842 my $facedata; 3452 my $facedata = decode_storable load_file $path;
2843 0 < aio_load $path, $facedata
2844 or die "$path: $!";
2845
2846 $facedata = Coro::Storable::thaw $facedata;
2847 3453
2848 $facedata->{version} == 2 3454 $facedata->{version} == 2
2849 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
2850 3456
2851 # patch in the exptable 3457 # patch in the exptable
3458 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2852 $facedata->{resource}{"res/exp_table"} = { 3459 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC, 3460 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3461 data => $exp_table,
3462 hash => (Digest::MD5::md5 $exp_table),
2855 }; 3463 };
2856 cf::cede_to_tick; 3464 cf::cede_to_tick;
2857 3465
2858 { 3466 {
2859 my $faces = $facedata->{faceinfo}; 3467 my $faces = $facedata->{faceinfo};
2860 3468
2861 while (my ($face, $info) = each %$faces) { 3469 while (my ($face, $info) = each %$faces) {
2862 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3470 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3471
2863 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2867 3477
2868 cf::cede_to_tick; 3478 cf::cede_to_tick;
2869 } 3479 }
2870 3480
2871 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
2872 next unless $info->{smooth}; 3482 next unless $info->{smooth};
3483
2873 my $idx = cf::face::find $face 3484 my $idx = cf::face::find $face
2874 or next; 3485 or next;
3486
2875 if (my $smooth = cf::face::find $info->{smooth}) { 3487 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth; 3488 cf::face::set_smooth $idx, $smooth;
2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3489 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2878 } else { 3490 } else {
2879 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3491 error "smooth face '$info->{smooth}' not found for face '$face'";
2880 } 3492 }
2881 3493
2882 cf::cede_to_tick; 3494 cf::cede_to_tick;
2883 } 3495 }
2884 } 3496 }
2893 3505
2894 cf::anim::invalidate_all; # d'oh 3506 cf::anim::invalidate_all; # d'oh
2895 } 3507 }
2896 3508
2897 { 3509 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource}; 3510 my $res = $facedata->{resource};
2901 3511
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) { 3512 while (my ($name, $info) = each %$res) {
3513 if (defined $info->{type}) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3514 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907 3515
2908 if ($info->{type} & 1) { 3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2909 # prepend meta info 3517 cf::face::set_type $idx, $info->{type};
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else { 3518 } else {
2918 $data = $info->{data}; 3519 $RESOURCE{$name} = $info; # unused
2919 } 3520 }
2920 3521
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick; 3522 cf::cede_to_tick;
2925 } 3523 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 } 3524 }
3525
3526 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2945 3527
2946 1 3528 1
2947} 3529}
2948 3530
2949register_exticmd fx_want => sub { 3531register_exticmd fx_want => sub {
2952 while (my ($k, $v) = each %$want) { 3534 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v); 3535 $ns->fx_want ($k, $v);
2954 } 3536 }
2955}; 3537};
2956 3538
3539sub load_resource_file($) {
3540 my $guard = lock_acquire "load_resource_file";
3541
3542 my $status = load_resource_file_ $_[0];
3543 get_slot 0.1, 100;
3544 cf::arch::commit_load;
3545
3546 $status
3547}
3548
2957sub reload_regions { 3549sub reload_regions {
3550 # HACK to clear player env face cache, we need some signal framework
3551 # for this (global event?)
3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3553
2958 load_resource_file "$MAPDIR/regions" 3554 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3555 or die "unable to load regions file\n";
2960 3556
2961 for (cf::region::list) { 3557 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3558 $_->{match} = qr/$_->{match}/
2970} 3566}
2971 3567
2972sub reload_archetypes { 3568sub reload_archetypes {
2973 load_resource_file "$DATADIR/archetypes" 3569 load_resource_file "$DATADIR/archetypes"
2974 or die "unable to load archetypes\n"; 3570 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2978 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n";
2980} 3571}
2981 3572
2982sub reload_treasures { 3573sub reload_treasures {
2983 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
2984 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
2985} 3576}
2986 3577
3578sub reload_sound {
3579 trace "loading sound config from $DATADIR/sound\n";
3580
3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3582
3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3584 my $sound = $soundconf->{compat}[$_]
3585 or next;
3586
3587 my $face = cf::face::find "sound/$sound->[1]";
3588 cf::sound::set $sound->[0] => $face;
3589 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3590 }
3591
3592 while (my ($k, $v) = each %{$soundconf->{event}}) {
3593 my $face = cf::face::find "sound/$v";
3594 cf::sound::set $k => $face;
3595 }
3596}
3597
2987sub reload_resources { 3598sub reload_resources {
2988 warn "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
2989 3600
3601 reload_exp_table;
3602 reload_materials;
3603 reload_facedata;
3604 reload_sound;
3605 reload_archetypes;
2990 reload_regions; 3606 reload_regions;
2991 reload_facedata;
2992 #reload_archetypes;#d#
2993 reload_archetypes;
2994 reload_treasures; 3607 reload_treasures;
2995 3608
2996 warn "finished reloading resource files\n"; 3609 trace "finished reloading resource files\n";
2997} 3610}
2998 3611
2999sub init { 3612sub reload_config {
3000 reload_resources; 3613 trace "reloading config file...\n";
3001}
3002 3614
3003sub cfg_load { 3615 my $config = load_file "$CONFDIR/config";
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3616 utf8::decode $config;
3005 or return; 3617 *CFG = decode_yaml $config;
3006 3618
3007 local $/;
3008 *CFG = YAML::Syck::Load <$fh>;
3009
3010 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3011 3620
3012 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3013 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3014 3623
3015 if (exists $CFG{mlockall}) { 3624 if (exists $CFG{mlockall}) {
3019 }; 3628 };
3020 warn $@ if $@; 3629 warn $@ if $@;
3021 } 3630 }
3022} 3631}
3023 3632
3633sub pidfile() {
3634 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3635 or die "$PIDFILE: $!";
3636 flock $fh, &Fcntl::LOCK_EX
3637 or die "$PIDFILE: flock: $!";
3638 $fh
3639}
3640
3641# make sure only one server instance is running at any one time
3642sub atomic {
3643 my $fh = pidfile;
3644
3645 my $pid = <$fh>;
3646 kill 9, $pid if $pid > 0;
3647
3648 seek $fh, 0, 0;
3649 print $fh $$;
3650}
3651
3652sub main_loop {
3653 trace "EV::loop starting\n";
3654 if (1) {
3655 EV::loop;
3656 }
3657 trace "EV::loop returned\n";
3658 goto &main_loop unless $REALLY_UNLOOP;
3659}
3660
3024sub main { 3661sub main {
3662 cf::init_globals; # initialise logging
3663
3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668
3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3670
3025 # we must not ever block the main coroutine 3671 # we must not ever block the main coroutine
3026 local $Coro::idle = sub { 3672 local $Coro::idle = sub {
3027 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3673 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3028 (async { 3674 (async {
3029 Event::one_event; 3675 $Coro::current->{desc} = "IDLE BUG HANDLER";
3676 EV::loop EV::LOOP_ONESHOT;
3030 })->prio (Coro::PRIO_MAX); 3677 })->prio (Coro::PRIO_MAX);
3031 }; 3678 };
3032 3679
3033 cfg_load; 3680 evthread_start IO::AIO::poll_fileno;
3681
3682 cf::sync_job {
3683 cf::incloader::init ();
3684
3685 cf::init_anim;
3686 cf::init_attackmess;
3687 cf::init_dynamic;
3688
3689 cf::load_settings;
3690
3691 reload_resources;
3692 reload_config;
3034 db_init; 3693 db_init;
3694
3695 cf::init_uuid;
3696 cf::init_signals;
3697 cf::init_skills;
3698
3699 cf::init_beforeplay;
3700
3701 atomic;
3702
3035 load_extensions; 3703 load_extensions;
3036 3704
3037 $TICK_WATCHER->start; 3705 utime time, time, $RUNTIMEFILE;
3038 Event::loop; 3706
3707 # no (long-running) fork's whatsoever before this point(!)
3708 use POSIX ();
3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3710
3711 cf::_post_init 0;
3712 };
3713
3714 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n";
3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3722 goto &main_loop;
3039} 3723}
3040 3724
3041############################################################################# 3725#############################################################################
3042# initialisation and cleanup 3726# initialisation and cleanup
3043 3727
3044# install some emergency cleanup handlers 3728# install some emergency cleanup handlers
3045BEGIN { 3729BEGIN {
3730 our %SIGWATCHER = ();
3046 for my $signal (qw(INT HUP TERM)) { 3731 for my $signal (qw(INT HUP TERM)) {
3047 Event->signal ( 3732 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3048 reentrant => 0,
3049 data => WF_AUTOCANCEL,
3050 signal => $signal,
3051 prio => 0,
3052 cb => sub {
3053 cf::cleanup "SIG$signal"; 3733 cf::cleanup "SIG$signal";
3054 },
3055 ); 3734 };
3056 } 3735 }
3057} 3736}
3058 3737
3059sub write_runtime { 3738sub write_runtime_sync {
3060 my $runtime = "$LOCALDIR/runtime"; 3739 my $t0 = AE::time;
3061 3740
3062 # first touch the runtime file to show we are still running: 3741 # first touch the runtime file to show we are still running:
3063 # the fsync below can take a very very long time. 3742 # the fsync below can take a very very long time.
3064 3743
3065 IO::AIO::aio_utime $runtime, undef, undef; 3744 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3066 3745
3067 my $guard = cf::lock_acquire "write_runtime"; 3746 my $guard = cf::lock_acquire "write_runtime";
3068 3747
3069 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3748 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3070 or return; 3749 or return;
3071 3750
3072 my $value = $cf::RUNTIME + 90 + 10; 3751 my $value = $cf::RUNTIME + 90 + 10;
3073 # 10 is the runtime save interval, for a monotonic clock 3752 # 10 is the runtime save interval, for a monotonic clock
3074 # 60 allows for the watchdog to kill the server. 3753 # 60 allows for the watchdog to kill the server.
3084 aio_utime $fh, undef, undef; 3763 aio_utime $fh, undef, undef;
3085 3764
3086 close $fh 3765 close $fh
3087 or return; 3766 or return;
3088 3767
3089 aio_rename "$runtime~", $runtime 3768 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3090 and return; 3769 and return;
3091 3770
3092 warn "runtime file written.\n"; 3771 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3093 3772
3094 1 3773 1
3774}
3775
3776our $uuid_lock;
3777our $uuid_skip;
3778
3779sub write_uuid_sync($) {
3780 $uuid_skip ||= $_[0];
3781
3782 return if $uuid_lock;
3783 local $uuid_lock = 1;
3784
3785 my $uuid = "$LOCALDIR/uuid";
3786
3787 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3788 or return;
3789
3790 my $value = uuid_seq uuid_cur;
3791
3792 unless ($value) {
3793 info "cowardly refusing to write zero uuid value!\n";
3794 return;
3795 }
3796
3797 my $value = uuid_str $value + $uuid_skip;
3798 $uuid_skip = 0;
3799
3800 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3801 and return;
3802
3803 # always fsync - this file is important
3804 aio_fsync $fh
3805 and return;
3806
3807 close $fh
3808 or return;
3809
3810 aio_rename "$uuid~", $uuid
3811 and return;
3812
3813 trace "uuid file written ($value).\n";
3814
3815 1
3816
3817}
3818
3819sub write_uuid($$) {
3820 my ($skip, $sync) = @_;
3821
3822 $sync ? write_uuid_sync $skip
3823 : async { write_uuid_sync $skip };
3095} 3824}
3096 3825
3097sub emergency_save() { 3826sub emergency_save() {
3098 my $freeze_guard = cf::freeze_mainloop; 3827 my $freeze_guard = cf::freeze_mainloop;
3099 3828
3100 warn "enter emergency perl save\n"; 3829 info "emergency_perl_save: enter\n";
3830
3831 # this is a trade-off: we want to be very quick here, so
3832 # save all maps without fsync, and later call a global sync
3833 # (which in turn might be very very slow)
3834 local $USE_FSYNC = 0;
3101 3835
3102 cf::sync_job { 3836 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838
3103 # use a peculiar iteration method to avoid tripping on perl 3839 # use a peculiar iteration method to avoid tripping on perl
3104 # refcount bugs in for. also avoids problems with players 3840 # refcount bugs in for. also avoids problems with players
3105 # and maps saved/destroyed asynchronously. 3841 # and maps saved/destroyed asynchronously.
3106 warn "begin emergency player save\n"; 3842 info "emergency_perl_save: begin player save\n";
3107 for my $login (keys %cf::PLAYER) { 3843 for my $login (keys %cf::PLAYER) {
3108 my $pl = $cf::PLAYER{$login} or next; 3844 my $pl = $cf::PLAYER{$login} or next;
3109 $pl->valid or next; 3845 $pl->valid or next;
3846 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3110 $pl->save; 3847 $pl->save;
3111 } 3848 }
3112 warn "end emergency player save\n"; 3849 info "emergency_perl_save: end player save\n";
3113 3850
3114 warn "begin emergency map save\n"; 3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 info "emergency_perl_save: begin map save\n";
3115 for my $path (keys %cf::MAP) { 3854 for my $path (keys %cf::MAP) {
3116 my $map = $cf::MAP{$path} or next; 3855 my $map = $cf::MAP{$path} or next;
3117 $map->valid or next; 3856 $map->valid or next;
3118 $map->save; 3857 $map->save;
3119 } 3858 }
3120 warn "end emergency map save\n"; 3859 info "emergency_perl_save: end map save\n";
3121 3860
3122 warn "begin emergency database checkpoint\n"; 3861 cf::write_runtime_sync; # external watchdog should not bark
3862
3863 info "emergency_perl_save: begin database checkpoint\n";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3864 BDB::db_env_txn_checkpoint $DB_ENV;
3124 warn "end emergency database checkpoint\n"; 3865 info "emergency_perl_save: end database checkpoint\n";
3866
3867 info "emergency_perl_save: begin write uuid\n";
3868 write_uuid_sync 1;
3869 info "emergency_perl_save: end write uuid\n";
3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 trace "emergency_perl_save: syncing database to disk";
3874 BDB::db_env_txn_checkpoint $DB_ENV;
3875
3876 info "emergency_perl_save: starting sync\n";
3877 IO::AIO::aio_sync sub {
3878 info "emergency_perl_save: finished sync\n";
3879 };
3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3886 }
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3125 }; 3889 };
3126 3890
3127 warn "leave emergency perl save\n"; 3891 info "emergency_perl_save: leave\n";
3128} 3892}
3129 3893
3130sub post_cleanup { 3894sub post_cleanup {
3131 my ($make_core) = @_; 3895 my ($make_core) = @_;
3132 3896
3897 IO::AIO::flush;
3898
3133 warn Carp::longmess "post_cleanup backtrace" 3899 error Carp::longmess "post_cleanup backtrace"
3134 if $make_core; 3900 if $make_core;
3901
3902 my $fh = pidfile;
3903 unlink $PIDFILE if <$fh> == $$;
3904}
3905
3906# a safer delete_package, copied from Symbol
3907sub clear_package($) {
3908 my $pkg = shift;
3909
3910 # expand to full symbol table name if needed
3911 unless ($pkg =~ /^main::.*::$/) {
3912 $pkg = "main$pkg" if $pkg =~ /^::/;
3913 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3914 $pkg .= '::' unless $pkg =~ /::$/;
3915 }
3916
3917 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3918 my $stem_symtab = *{$stem}{HASH};
3919
3920 defined $stem_symtab and exists $stem_symtab->{$leaf}
3921 or return;
3922
3923 # clear all symbols
3924 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3925 for my $name (keys %$leaf_symtab) {
3926 _gv_clear *{"$pkg$name"};
3927# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3928 }
3135} 3929}
3136 3930
3137sub do_reload_perl() { 3931sub do_reload_perl() {
3138 # can/must only be called in main 3932 # can/must only be called in main
3139 if ($Coro::current != $Coro::main) { 3933 unless (in_main) {
3140 warn "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3141 return; 3935 return;
3142 } 3936 }
3143 3937
3144 warn "reloading..."; 3938 return if $RELOAD++;
3145 3939
3146 warn "entering sync_job"; 3940 my $t1 = AE::time;
3147 3941
3942 while ($RELOAD) {
3943 cf::get_slot 0.1, -1, "reload_perl";
3944 info "perl_reload: reloading...";
3945
3946 trace "perl_reload: entering sync_job";
3947
3148 cf::sync_job { 3948 cf::sync_job {
3149 cf::write_runtime; # external watchdog should not bark
3150 cf::emergency_save; 3949 #cf::emergency_save;
3151 cf::write_runtime; # external watchdog should not bark
3152 3950
3153 warn "syncing database to disk";
3154 BDB::db_env_txn_checkpoint $DB_ENV;
3155
3156 # if anything goes wrong in here, we should simply crash as we already saved
3157
3158 warn "cancelling all WF_AUTOCANCEL watchers";
3159 for (Event::all_watchers) {
3160 $_->cancel if $_->data & WF_AUTOCANCEL;
3161 }
3162
3163 warn "flushing outstanding aio requests";
3164 for (;;) {
3165 BDB::flush;
3166 IO::AIO::flush;
3167 Coro::cede;
3168 last unless IO::AIO::nreqs || BDB::nreqs;
3169 warn "iterate...";
3170 }
3171
3172 ++$RELOAD;
3173
3174 warn "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3175 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3176 %EXT_CORO = (); 3953 %EXT_CORO = ();
3177 3954
3178 warn "removing commands"; 3955 trace "perl_reload: removing commands";
3179 %COMMAND = (); 3956 %COMMAND = ();
3180 3957
3181 warn "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3182 %EXTCMD = (); 3959 %EXTCMD = ();
3183 %EXTICMD = (); 3960 %EXTICMD = ();
3184 3961
3185 warn "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3186 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3187 warn "... unloading $pkg"; 3964 trace "... unloading $pkg";
3188 3965
3189 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3190 eval { 3967 eval {
3191 $cb->($pkg); 3968 $cb->($pkg);
3192 1 3969 1
3193 } or warn "$pkg unloaded, but with errors: $@"; 3970 } or error "$pkg unloaded, but with errors: $@";
3971 }
3972
3973 trace "... clearing $pkg";
3974 clear_package $pkg;
3194 } 3975 }
3195 3976
3196 warn "... nuking $pkg";
3197 Symbol::delete_package $pkg;
3198 }
3199
3200 warn "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3201 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3202 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3203 3980
3204 warn "... unloading $k"; 3981 trace "... unloading $k";
3205 delete $INC{$k}; 3982 delete $INC{$k};
3206 3983
3207 $k =~ s/\.pm$//; 3984 $k =~ s/\.pm$//;
3208 $k =~ s/\//::/g; 3985 $k =~ s/\//::/g;
3209 3986
3210 if (my $cb = $k->can ("unload_module")) { 3987 if (my $cb = $k->can ("unload_module")) {
3211 $cb->(); 3988 $cb->();
3989 }
3990
3991 clear_package $k;
3212 } 3992 }
3213 3993
3214 Symbol::delete_package $k;
3215 }
3216
3217 warn "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3218 Symbol::delete_package "safe::$_" 3995 clear_package "safe::$_"
3219 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3220 3997
3221 warn "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3222 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3223 delete $INC{"cf/pod.pm"}; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3224 4001
3225 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3226 # and global variables created in xs 4003 # and global variables created in xs
3227 #Symbol::delete_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3228 4005
3229 warn "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3230 4007
3231 warn "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3232 require cf; 4009 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4010 cf::_connect_to_perl_1;
3234 4011
3235 warn "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3236 cf::cfg_load; 4013 cf::reload_config;
3237 4014
3238 warn "loading extensions"; 4015 trace "perl_reload: loading extensions";
3239 cf::load_extensions; 4016 cf::load_extensions;
3240 4017
4018 if ($REATTACH_ON_RELOAD) {
3241 warn "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3242 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3243 warn "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3244 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3245 warn "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3246 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
4025 }
3247 4026
3248 warn "leaving sync_job"; 4027 cf::_post_init 1;
3249 4028
4029 trace "perl_reload: leaving sync_job";
4030
3250 1 4031 1
3251 } or do { 4032 } or do {
3252 warn $@; 4033 error $@;
3253 warn "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3254 exit 1; 4035 };
4036
4037 --$RELOAD;
3255 }; 4038 }
3256 4039
3257 warn "reloaded"; 4040 $t1 = AE::time - $t1;
4041 info "perl_reload: completed in ${t1}s\n";
3258}; 4042};
3259 4043
3260our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3261 4045
3262sub reload_perl() { 4046sub reload_perl() {
3263 # doing reload synchronously and two reloads happen back-to-back, 4047 # doing reload synchronously and two reloads happen back-to-back,
3264 # coro crashes during coro_state_free->destroy here. 4048 # coro crashes during coro_state_free->destroy here.
3265 4049
3266 $RELOAD_WATCHER ||= Event->timer ( 4050 $RELOAD_WATCHER ||= cf::async {
3267 reentrant => 0, 4051 Coro::AIO::aio_wait cache_extensions;
3268 after => 0, 4052
3269 data => WF_AUTOCANCEL, 4053 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3270 cb => sub {
3271 do_reload_perl; 4054 do_reload_perl;
3272 undef $RELOAD_WATCHER; 4055 undef $RELOAD_WATCHER;
3273 }, 4056 };
3274 ); 4057 };
3275} 4058}
3276 4059
3277register_command "reload" => sub { 4060register_command "reload" => sub {
3278 my ($who, $arg) = @_; 4061 my ($who, $arg) = @_;
3279 4062
3280 if ($who->flag (FLAG_WIZ)) { 4063 if ($who->flag (FLAG_WIZ)) {
3281 $who->message ("reloading server."); 4064 $who->message ("reloading server.");
4065 async {
4066 $Coro::current->{desc} = "perl_reload";
3282 async { reload_perl }; 4067 reload_perl;
4068 };
3283 } 4069 }
3284}; 4070};
3285 4071
3286unshift @INC, $LIBDIR; 4072#############################################################################
3287 4073
3288my $bug_warning = 0; 4074my $bug_warning = 0;
3289 4075
3290our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
3291our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
3292 4078
3293sub wait_for_tick { 4079sub wait_for_tick() {
3294 return unless $TICK_WATCHER->is_active;
3295 return if $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3296 4081
3297 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
3298 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
3299 $signal->wait; 4084 $signal->wait;
3300} 4085}
3301 4086
3302sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3303 return unless $TICK_WATCHER->is_active;
3304 return if $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3305 4089
3306 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3307 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3308 $signal->wait; 4092 $signal->wait;
3309} 4093}
3310 4094
3311 my $min = 1e6;#d# 4095sub tick {
3312 my $avg = 10;
3313$TICK_WATCHER = Event->timer (
3314 reentrant => 0,
3315 parked => 1,
3316 prio => 0,
3317 at => $NEXT_TICK || $TICK,
3318 data => WF_AUTOCANCEL,
3319 cb => sub {
3320 if ($Coro::current != $Coro::main) { 4096 if ($Coro::current != $Coro::main) {
3321 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3322 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3323 return; 4099 return;
3324 } 4100 }
3325 4101
3326 $NOW = $tick_start = Event::time;
3327
3328 cf::server_tick; # one server iteration 4102 cf::server_tick; # one server iteration
3329 4103
3330 0 && sync_job {#d# 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3331 for(1..10) {
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335 4105
3336 $map->width (50); 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3337 $map->height (50); 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3338 $map->alloc; 4108 Coro::async_pool {
3339 $map->_load_objects ("/tmp/x.map", 1); 4109 $Coro::current->{desc} = "runtime saver";
3340 my $t = Event::time - $t; 4110 write_runtime_sync
3341 4111 or error "ERROR: unable to write runtime file: $!";
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 }; 4112 };
4113 }
3352 4114
3353 $RUNTIME += $TICK;
3354 $NEXT_TICK += $TICK;
3355
3356 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3357 $NEXT_RUNTIME_WRITE = $NOW + 10;
3358 Coro::async_pool {
3359 write_runtime
3360 or warn "ERROR: unable to write runtime file: $!";
3361 };
3362 }
3363
3364# my $AFTER = Event::time;
3365# warn $AFTER - $NOW;#d#
3366
3367 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3368 $sig->send; 4116 $sig->send;
3369 } 4117 }
3370 while (my $sig = shift @WAIT_FOR_TICK) { 4118 while (my $sig = shift @WAIT_FOR_TICK) {
3371 $sig->send; 4119 $sig->send;
3372 } 4120 }
3373 4121
3374 $NOW = Event::time; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3375
3376 # if we are delayed by four ticks or more, skip them all
3377 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3378
3379 $TICK_WATCHER->at ($NEXT_TICK);
3380 $TICK_WATCHER->start;
3381
3382 $LOAD = ($NOW - $tick_start) / $TICK;
3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3384 4124
3385 _post_tick; 4125 if (0) {
3386 4126 if ($NEXT_TICK) {
3387 4127 my $jitter = $TICK_START - $NEXT_TICK;
4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4129 debug "jitter $JITTER\n";#d#
4130 }
3388 }, 4131 }
3389); 4132}
3390 4133
3391{ 4134{
3392 BDB::max_poll_time $TICK * 0.1; 4135 # configure BDB
3393 $BDB_POLL_WATCHER = Event->io ( 4136
3394 reentrant => 0,
3395 fd => BDB::poll_fileno,
3396 poll => 'r',
3397 prio => 0,
3398 data => WF_AUTOCANCEL,
3399 cb => \&BDB::poll_cb,
3400 );
3401 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3402 4138 BDB::max_poll_reqs $TICK * 0.1;
3403 BDB::set_sync_prepare { 4139 $AnyEvent::BDB::WATCHER->priority (1);
3404 my $status;
3405 my $current = $Coro::current;
3406 (
3407 sub {
3408 $status = $!;
3409 $current->ready; undef $current;
3410 },
3411 sub {
3412 Coro::schedule while defined $current;
3413 $! = $status;
3414 },
3415 )
3416 };
3417 4140
3418 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3419 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4145 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4146 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4147 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3420 4148
3421 cf::sync_job { 4149 cf::sync_job {
3422 eval { 4150 eval {
3423 BDB::db_env_open 4151 BDB::db_env_open
3424 $DB_ENV, 4152 $DB_ENV,
3426 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4154 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4155 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3428 0666; 4156 0666;
3429 4157
3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4158 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3431
3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3433 $DB_ENV->set_lk_detect;
3434 }; 4159 };
3435 4160
3436 cf::cleanup "db_env_open(db): $@" if $@; 4161 cf::cleanup "db_env_open(db): $@" if $@;
3437 }; 4162 };
3438 } 4163 }
4164
4165 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4166 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4167 };
4168 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4169 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170 };
4171 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173 };
3439} 4174}
3440 4175
3441{ 4176{
4177 # configure IO::AIO
4178
3442 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3443
3444 undef $Coro::AIO::WATCHER;
3445 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3446 $AIO_POLL_WATCHER = Event->io ( 4181 undef $AnyEvent::AIO::WATCHER;
3447 reentrant => 0,
3448 data => WF_AUTOCANCEL,
3449 fd => IO::AIO::poll_fileno,
3450 poll => 'r',
3451 prio => 6,
3452 cb => \&IO::AIO::poll_cb,
3453 );
3454} 4182}
3455 4183
3456my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3457 4186
3458sub _log_backtrace { 4187sub _log_backtrace {
3459 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3460 4189
3461 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3462 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3463 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3464 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3465 ++$_log_backtrace; 4198 ++$_log_backtrace;
4199 my $perl_bt = Carp::longmess $msg;
3466 async { 4200 async {
4201 $Coro::current->{desc} = "abt $msg";
4202
3467 my @bt = fork_call { 4203 my @bt = fork_call {
3468 @addr = map { sprintf "%x", $_ } @addr; 4204 @addr = map { sprintf "%x", $_ } @addr;
3469 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3470 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3471 or die "addr2line: $!"; 4207 or die "addr2line: $!";
3479 } 4215 }
3480 4216
3481 @funcs 4217 @funcs
3482 }; 4218 };
3483 4219
3484 LOG llevInfo, "[ABT] $msg\n"; 4220 LOG llevInfo, "[ABT] $perl_bt\n";
4221 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3485 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3486 --$_log_backtrace; 4223 --$_log_backtrace;
3487 }; 4224 };
3488 } else { 4225 } else {
3489 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3490 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3491 } 4228 }
3492} 4229}
3493 4230
3494# load additional modules 4231# load additional modules
3495use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3496 4234
3497END { cf::emergency_save } 4235END { cf::emergency_save }
3498 4236
34991 42371
3500 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines