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.355 by root, Sun Sep 2 12:45:44 2007 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines