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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines