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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.508 by root, Sun Mar 28 22:29:50 2010 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$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 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 121our $DB_ENV;
88 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
89our %CFG; 125our %CFG;
90 126
91our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 128our $RUNTIME;
129our $NOW;
93 130
94our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
97 134
98# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 137
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
104 147
105binmode STDOUT; 148binmode STDOUT;
106binmode STDERR; 149binmode STDERR;
107 150
108# read virtual server time, if available 151# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
113} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
114 159
115mkdir $_ 160mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 162
118our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
119 164
120sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121 177
122############################################################################# 178#############################################################################
123 179
124=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
125 181
161 217
162The raw value load value from the last tick. 218The raw value load value from the last tick.
163 219
164=item %cf::CFG 220=item %cf::CFG
165 221
166Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 223from wherever your confdir points to.
168 224
169=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
170 226
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
172returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
173per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
174 230
175=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
176 232
177This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 235that call.
180 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
181=back 243=back
182 244
183=cut 245=cut
184 246
185BEGIN { 247$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 248 my $msg = join "", @_;
188 249
189 $msg .= "\n" 250 $msg .= "\n"
190 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
191 252
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 254
194 LOG llevError, $msg; 255 LOG llevError, $msg;
195 }; 256};
196} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
197 271
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 282for my $pkg (qw(
209 cf::global cf::attachable 283 cf::global cf::attachable
210 cf::object cf::object::player 284 cf::object cf::object::player
211 cf::client cf::player 285 cf::client cf::player
212 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
213 cf::map cf::party cf::region 288 cf::party cf::region
214)) { 289)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 291}
218 292
219$Event::DIED = sub { 293$EV::DIED = sub {
220 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
221}; 295};
222 296
223############################################################################# 297#############################################################################
224 298
225=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 322 $d
249 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
250} 324}
251 325
252=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
253 327
254Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
255 329
256=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
257 331
258Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
259 333
260=cut 334=cut
261 335
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 337
264sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
266 354
267=item cf::lock_wait $string 355=item cf::lock_wait $string
268 356
269Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
270 358
271=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
272 360
273Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
276returned. 364returned.
277 365
278Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 367deadlocked coro.
285 373
286Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
287 375
288=cut 376=cut
289 377
290our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 379
293sub lock_wait($) { 380sub lock_wait($) {
294 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 382}
307 383
308sub lock_acquire($) { 384sub lock_acquire($) {
309 my ($key) = @_; 385 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 386}
323 387
324sub lock_active($) { 388sub lock_active($) {
325 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 390}
329 391
330sub freeze_mainloop { 392sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
332 394
333 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 396}
335 }; 397
336 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
337 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
338} 411}
339 412
340=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
341 414
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
350 423
351=cut 424=cut
352 425
353our @SLOT_QUEUE; 426our @SLOT_QUEUE;
354our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
355 429
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
358 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
359 436
360 while () { 437 while () {
361 next_job: 438 next_job:
439
362 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
363 if ($avail > 0.01) { 441
364 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
366 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send; 446 $job->[2]->send;
368 Coro::cede; 447 Coro::cede;
369 goto next_job; 448 goto next_job;
370 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371 } 451 }
372 } 452 }
373 453
374 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 457 $signal->wait;
378 } else { 458 } else {
459 $busy = 0;
379 Coro::schedule; 460 Coro::schedule;
380 } 461 }
381 } 462 }
382}; 463};
383 464
384sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
385 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
386 469
387 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
388 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
389 473
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
403 487
404BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
405 489
406=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
407 491
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 495acceptable.
412 496
413If it must be done, put the blocking parts into C<sync_job>. This will run 497If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
419 503
420sub sync_job(&) { 504sub sync_job(&) {
421 my ($job) = @_; 505 my ($job) = @_;
422 506
423 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 508 my $time = EV::time;
425 509
426 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
428 512
429 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 514
431 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
432 516
433 my $busy = 1; 517 my $busy = 1;
434 my @res; 518 my @res;
435 519
436 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 522 @res = eval { $job->() };
438 warn $@ if $@; 523 warn $@ if $@;
439 undef $busy; 524 undef $busy;
440 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
441 526
442 while ($busy) { 527 while ($busy) {
443 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
444 } 532 }
533 }
445 534
446 $time = Event::time - $time; 535 my $time = EV::time - $time;
447 536
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
452 538
453 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
454 } else { 540 } else {
455 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
456 542
481=item fork_call { }, $args 567=item fork_call { }, $args
482 568
483Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
487 573
488=cut 574=cut
489 575
490sub fork_call(&@) { 576sub fork_call(&@) {
491 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
498 reset_signals; 584 reset_signals;
499 &$cb 585 &$cb
500 }, @args; 586 }, @args;
501 587
502 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
503} 616}
504 617
505=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
506 619
507Returns a single value from the environment database. 620Returns a single value from the environment database.
646 759
647############################################################################# 760#############################################################################
648 761
649=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
650 763
651Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
654 767
655In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 770Deliantra).
658 771
659=over 4 772=over 4
660 773
661=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
662 775
706=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
707 820
708Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
710 823
711Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
713 826
714These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
715 828
716=over 4 829=over 4
944 } 1057 }
945 1058
946 0 1059 0
947} 1060}
948 1061
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1063
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1065
953Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
954 1067
960 1073
961=cut 1074=cut
962 1075
963############################################################################# 1076#############################################################################
964# object support 1077# object support
965#
966 1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
967sub _can_merge { 1112sub _can_merge {
968 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
969 1114
970 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1116
974 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
975} 1119}
976 1120
977sub reattach { 1121sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1123 my ($obj) = @_;
980 1124
1125 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1127
983 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
984 1129
985 @$registry = (); 1130 @$registry = ();
986 1131
1001cf::attachable->attach ( 1146cf::attachable->attach (
1002 prio => -1000000, 1147 prio => -1000000,
1003 on_instantiate => sub { 1148 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1005 1150
1006 $data = from_json $data; 1151 $data = decode_json $data;
1007 1152
1008 for (@$data) { 1153 for (@$data) {
1009 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1010 1155
1011 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
1024 }, 1169 },
1025); 1170);
1026 1171
1027sub object_freezer_save { 1172sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1174
1032 sync_job { 1175 sync_job {
1033 if (length $$rdata) { 1176 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1037 1180
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1042 close $fh; 1188 aio_close $fh;
1043 1189
1044 if (@$objs) { 1190 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1050 close $fh; 1199 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1201 }
1053 } else { 1202 } else {
1054 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1055 } 1204 }
1056 1205
1057 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1210 } else {
1059 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1060 } 1212 }
1061 } else { 1213 } else {
1062 aio_unlink $filename; 1214 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1064 } 1216 }
1065 }; 1217 };
1066
1067 undef $guard;
1068} 1218}
1069 1219
1070sub object_freezer_as_string { 1220sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1072 1222
1077 1227
1078sub object_thawer_load { 1228sub object_thawer_load {
1079 my ($filename) = @_; 1229 my ($filename) = @_;
1080 1230
1081 my ($data, $av); 1231 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1232
1085 (aio_load $filename, $data) >= 0 1233 (aio_load $filename, $data) >= 0
1086 or return; 1234 or return;
1087 1235
1088 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1238 or return;
1091 1239
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1094 } 1242 }
1095 1243
1096 utf8::decode (my $decname = $filename); 1244 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
1159 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1160 1308
1161 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1162} 1310}
1163 1311
1312use File::Glob ();
1313
1164cf::player->attach ( 1314cf::player->attach (
1165 on_command => sub { 1315 on_command => sub {
1166 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1167 1317
1168 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1200 1350
1201 cf::override; 1351 cf::override;
1202 }, 1352 },
1203); 1353);
1204 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1205sub load_extensions { 1368sub load_extensions {
1206 cf::sync_job { 1369 cf::sync_job {
1207 my %todo; 1370 my %todo;
1208 1371
1209 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1228 1391
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1394
1232 $ext{source} = 1395 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1235 . $source 1398 . $source
1236 . "\n};\n1"; 1399 . "\n};\n1";
1237 1400
1238 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1239 } 1402 }
1240 1403
1404 my $pass = 0;
1241 my %done; 1405 my %done;
1242 while (%todo) { 1406 while (%todo) {
1243 my $progress; 1407 my $progress;
1244 1408
1409 ++$pass;
1410
1411 ext:
1245 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1414 next ext
1248 unless exists $done{$_}; 1415 unless exists $done{$_};
1249 } 1416 }
1250 1417
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1419
1253 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1258 warn $msg; 1427 } else {
1259 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1260 exit 1; 1429 push @EXTS, $v->{pkg};
1261 } 1430 $progress = 1;
1262 1431
1263 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1264 } 1434 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1435 }
1270 1436
1271 skip: 1437 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1274 } 1445 }
1275 }; 1446 };
1276} 1447}
1277 1448
1278############################################################################# 1449#############################################################################
1279 1450
1280=back 1451=back
1281 1452
1282=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1283 1454
1284Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1285 1456
1286=cut 1457=cut
1287 1458
1288package cf::player; 1459package cf::player;
1289 1460
1332 1503
1333sub exists($) { 1504sub exists($) {
1334 my ($login) = @_; 1505 my ($login) = @_;
1335 1506
1336 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1338} 1509}
1339 1510
1340sub find($) { 1511sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1513 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1524
1354 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1526 or return;
1356 1527
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1359 or return; 1529 or return;
1530
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1363 } 1534 }
1364 } 1535 }
1374 1545
1375 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1376 1547
1377 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1550
1551 cf::get_slot 0.01;
1379 1552
1380 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1554 cf::cede_to_tick;
1382} 1555}
1383 1556
1415 my ($pl) = @_; 1588 my ($pl) = @_;
1416 1589
1417 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1418 1591
1419 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1594
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1426 1601
1427 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1642
1468 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1469 my $path = path $login; 1644 my $path = path $login;
1470 1645
1471 # a .pst is a dead give-away for a valid player 1646 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1652 }
1477 1653
1508 } 1684 }
1509 1685
1510 \@paths 1686 \@paths
1511} 1687}
1512 1688
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1690
1515Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1692
1564=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1565 1694
1566Sends an ext reply to the player. 1695Sends an ext reply to the player.
1567 1696
1634our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1636 1765
1637sub generate_random_map { 1766sub generate_random_map {
1638 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1639 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1772 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1897
1766# the temporary/swap location 1898# the temporary/swap location
1767sub save_path { 1899sub save_path {
1768 my ($self) = @_; 1900 my ($self) = @_;
1769 1901
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1772} 1904}
1773 1905
1774# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1775sub uniq_path { 1907sub uniq_path {
1776 my ($self) = @_; 1908 my ($self) = @_;
1777 1909
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1912}
1790 1913
1791sub decay_objects { 1914sub decay_objects {
1792 my ($self) = @_; 1915 my ($self) = @_;
1793 1916
1877sub find { 2000sub find {
1878 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1879 2002
1880 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1881 2004
1882 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2007
1885 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1890 or return; 2010 or return;
1891 2011
1892 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1893 2013
1895 or return; 2015 or return;
1896 2016
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
1900 undef $guard1; 2021 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2022 $map->reset;
1903 return find $path; 2023 return find $path;
1904 } 2024 }
1905 2025
1906 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1907 } 2027 }
1908} 2028}
1909 2029
1910sub pre_load { } 2030sub pre_load { }
1911sub post_load { } 2031#sub post_load { } # XS
1912 2032
1913sub load { 2033sub load {
1914 my ($self) = @_; 2034 my ($self) = @_;
1915 2035
1916 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2054 $f->skip_block;
1935 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
1936 or return; 2056 or return;
1937 2057
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1939 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1940 2060
1941 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2062 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2082 $self->decay_objects;
1963 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1964 $self->update_buttons; 2084 $self->update_buttons;
1965 cf::cede_to_tick; 2085 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2086 $self->activate;
1969 } 2087 }
1970 2088
1971 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
1973 2091
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2093 }
1976 2094
1977 $self->post_load; 2095 $self->post_load;
1978} 2096}
1979 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
1980sub customise_for { 2101sub customise_for {
1981 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
1982 2103
1983 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2105 if $self->per_player;
2037 my ($path, $origin, $load) = @_; 2158 my ($path, $origin, $load) = @_;
2038 2159
2039 $path = normalise $path, $origin && $origin->{path}; 2160 $path = normalise $path, $origin && $origin->{path};
2040 2161
2041 if (my $map = $cf::MAP{$path}) { 2162 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2164 }
2044 2165
2045 $MAP_PREFETCH{$path} |= $load; 2166 $MAP_PREFETCH{$path} |= $load;
2046 2167
2047 $MAP_PREFETCHER ||= cf::async { 2168 $MAP_PREFETCHER ||= cf::async {
2169 $Coro::current->{desc} = "map prefetcher";
2170
2048 while (%MAP_PREFETCH) { 2171 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2172 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2173 if (my $map = find $k) {
2051 $map->load if $v; 2174 $map->load if $v;
2052 } 2175 }
2078 return if $self->{deny_save}; 2201 return if $self->{deny_save};
2079 2202
2080 local $self->{last_access} = $self->last_access;#d# 2203 local $self->{last_access} = $self->last_access;#d#
2081 2204
2082 cf::async { 2205 cf::async {
2206 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2207 $_->contr->save for $self->players;
2084 }; 2208 };
2209
2210 cf::get_slot 0.02;
2085 2211
2086 if ($uniq) { 2212 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2214 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2215 } else {
2098 $self->save; 2224 $self->save;
2099 2225
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2227
2102 return if $self->players; 2228 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2229 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2105 2231
2106 $self->in_memory (cf::MAP_SWAPPED); 2232 $self->in_memory (cf::MAP_SWAPPED);
2107 2233
2108 $self->deactivate; 2234 $self->deactivate;
2133 2259
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2261
2136 return if $self->players; 2262 return if $self->players;
2137 2263
2138 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2139 2265
2140 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2141 2267
2142 # need to save uniques path 2268 # need to save uniques path
2143 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
2226 2352
2227sub unique_maps() { 2353sub unique_maps() {
2228 [ 2354 [
2229 map { 2355 map {
2230 utf8::decode $_; 2356 utf8::decode $_;
2231 /\.map$/ 2357 s/\.map$//; # TODO future compatibility hack
2358 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2359 ? ()
2232 ? normalise $_ 2360 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2362 ]
2236} 2363}
2237 2364
2238package cf; 2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2239 2396
2240=back 2397=back
2241 2398
2242=head3 cf::object 2399=head3 cf::object
2243 2400
2247 2404
2248=over 4 2405=over 4
2249 2406
2250=item $ob->inv_recursive 2407=item $ob->inv_recursive
2251 2408
2252Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2253 2411
2254=cut 2412=cut
2255 2413
2256sub inv_recursive_; 2414sub inv_recursive_;
2257sub inv_recursive_ { 2415sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2263} 2421}
2264 2422
2265=item $ref = $ob->ref 2423=item $ref = $ob->ref
2266 2424
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2268 2426
2269=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2270 2428
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2430even if the object actually exists. May block.
2274=cut 2432=cut
2275 2433
2276sub deref { 2434sub deref {
2277 my ($ref) = @_; 2435 my ($ref) = @_;
2278 2436
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2437 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2438 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2439 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2440 or return;
2286 $pl->ob->uuid eq $uuid 2441 $pl->ob->uuid eq $uuid
2287 or return; 2442 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2463dialogue with the given NPC character.
2309 2464
2310=cut 2465=cut
2311 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2312# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2482# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2498
2330 } else { 2499 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2502 }
2334 } 2503 }
2335} 2504}
2336 2505
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2531
2363=item $player_object->enter_link 2532=item $player_object->enter_link
2364 2533
2365Freezes the player and moves him/her to a special map (C<{link}>). 2534Freezes the player and moves him/her to a special map (C<{link}>).
2366 2535
2367The player should be reasonably safe there for short amounts of time. You 2536The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2537for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link
2539map.
2369 2540
2370Will never block. 2541Will never block.
2371 2542
2372=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2373 2544
2425 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2427 2598
2428 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2431 2602
2432 $map->load; 2603 $map->load;
2433 $map->load_neighbours; 2604 $map->load_neighbours;
2434 2605
2435 return unless $self->contr->active; 2606 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2607
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2440} 2613}
2441 2614
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2616
2444Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2618her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2619that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2620the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2621be called at the end of this process.
2449 2622
2623Note that $check will be called with a potentially non-loaded map, so if
2624it needs a loaded map it has to call C<< ->load >>.
2625
2450=cut 2626=cut
2451 2627
2452our $GOTOGEN; 2628our $GOTOGEN;
2453 2629
2454sub cf::object::player::goto { 2630sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2635
2460 $self->enter_link; 2636 $self->enter_link;
2461 2637
2462 (async { 2638 (async {
2639 $Coro::current->{desc} = "player::goto $path $x $y";
2640
2463 # *tag paths override both path and x|y 2641 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2642 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2643 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2644 my $ob = $obs[rand @obs];
2467 2645
2468 # see if we actually can go there 2646 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2647 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2648 $ob = $obs[rand @obs];
2649 } else {
2650 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2651 }
2652 # else put us there anyways for now #d#
2471 2653
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2654 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2655 } else {
2656 ($path, $x, $y) = (undef, undef, undef);
2473 } 2657 }
2474 } 2658 }
2475 2659
2476 my $map = eval { 2660 my $map = eval {
2477 my $map = cf::map::find $path; 2661 my $map = defined $path ? cf::map::find $path : undef;
2478 2662
2479 if ($map) { 2663 if ($map) {
2480 $map = $map->customise_for ($self); 2664 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2665 $map = $check->($map) if $check && $map;
2482 } else { 2666 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2668 }
2485 2669
2486 $map 2670 $map
2487 }; 2671 };
2488 2672
2524} 2708}
2525 2709
2526sub prepare_random_map { 2710sub prepare_random_map {
2527 my ($exit) = @_; 2711 my ($exit) = @_;
2528 2712
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2713 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2714 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2715 # that depends on the exit object
2534 2716
2535 my $rmp = parse_random_map_params $exit->msg; 2717 my $rmp = parse_random_map_params $exit->msg;
2537 if ($exit->map) { 2719 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2720 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2721 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2722 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2723 $rmp->{origin_y} = $exit->y;
2724
2725 $exit->map->touch;
2542 } 2726 }
2543 2727
2544 $rmp->{random_seed} ||= $exit->random_seed; 2728 $rmp->{random_seed} ||= $exit->random_seed;
2545 2729
2546 my $data = cf::to_json $rmp; 2730 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2731 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2732 my $meta = "$RANDOMDIR/$md5.meta";
2549 2733
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2734 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2735 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2736 undef $fh;
2553 aio_rename "$meta~", $meta; 2737 aio_rename "$meta~", $meta;
2554 2738
2739 my $slaying = "?random/$md5";
2740
2741 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2742 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2743 $exit->msg (undef);
2744 }
2557 } 2745 }
2558} 2746}
2559 2747
2560sub cf::object::player::enter_exit { 2748sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2749 my ($self, $exit) = @_;
2562 2750
2563 return unless $self->type == cf::PLAYER; 2751 return unless $self->type == cf::PLAYER;
2564 2752
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2753 $self->enter_link;
2577 2754
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2755 (async {
2583 $self->deactivate_recursive; # just to be sure 2756 $Coro::current->{desc} = "enter_exit";
2757
2584 unless (eval { 2758 unless (eval {
2759 $self->deactivate_recursive; # just to be sure
2760
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2770 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp;
2772
2585 $self->goto ($slaying, $hp, $sp); 2773 $self->goto ($map, $x, $y);
2586 2774
2775 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y)
2777 if $exit->flag (cf::FLAG_DAMNED);
2778
2587 1; 2779 1
2588 }) { 2780 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2590 . "I'll try to bring you back to the map you were before. " 2782 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2593 2785
2594 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
2611sub cf::client::send_drawinfo { 2803sub cf::client::send_drawinfo {
2612 my ($self, $text, $flags) = @_; 2804 my ($self, $text, $flags) = @_;
2613 2805
2614 utf8::encode $text; 2806 utf8::encode $text;
2615 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2808}
2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2616} 2833}
2617 2834
2618=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2619 2836
2620Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2622the message, with C<log> being the default. If C<$color> is negative, suppress 2839the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 2840the message unless the client supports the msg packet.
2624 2841
2625=cut 2842=cut
2626 2843
2844# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2628 "c/identify" => { 2852 "c/identify" => {
2629 id => "identify", 2853 id => "infobox",
2630 title => "Identify", 2854 title => "Identify",
2631 reply => undef, 2855 reply => undef,
2632 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
2633 }, 2857 },
2634 "c/examine" => { 2858 "c/examine" => {
2635 id => "examine", 2859 id => "infobox",
2636 title => "Examine", 2860 title => "Examine",
2637 reply => undef, 2861 reply => undef,
2638 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2639 }, 2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2869 },
2870 "c/book" => {
2871 id => "infobox",
2872 title => "Book",
2873 reply => undef,
2874 tooltip => "The contents of a note or book",
2875 },
2876 "c/lookat" => {
2877 id => "infobox",
2878 title => "Look",
2879 reply => undef,
2880 tooltip => "What you saw there",
2881 },
2882 "c/who" => {
2883 id => "infobox",
2884 title => "Players",
2885 reply => undef,
2886 tooltip => "Shows players who are currently online",
2887 },
2888 "c/body" => {
2889 id => "infobox",
2890 title => "Body Parts",
2891 reply => undef,
2892 tooltip => "Shows which body parts you posess and are available",
2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2900 "c/skills" => {
2901 id => "infobox",
2902 title => "Skills",
2903 reply => undef,
2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2929 },
2930 "c/uptime" => {
2931 id => "infobox",
2932 title => "Uptime",
2933 reply => undef,
2934 tooltip => "How long the server has been running since last restart",
2935 },
2936 "c/mapinfo" => {
2937 id => "infobox",
2938 title => "Map Info",
2939 reply => undef,
2940 tooltip => "Information related to the maps",
2941 },
2942 "c/party" => {
2943 id => "party",
2944 title => "Party",
2945 reply => "gsay ",
2946 tooltip => "Messages and chat related to your party",
2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2640); 2956);
2641 2957
2642sub cf::client::send_msg { 2958sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2960
2645 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2646 2963
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2965
2649 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2967 if ($CHANNEL{$channel}) {
2968 $channel = $CHANNEL{$channel};
2651 2969
2970 $self->ext_msg (channel_info => $channel);
2971 $channel = $channel->{id};
2972
2652 if (ref $channel) { 2973 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2657 if $self->can_msg;
2658 } 2978 }
2659 2979
2660 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2661 } 2981 }
2662 2982
2663 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2664 2984
2665 if ($self->can_msg) {
2666 # default colour, mask it out 2985 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2669 2988
2670 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2989 my $pkt = "msg "
2990 . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2672 } else { 2992 );
2673 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones
2675 for ($msg) {
2676 1 while
2677 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2678 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2679 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2680 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2681 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2682 }
2683 2993
2684 $color &= cf::NDI_COLOR_MASK; 2994 $self->send_big_packet ($pkt);
2685
2686 utf8::encode $msg;
2687
2688 if (0 && $msg =~ /\[/) {
2689 # COMMAND/INFO
2690 $self->send_packet ("drawextinfo $color 10 8 $msg")
2691 } else {
2692 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2693 $self->send_packet ("drawinfo $color $msg")
2694 }
2695 }
2696 }
2697} 2995}
2698 2996
2699=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2700 2998
2701Sends an ext event to the client. 2999Sends an ext event to the client.
2704 3002
2705sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2706 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2707 3005
2708 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2709 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2710 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2711 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2712 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2713 } 3011 }
2714} 3012}
2715 3013
2716=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2717 3015
2721 3019
2722sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2723 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2724 3022
2725 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2726 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2727 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2728 #TODO: version 1, remove 3026 #TODO: version 1, remove
2729 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 } 3029 }
2732} 3030}
2733 3031
2734=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2735 3033
2862our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
2863 3161
2864$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
2865 3163
2866$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
2867 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
2868 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
2869 sort time 3167 sort time
2870)); 3168));
2871 3169
2872# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
2874=pod 3172=pod
2875 3173
2876The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
2877 3175
2878 cf::object 3176 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3177 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3178 insert remove name archname title slaying race decrease split
3179 value
2881 3180
2882 cf::object::player 3181 cf::object::player
2883 player 3182 player
2884 3183
2885 cf::player 3184 cf::player
2890 3189
2891=cut 3190=cut
2892 3191
2893for ( 3192for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3195 decrease split destroy change_exp value msg lore send_msg)],
2897 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
2899 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
2900) { 3199) {
2901 no strict 'refs'; 3200 no strict 'refs';
2902 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
2903 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2921 3220
2922 my $qcode = $code; 3221 my $qcode = $code;
2923 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2924 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
2925 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
2926 local $_; 3228 local $_;
2927 local @safe::cf::_safe_eval_args = values %vars;
2928 3229
2929 my $eval = 3230 my $eval =
2930 "do {\n" 3231 "do {\n"
2931 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2932 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
2933 . $code 3234 . $code
2934 . "\n}" 3235 . "\n}"
2935 ; 3236 ;
2936 3237
3238 if ($CFG{safe_eval}) {
2937 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
2938 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2939 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
2940 3247
2941 if ($@) { 3248 if ($@) {
2942 warn "$@"; 3249 warn "$@";
2943 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
2944 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
2963=cut 3270=cut
2964 3271
2965sub register_script_function { 3272sub register_script_function {
2966 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
2967 3274
2968 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
2969 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
2970} 3277}
2971 3278
2972=back 3279=back
2973 3280
2974=cut 3281=cut
2995 3302
2996 $facedata->{version} == 2 3303 $facedata->{version} == 2
2997 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
2998 3305
2999 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3000 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3001 type => FT_RSRC, 3309 type => FT_RSRC,
3002 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3003 }; 3312 };
3004 cf::cede_to_tick; 3313 cf::cede_to_tick;
3005 3314
3006 { 3315 {
3007 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
3008 3317
3009 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320
3011 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3015 3325
3016 cf::cede_to_tick; 3326 cf::cede_to_tick;
3017 } 3327 }
3018 3328
3019 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3330 next unless $info->{smooth};
3331
3021 my $idx = cf::face::find $face 3332 my $idx = cf::face::find $face
3022 or next; 3333 or next;
3334
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3335 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3336 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3338 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3339 warn "smooth face '$info->{smooth}' not found for face '$face'";
3041 3353
3042 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3043 } 3355 }
3044 3356
3045 { 3357 {
3046 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3049 3359
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3361 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data;
3055 3363
3056 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3057 # prepend meta info 3365 cf::face::set_type $idx, $info->{type};
3058
3059 my $meta = $enc->encode ({
3060 name => $name,
3061 %{ $info->{meta} || {} },
3062 });
3063
3064 $data = pack "(w/a*)*", $meta, $info->{data};
3065 } else { 3366 } else {
3066 $data = $info->{data}; 3367 $RESOURCE{$name} = $info;
3067 } 3368 }
3068 3369
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3370 cf::cede_to_tick;
3073 } 3371 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3372 }
3373
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3375
3094 1 3376 1
3095} 3377}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3096 3398
3097register_exticmd fx_want => sub { 3399register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_; 3400 my ($ns, $want) = @_;
3099 3401
3100 while (my ($k, $v) = each %$want) { 3402 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3403 $ns->fx_want ($k, $v);
3102 } 3404 }
3103}; 3405};
3406
3407sub load_resource_file($) {
3408 my $guard = lock_acquire "load_resource_file";
3409
3410 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100;
3412 cf::arch::commit_load;
3413
3414 $status
3415}
3104 3416
3105sub reload_regions { 3417sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3418 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3419 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3420 %ext::player_env::MUSIC_FACE_CACHE = ();
3122} 3434}
3123 3435
3124sub reload_archetypes { 3436sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3437 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3438 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3439}
3133 3440
3134sub reload_treasures { 3441sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3442 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3443 or die "unable to load treasurelists\n";
3137} 3444}
3138 3445
3139sub reload_resources { 3446sub reload_resources {
3140 warn "reloading resource files...\n"; 3447 warn "reloading resource files...\n";
3141 3448
3449 reload_facedata;
3450 reload_archetypes;
3142 reload_regions; 3451 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3452 reload_treasures;
3147 3453
3148 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3149} 3455}
3150 3456
3151sub init {
3152 reload_resources;
3153}
3154
3155sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3461 or return;
3158 3462
3159 local $/; 3463 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3161 3465
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3163 3467
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3165 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3169 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3170 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3171 }; 3475 };
3172 warn $@ if $@; 3476 warn $@ if $@;
3173 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3480}
3481
3482sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!";
3485 flock $fh, &Fcntl::LOCK_EX
3486 or die "$PIDFILE: flock: $!";
3487 $fh
3488}
3489
3490# make sure only one server instance is running at any one time
3491sub atomic {
3492 my $fh = pidfile;
3493
3494 my $pid = <$fh>;
3495 kill 9, $pid if $pid > 0;
3496
3497 seek $fh, 0, 0;
3498 print $fh $$;
3499}
3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3174} 3508}
3175 3509
3176sub main { 3510sub main {
3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524
3177 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3528 (async {
3181 Event::one_event; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3530 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3183 }; 3532 };
3184 3533
3534 evthread_start IO::AIO::poll_fileno;
3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3185 reload_config; 3541 reload_config;
3186 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills;
3548
3549 cf::init_beforeplay;
3550
3551 atomic;
3552
3187 load_extensions; 3553 load_extensions;
3188 3554
3189 $TICK_WATCHER->start; 3555 utime time, time, $RUNTIMEFILE;
3190 Event::loop; 3556
3557 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560
3561 (pop @POST_INIT)->(0) while @POST_INIT;
3562 };
3563
3564 main_loop;
3191} 3565}
3192 3566
3193############################################################################# 3567#############################################################################
3194# initialisation and cleanup 3568# initialisation and cleanup
3195 3569
3196# install some emergency cleanup handlers 3570# install some emergency cleanup handlers
3197BEGIN { 3571BEGIN {
3572 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3573 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3574 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3575 cf::cleanup "SIG$signal";
3206 },
3207 ); 3576 };
3208 } 3577 }
3209} 3578}
3210 3579
3211sub write_runtime { 3580sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime"; 3581 my $t0 = EV::time;
3213 3582
3214 # first touch the runtime file to show we are still running: 3583 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3584 # the fsync below can take a very very long time.
3216 3585
3217 IO::AIO::aio_utime $runtime, undef, undef; 3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3218 3587
3219 my $guard = cf::lock_acquire "write_runtime"; 3588 my $guard = cf::lock_acquire "write_runtime";
3220 3589
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3590 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3222 or return; 3591 or return;
3223 3592
3224 my $value = $cf::RUNTIME + 90 + 10; 3593 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock 3594 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server. 3595 # 60 allows for the watchdog to kill the server.
3236 aio_utime $fh, undef, undef; 3605 aio_utime $fh, undef, undef;
3237 3606
3238 close $fh 3607 close $fh
3239 or return; 3608 or return;
3240 3609
3241 aio_rename "$runtime~", $runtime 3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3242 and return; 3611 and return;
3243 3612
3244 warn "runtime file written.\n"; 3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3245 3614
3246 1 3615 1
3616}
3617
3618our $uuid_lock;
3619our $uuid_skip;
3620
3621sub write_uuid_sync($) {
3622 $uuid_skip ||= $_[0];
3623
3624 return if $uuid_lock;
3625 local $uuid_lock = 1;
3626
3627 my $uuid = "$LOCALDIR/uuid";
3628
3629 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3630 or return;
3631
3632 my $value = uuid_seq uuid_cur;
3633
3634 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n";
3636 return;
3637 }
3638
3639 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0;
3641
3642 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3643 and return;
3644
3645 # always fsync - this file is important
3646 aio_fsync $fh
3647 and return;
3648
3649 close $fh
3650 or return;
3651
3652 aio_rename "$uuid~", $uuid
3653 and return;
3654
3655 warn "uuid file written ($value).\n";
3656
3657 1
3658
3659}
3660
3661sub write_uuid($$) {
3662 my ($skip, $sync) = @_;
3663
3664 $sync ? write_uuid_sync $skip
3665 : async { write_uuid_sync $skip };
3247} 3666}
3248 3667
3249sub emergency_save() { 3668sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3669 my $freeze_guard = cf::freeze_mainloop;
3251 3670
3252 warn "enter emergency perl save\n"; 3671 warn "emergency_perl_save: enter\n";
3253 3672
3254 cf::sync_job { 3673 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678
3255 # use a peculiar iteration method to avoid tripping on perl 3679 # use a peculiar iteration method to avoid tripping on perl
3256 # refcount bugs in for. also avoids problems with players 3680 # refcount bugs in for. also avoids problems with players
3257 # and maps saved/destroyed asynchronously. 3681 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3682 warn "emergency_perl_save: begin player save\n";
3259 for my $login (keys %cf::PLAYER) { 3683 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3684 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3685 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3687 $pl->save;
3263 } 3688 }
3264 warn "end emergency player save\n"; 3689 warn "emergency_perl_save: end player save\n";
3265 3690
3266 warn "begin emergency map save\n"; 3691 warn "emergency_perl_save: begin map save\n";
3267 for my $path (keys %cf::MAP) { 3692 for my $path (keys %cf::MAP) {
3268 my $map = $cf::MAP{$path} or next; 3693 my $map = $cf::MAP{$path} or next;
3269 $map->valid or next; 3694 $map->valid or next;
3270 $map->save; 3695 $map->save;
3271 } 3696 }
3272 warn "end emergency map save\n"; 3697 warn "emergency_perl_save: end map save\n";
3273 3698
3274 warn "begin emergency database checkpoint\n"; 3699 warn "emergency_perl_save: begin database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3700 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n"; 3701 warn "emergency_perl_save: end database checkpoint\n";
3702
3703 warn "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n";
3277 }; 3706 };
3278 3707
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3279 warn "leave emergency perl save\n"; 3713 warn "emergency_perl_save: leave\n";
3280} 3714}
3281 3715
3282sub post_cleanup { 3716sub post_cleanup {
3283 my ($make_core) = @_; 3717 my ($make_core) = @_;
3284 3718
3285 warn Carp::longmess "post_cleanup backtrace" 3719 warn Carp::longmess "post_cleanup backtrace"
3286 if $make_core; 3720 if $make_core;
3721
3722 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$;
3724}
3725
3726# a safer delete_package, copied from Symbol
3727sub clear_package($) {
3728 my $pkg = shift;
3729
3730 # expand to full symbol table name if needed
3731 unless ($pkg =~ /^main::.*::$/) {
3732 $pkg = "main$pkg" if $pkg =~ /^::/;
3733 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3734 $pkg .= '::' unless $pkg =~ /::$/;
3735 }
3736
3737 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3738 my $stem_symtab = *{$stem}{HASH};
3739
3740 defined $stem_symtab and exists $stem_symtab->{$leaf}
3741 or return;
3742
3743 # clear all symbols
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 }
3749 warn "cleared package $pkg\n";#d#
3287} 3750}
3288 3751
3289sub do_reload_perl() { 3752sub do_reload_perl() {
3290 # can/must only be called in main 3753 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3754 if ($Coro::current != $Coro::main) {
3292 warn "can only reload from main coroutine"; 3755 warn "can only reload from main coroutine";
3293 return; 3756 return;
3294 } 3757 }
3295 3758
3759 return if $RELOAD++;
3760
3761 my $t1 = EV::time;
3762
3763 while ($RELOAD) {
3296 warn "reloading..."; 3764 warn "reloading...";
3297 3765
3298 warn "entering sync_job"; 3766 warn "entering sync_job";
3299 3767
3300 cf::sync_job { 3768 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark 3769 cf::write_runtime_sync; # external watchdog should not bark
3302 cf::emergency_save; 3770 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark 3771 cf::write_runtime_sync; # external watchdog should not bark
3304 3772
3305 warn "syncing database to disk"; 3773 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV; 3774 BDB::db_env_txn_checkpoint $DB_ENV;
3307 3775
3308 # if anything goes wrong in here, we should simply crash as we already saved 3776 # if anything goes wrong in here, we should simply crash as we already saved
3309 3777
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests"; 3778 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3779 while (IO::AIO::nreqs || BDB::nreqs) {
3321 warn "iterate..."; 3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = ();
3329
3330 warn "removing commands";
3331 %COMMAND = ();
3332
3333 warn "removing ext/exti commands";
3334 %EXTCMD = ();
3335 %EXTICMD = ();
3336
3337 warn "unloading/nuking all extensions";
3338 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg";
3340
3341 if (my $cb = $pkg->can ("unload")) {
3342 eval {
3343 $cb->($pkg);
3344 1
3345 } or warn "$pkg unloaded, but with errors: $@";
3346 } 3781 }
3347 3782
3348 warn "... nuking $pkg"; 3783 warn "cancelling all extension coros";
3349 Symbol::delete_package $pkg; 3784 $_->cancel for values %EXT_CORO;
3350 } 3785 %EXT_CORO = ();
3351 3786
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3787 warn "removing commands";
3353 while (my ($k, $v) = each %INC) { 3788 %COMMAND = ();
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3789
3790 warn "removing ext/exti commands";
3791 %EXTCMD = ();
3792 %EXTICMD = ();
3793
3794 warn "unloading/nuking all extensions";
3795 for my $pkg (@EXTS) {
3356 warn "... unloading $k"; 3796 warn "... unloading $pkg";
3357 delete $INC{$k};
3358 3797
3359 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g;
3361
3362 if (my $cb = $k->can ("unload_module")) { 3798 if (my $cb = $pkg->can ("unload")) {
3799 eval {
3363 $cb->(); 3800 $cb->($pkg);
3801 1
3802 } or warn "$pkg unloaded, but with errors: $@";
3803 }
3804
3805 warn "... clearing $pkg";
3806 clear_package $pkg;
3364 } 3807 }
3365 3808
3366 Symbol::delete_package $k; 3809 warn "unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812
3813 warn "... unloading $k";
3814 delete $INC{$k};
3815
3816 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g;
3818
3819 if (my $cb = $k->can ("unload_module")) {
3820 $cb->();
3821 }
3822
3823 clear_package $k;
3367 } 3824 }
3368 3825
3369 warn "getting rid of safe::, as good as possible"; 3826 warn "getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 3827 clear_package "safe::$_"
3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3372 3829
3373 warn "unloading cf.pm \"a bit\""; 3830 warn "unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 3831 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3376 3833
3377 # don't, removes xs symbols, too, 3834 # don't, removes xs symbols, too,
3378 # and global variables created in xs 3835 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 3836 #clear_package __PACKAGE__;
3380 3837
3381 warn "unload completed, starting to reload now"; 3838 warn "unload completed, starting to reload now";
3382 3839
3383 warn "reloading cf.pm"; 3840 warn "reloading cf.pm";
3384 require cf; 3841 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3842 cf::_connect_to_perl_1;
3386 3843
3387 warn "loading config and database again"; 3844 warn "loading config and database again";
3388 cf::reload_config; 3845 cf::reload_config;
3389 3846
3390 warn "loading extensions"; 3847 warn "loading extensions";
3391 cf::load_extensions; 3848 cf::load_extensions;
3392 3849
3850 if ($REATTACH_ON_RELOAD) {
3393 warn "reattaching attachments to objects/players"; 3851 warn "reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 3852 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 3853 warn "reattaching attachments to maps";
3396 reattach $_ for values %MAP; 3854 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 3855 warn "reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 3856 reattach $_ for values %PLAYER;
3857 }
3399 3858
3859 warn "running post_init jobs";
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861
3400 warn "leaving sync_job"; 3862 warn "leaving sync_job";
3401 3863
3402 1 3864 1
3403 } or do { 3865 } or do {
3404 warn $@; 3866 warn $@;
3405 warn "error while reloading, exiting."; 3867 cf::cleanup "error while reloading, exiting.";
3406 exit 1;
3407 }; 3868 };
3408 3869
3409 warn "reloaded"; 3870 warn "reloaded";
3871 --$RELOAD;
3872 }
3873
3874 $t1 = EV::time - $t1;
3875 warn "reload completed in ${t1}s\n";
3410}; 3876};
3411 3877
3412our $RELOAD_WATCHER; # used only during reload 3878our $RELOAD_WATCHER; # used only during reload
3413 3879
3414sub reload_perl() { 3880sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 3881 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 3882 # coro crashes during coro_state_free->destroy here.
3417 3883
3418 $RELOAD_WATCHER ||= Event->timer ( 3884 $RELOAD_WATCHER ||= cf::async {
3419 reentrant => 0, 3885 Coro::AIO::aio_wait cache_extensions;
3420 after => 0, 3886
3421 data => WF_AUTOCANCEL, 3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3422 cb => sub {
3423 do_reload_perl; 3888 do_reload_perl;
3424 undef $RELOAD_WATCHER; 3889 undef $RELOAD_WATCHER;
3425 }, 3890 };
3426 ); 3891 };
3427} 3892}
3428 3893
3429register_command "reload" => sub { 3894register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3895 my ($who, $arg) = @_;
3431 3896
3432 if ($who->flag (FLAG_WIZ)) { 3897 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3898 $who->message ("reloading server.");
3899 async {
3900 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3901 reload_perl;
3902 };
3435 } 3903 }
3436}; 3904};
3437 3905
3438unshift @INC, $LIBDIR; 3906unshift @INC, $LIBDIR;
3439 3907
3441 3909
3442our @WAIT_FOR_TICK; 3910our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 3911our @WAIT_FOR_TICK_BEGIN;
3444 3912
3445sub wait_for_tick { 3913sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3448 3915
3449 my $signal = new Coro::Signal; 3916 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 3917 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 3918 $signal->wait;
3452} 3919}
3453 3920
3454sub wait_for_tick_begin { 3921sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3457 3923
3458 my $signal = new Coro::Signal; 3924 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3925 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3926 $signal->wait;
3461} 3927}
3462 3928
3463our $stat_fh; 3929sub tick {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 3930 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3931 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3932 unless ++$bug_warning > 10;
3476 return; 3933 return;
3477 } 3934 }
3478 3935
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time;
3482
3483 cf::server_tick; # one server iteration 3936 cf::server_tick; # one server iteration
3484 3937
3485 $RUNTIME += $TICK; 3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3486 $NEXT_TICK += $TICK;
3487 3939
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3940 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 3942 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3944 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 3945 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 } 3946 };
3947 }
3495 3948
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3950 $sig->send;
3501 } 3951 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3952 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3953 $sig->send;
3504 } 3954 }
3505 3955
3506 $NOW = Event::time; 3956 $LOAD = ($NOW - $TICK_START) / $TICK;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3958
3517 _post_tick; 3959 if (0) {
3518 3960 if ($NEXT_TICK) {
3519 # gather some statistics#d# 3961 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3963 warn "jitter $JITTER\n";#d#
3964 }
3522 }, 3965 }
3523); 3966}
3524 3967
3525{ 3968{
3969 # configure BDB
3970
3526 BDB::min_parallel 8; 3971 BDB::min_parallel 16;
3527 BDB::max_poll_time $TICK * 0.1; 3972 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 3973 $AnyEvent::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 3974
3552 unless ($DB_ENV) { 3975 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 3976 $DB_ENV = BDB::db_env_create;
3977 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3978 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3979 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3980 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3981 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 3982
3555 cf::sync_job { 3983 cf::sync_job {
3556 eval { 3984 eval {
3557 BDB::db_env_open 3985 BDB::db_env_open
3558 $DB_ENV, 3986 $DB_ENV,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3988 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3989 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3990 0666;
3563 3991
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3992 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 3993 };
3570 3994
3571 cf::cleanup "db_env_open(db): $@" if $@; 3995 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3996 };
3573 } 3997 }
3574 3998
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3999 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 4000 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 4001 };
3578 hard => 1, 4002 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4003 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 4004 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 4005 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4006 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 4007 };
3595} 4008}
3596 4009
3597{ 4010{
4011 # configure IO::AIO
4012
3598 IO::AIO::min_parallel 8; 4013 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 4014 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 4015 undef $AnyEvent::AIO::WATCHER;
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 4016}
3611 4017
3612my $_log_backtrace; 4018my $_log_backtrace;
3613 4019
3614sub _log_backtrace { 4020sub _log_backtrace {
3617 $msg =~ s/\n//; 4023 $msg =~ s/\n//;
3618 4024
3619 # limit the # of concurrent backtraces 4025 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 4026 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 4027 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg;
3622 async { 4029 async {
4030 $Coro::current->{desc} = "abt $msg";
4031
3623 my @bt = fork_call { 4032 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 4033 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4034 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4035 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 4036 or die "addr2line: $!";
3635 } 4044 }
3636 4045
3637 @funcs 4046 @funcs
3638 }; 4047 };
3639 4048
3640 LOG llevInfo, "[ABT] $msg\n"; 4049 LOG llevInfo, "[ABT] $perl_bt\n";
4050 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt; 4051 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace; 4052 --$_log_backtrace;
3643 }; 4053 };
3644 } else { 4054 } else {
3645 LOG llevInfo, "[ABT] $msg\n"; 4055 LOG llevInfo, "[ABT] $msg\n";
3646 LOG llevInfo, "[ABT] [suppressed]\n"; 4056 LOG llevInfo, "[ABT] [suppressed]\n";
3647 } 4057 }
3648} 4058}
3649 4059
3650# load additional modules 4060# load additional modules
3651use cf::pod; 4061require "cf/$_.pm" for @EXTRA_MODULES;
4062cf::_connect_to_perl_2;
3652 4063
3653END { cf::emergency_save } 4064END { cf::emergency_save }
3654 4065
36551 40661
3656 4067

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines