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.352 by root, Sun Sep 2 04:57:14 2007 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines