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.560 by root, Fri Apr 22 02:03:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines