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.351 by root, Sun Sep 2 00:57:38 2007 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines