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.380 by root, Mon Oct 8 13:58:07 2007 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 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
1260 warn "mandatory extension failed to load, exiting.\n"; 1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1261 exit 1; 1443 delete $todo{$k};
1262 } 1444 } else {
1263 1445 $done{$k} = delete $todo{$k};
1264 warn $msg; 1446 push @EXTS, $v->{pkg};
1447 $progress = 1;
1448
1449 warn "$v->{base}: extension inactive.\n"
1450 unless $active;
1265 } 1451 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1452 }
1271 1453
1272 skip: 1454 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1455 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 unless $progress; 1456
1457 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory};
1460 }
1461 }
1275 } 1462 }
1276 }; 1463 };
1277} 1464}
1278 1465
1279############################################################################# 1466#############################################################################
1280 1467
1281=back 1468=back
1282 1469
1283=head2 CORE EXTENSIONS 1470=head2 CORE EXTENSIONS
1284 1471
1285Functions and methods that extend core crossfire objects. 1472Functions and methods that extend core deliantra objects.
1286 1473
1287=cut 1474=cut
1288 1475
1289package cf::player; 1476package cf::player;
1290 1477
1333 1520
1334sub exists($) { 1521sub exists($) {
1335 my ($login) = @_; 1522 my ($login) = @_;
1336 1523
1337 $cf::PLAYER{$login} 1524 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1525 or !aio_stat path $login
1339} 1526}
1340 1527
1341sub find($) { 1528sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1529 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1530 my $login = $_[0];
1355 my $f = new_from_file cf::object::thawer path $login 1542 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1543 or return;
1357 1544
1358 my $pl = cf::player::load_pl $f 1545 my $pl = cf::player::load_pl $f
1359 or return; 1546 or return;
1547
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1548 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1549 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1550 $cf::PLAYER{$login} = $pl
1363 } 1551 }
1364 } 1552 }
1365} 1553}
1366 1554
1555cf::player->attach (
1556 on_load => sub {
1557 my ($pl, $path) = @_;
1558
1559 # restore slots saved in save, below
1560 my $slots = delete $pl->{_slots};
1561
1562 $pl->ob->current_weapon ($slots->[0]);
1563 $pl->combat_ob ($slots->[1]);
1564 $pl->ranged_ob ($slots->[2]);
1565 },
1566);
1567
1367sub save($) { 1568sub save($) {
1368 my ($pl) = @_; 1569 my ($pl) = @_;
1369 1570
1370 return if $pl->{deny_save}; 1571 return if $pl->{deny_save};
1371 1572
1374 1575
1375 return if $pl->{deny_save}; 1576 return if $pl->{deny_save};
1376 1577
1377 aio_mkdir playerdir $pl, 0770; 1578 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1579 $pl->{last_save} = $cf::RUNTIME;
1580
1581 cf::get_slot 0.01;
1582
1583 # save slots, to be restored later
1584 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1585
1380 $pl->save_pl ($path); 1586 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1587 cf::cede_to_tick;
1382} 1588}
1383 1589
1415 my ($pl) = @_; 1621 my ($pl) = @_;
1416 1622
1417 my $name = $pl->ob->name; 1623 my $name = $pl->ob->name;
1418 1624
1419 $pl->{deny_save} = 1; 1625 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1626 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1627
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1629 $pl->deactivate;
1630 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1631 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1632 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1633 $pl->ns->destroy if $pl->ns;
1426 1634
1427 my $path = playerdir $pl; 1635 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1636 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1675
1468 for my $login (@$dirs) { 1676 for my $login (@$dirs) {
1469 my $path = path $login; 1677 my $path = path $login;
1470 1678
1471 # a .pst is a dead give-away for a valid player 1679 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1680 # if no pst file found, open and chekc for blocked users
1681 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1682 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1683 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1684 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1685 }
1477 1686
1508 } 1717 }
1509 1718
1510 \@paths 1719 \@paths
1511} 1720}
1512 1721
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1722=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1723
1515Expand crossfire pod fragments into protocol xml. 1724Expand 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 1725
1564=item $player->ext_reply ($msgid, @msg) 1726=item $player->ext_reply ($msgid, @msg)
1565 1727
1566Sends an ext reply to the player. 1728Sends an ext reply to the player.
1567 1729
1634our $MAX_RESET = 3600; 1796our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1797our $DEFAULT_RESET = 3000;
1636 1798
1637sub generate_random_map { 1799sub generate_random_map {
1638 my ($self, $rmp) = @_; 1800 my ($self, $rmp) = @_;
1801
1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1803
1639 # mit "rum" bekleckern, nicht 1804 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1805 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1809 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1810 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1930
1766# the temporary/swap location 1931# the temporary/swap location
1767sub save_path { 1932sub save_path {
1768 my ($self) = @_; 1933 my ($self) = @_;
1769 1934
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1935 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1936 "$TMPDIR/$path.map"
1772} 1937}
1773 1938
1774# the unique path, undef == no special unique path 1939# the unique path, undef == no special unique path
1775sub uniq_path { 1940sub uniq_path {
1776 my ($self) = @_; 1941 my ($self) = @_;
1777 1942
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1944 "$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} 1945}
1790 1946
1791sub decay_objects { 1947sub decay_objects {
1792 my ($self) = @_; 1948 my ($self) = @_;
1793 1949
1877sub find { 2033sub find {
1878 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1879 2035
1880 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1881 2037
1882 cf::lock_wait "map_data:$path";#d#remove 2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2040
1885 $cf::MAP{$path} || do { 2041 $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 2042 my $map = new_from_path cf::map $path
1890 or return; 2043 or return;
1891 2044
1892 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1893 2046
1895 or return; 2048 or return;
1896 2049
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1900 undef $guard1; 2054 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2055 $map->reset;
1903 return find $path; 2056 return find $path;
1904 } 2057 }
1905 2058
1906 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1907 } 2060 }
1908} 2061}
1909 2062
1910sub pre_load { } 2063sub pre_load { }
1911sub post_load { } 2064#sub post_load { } # XS
1912 2065
1913sub load { 2066sub load {
1914 my ($self) = @_; 2067 my ($self) = @_;
1915 2068
1916 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2087 $f->skip_block;
1935 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
1936 or return; 2089 or return;
1937 2090
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
1939 if delete $self->{load_original}; 2092 if delete $self->{load_original};
1940 2093
1941 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2095 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2115 $self->decay_objects;
1963 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
1964 $self->update_buttons; 2117 $self->update_buttons;
1965 cf::cede_to_tick; 2118 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2119 $self->activate;
1969 } 2120 }
1970 2121
1971 $self->{last_save} = $cf::RUNTIME; 2122 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2123 $self->last_access ($cf::RUNTIME);
1973 2124
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2125 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2126 }
1976 2127
1977 $self->post_load; 2128 $self->post_load;
1978} 2129}
1979 2130
2131# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath
1980sub customise_for { 2134sub customise_for {
1981 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
1982 2136
1983 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2138 if $self->per_player;
2037 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
2038 2192
2039 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
2040 2194
2041 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2197 }
2044 2198
2045 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
2046 2200
2047 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
2061 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
2062 2216
2063 () 2217 ()
2064} 2218}
2065 2219
2220# common code, used by both ->save and ->swapout
2066sub save { 2221sub _save {
2067 my ($self) = @_; 2222 my ($self) = @_;
2068
2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
2070 2223
2071 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2072 2225
2073 return unless $self->dirty; 2226 return unless $self->dirty;
2074 2227
2083 2236
2084 cf::async { 2237 cf::async {
2085 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2086 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2087 }; 2240 };
2241
2242 cf::get_slot 0.02;
2088 2243
2089 if ($uniq) { 2244 if ($uniq) {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2092 } else { 2247 } else {
2093 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2094 } 2249 }
2095} 2250}
2096 2251
2252sub save {
2253 my ($self) = @_;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256
2257 $self->_save;
2258}
2259
2097sub swap_out { 2260sub swap_out {
2098 my ($self) = @_; 2261 my ($self) = @_;
2099 2262
2100 # save first because save cedes
2101 $self->save;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2264
2265 return if $self->in_memory != cf::MAP_ACTIVE;
2266 return if $self->{deny_save};
2105 return if $self->players; 2267 return if $self->players;
2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2107 return if $self->{deny_save};
2108 2268
2109 $self->in_memory (cf::MAP_SWAPPED); 2269 # first deactivate the map and "unlink" it from the core
2110
2111 $self->deactivate; 2270 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP; 2271 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED);
2273
2274 # then atomically save
2275 $self->_save;
2276
2277 # then free the map
2113 $self->clear; 2278 $self->clear;
2114} 2279}
2115 2280
2116sub reset_at { 2281sub reset_at {
2117 my ($self) = @_; 2282 my ($self) = @_;
2136 2301
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2302 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2303
2139 return if $self->players; 2304 return if $self->players;
2140 2305
2141 warn "resetting map ", $self->path; 2306 warn "resetting map ", $self->path, "\n";
2142 2307
2143 $self->in_memory (cf::MAP_SWAPPED); 2308 $self->in_memory (cf::MAP_SWAPPED);
2144 2309
2145 # need to save uniques path 2310 # need to save uniques path
2146 unless ($self->{deny_save}) { 2311 unless ($self->{deny_save}) {
2229 2394
2230sub unique_maps() { 2395sub unique_maps() {
2231 [ 2396 [
2232 map { 2397 map {
2233 utf8::decode $_; 2398 utf8::decode $_;
2234 /\.map$/ 2399 s/\.map$//; # TODO future compatibility hack
2400 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2401 ? ()
2235 ? normalise $_ 2402 : normalise $_
2236 : ()
2237 } @{ aio_readdir $UNIQUEDIR or [] } 2403 } @{ aio_readdir $UNIQUEDIR or [] }
2238 ] 2404 ]
2239} 2405}
2240 2406
2241package cf; 2407=item cf::map::static_maps
2408
2409Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2410file in the shared directory excluding F</styles> and F</editor>). May
2411block.
2412
2413=cut
2414
2415sub static_maps() {
2416 my @dirs = "";
2417 my @maps;
2418
2419 while (@dirs) {
2420 my $dir = shift @dirs;
2421
2422 next if $dir eq "/styles" || $dir eq "/editor";
2423
2424 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2425 or return;
2426
2427 for (@$files) {
2428 s/\.map$// or next;
2429 utf8::decode $_;
2430 push @maps, "$dir/$_";
2431 }
2432
2433 push @dirs, map "$dir/$_", @$dirs;
2434 }
2435
2436 \@maps
2437}
2242 2438
2243=back 2439=back
2244 2440
2245=head3 cf::object 2441=head3 cf::object
2246 2442
2250 2446
2251=over 4 2447=over 4
2252 2448
2253=item $ob->inv_recursive 2449=item $ob->inv_recursive
2254 2450
2255Returns the inventory of the object _and_ their inventories, recursively. 2451Returns the inventory of the object I<and> their inventories, recursively,
2452but I<not> the object itself.
2256 2453
2257=cut 2454=cut
2258 2455
2259sub inv_recursive_; 2456sub inv_recursive_;
2260sub inv_recursive_ { 2457sub inv_recursive_ {
2265 inv_recursive_ inv $_[0] 2462 inv_recursive_ inv $_[0]
2266} 2463}
2267 2464
2268=item $ref = $ob->ref 2465=item $ref = $ob->ref
2269 2466
2270creates and returns a persistent reference to an objetc that can be stored as a string. 2467Creates and returns a persistent reference to an object that can be stored as a string.
2271 2468
2272=item $ob = cf::object::deref ($refstring) 2469=item $ob = cf::object::deref ($refstring)
2273 2470
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2471returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block. 2472even if the object actually exists. May block.
2307can be C<undef>. Does the right thing when the player is currently in a 2504can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2505dialogue with the given NPC character.
2309 2506
2310=cut 2507=cut
2311 2508
2509our $SAY_CHANNEL = {
2510 id => "say",
2511 title => "Map",
2512 reply => "say ",
2513 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2514};
2515
2516our $CHAT_CHANNEL = {
2517 id => "chat",
2518 title => "Chat",
2519 reply => "chat ",
2520 tooltip => "Player chat and shouts, global to the server.",
2521};
2522
2312# rough implementation of a future "reply" method that works 2523# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2524# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2525#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2526sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2527 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2538 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2539 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2540
2330 } else { 2541 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2542 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2543 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2544 }
2334 } 2545 }
2335} 2546}
2336 2547
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2548=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2573
2363=item $player_object->enter_link 2574=item $player_object->enter_link
2364 2575
2365Freezes the player and moves him/her to a special map (C<{link}>). 2576Freezes the player and moves him/her to a special map (C<{link}>).
2366 2577
2367The player should be reasonably safe there for short amounts of time. You 2578The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2579for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link
2581map.
2369 2582
2370Will never block. 2583Will never block.
2371 2584
2372=item $player_object->leave_link ($map, $x, $y) 2585=item $player_object->leave_link ($map, $x, $y)
2373 2586
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2611 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2612
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2614 if $self->map && $self->map->{path} ne "{link}";
2402 2615
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2616 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2617}
2405 2618
2406sub cf::object::player::leave_link { 2619sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2620 my ($self, $map, $x, $y) = @_;
2408 2621
2425 ($x, $y) = (-1, -1) 2638 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2639 unless (defined $x) && (defined $y);
2427 2640
2428 # use -1 or undef as default coordinates, not 0, 0 2641 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2642 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2643 if $x <= 0 && $y <= 0;
2431 2644
2432 $map->load; 2645 $map->load;
2433 $map->load_neighbours; 2646 $map->load_neighbours;
2434 2647
2435 return unless $self->contr->active; 2648 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2649
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2651 $self->enter_map ($map, $x, $y);
2652
2653 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive;
2440} 2655}
2441 2656
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2658
2444Moves the player to the given map-path and coordinates by first freezing 2659Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2660her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2661that 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 2662the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2663be called at the end of this process.
2664
2665Note that $check will be called with a potentially non-loaded map, so if
2666it needs a loaded map it has to call C<< ->load >>.
2449 2667
2450=cut 2668=cut
2451 2669
2452our $GOTOGEN; 2670our $GOTOGEN;
2453 2671
2532} 2750}
2533 2751
2534sub prepare_random_map { 2752sub prepare_random_map {
2535 my ($exit) = @_; 2753 my ($exit) = @_;
2536 2754
2537 my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539 # all this does is basically replace the /! path by 2755 # all this does is basically replace the /! path by
2540 # a new random map path (?random/...) with a seed 2756 # a new random map path (?random/...) with a seed
2541 # that depends on the exit object 2757 # that depends on the exit object
2542 2758
2543 my $rmp = parse_random_map_params $exit->msg; 2759 my $rmp = parse_random_map_params $exit->msg;
2545 if ($exit->map) { 2761 if ($exit->map) {
2546 $rmp->{region} = $exit->region->name; 2762 $rmp->{region} = $exit->region->name;
2547 $rmp->{origin_map} = $exit->map->path; 2763 $rmp->{origin_map} = $exit->map->path;
2548 $rmp->{origin_x} = $exit->x; 2764 $rmp->{origin_x} = $exit->x;
2549 $rmp->{origin_y} = $exit->y; 2765 $rmp->{origin_y} = $exit->y;
2766
2767 $exit->map->touch;
2550 } 2768 }
2551 2769
2552 $rmp->{random_seed} ||= $exit->random_seed; 2770 $rmp->{random_seed} ||= $exit->random_seed;
2553 2771
2554 my $data = cf::to_json $rmp; 2772 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555 my $md5 = Digest::MD5::md5_hex $data; 2773 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2774 my $meta = "$RANDOMDIR/$md5.meta";
2557 2775
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2776 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2777 aio_write $fh, 0, (length $data), $data, 0;
2560 undef $fh; 2778 undef $fh;
2561 aio_rename "$meta~", $meta; 2779 aio_rename "$meta~", $meta;
2562 2780
2781 my $slaying = "?random/$md5";
2782
2783 if ($exit->valid) {
2563 $exit->slaying ("?random/$md5"); 2784 $exit->slaying ("?random/$md5");
2564 $exit->msg (undef); 2785 $exit->msg (undef);
2786 }
2565 } 2787 }
2566} 2788}
2567 2789
2568sub cf::object::player::enter_exit { 2790sub cf::object::player::enter_exit {
2569 my ($self, $exit) = @_; 2791 my ($self, $exit) = @_;
2570 2792
2571 return unless $self->type == cf::PLAYER; 2793 return unless $self->type == cf::PLAYER;
2572 2794
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; 2795 $self->enter_link;
2585 2796
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 { 2797 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2798 $Coro::current->{desc} = "enter_exit";
2592 2799
2593 $self->deactivate_recursive; # just to be sure
2594 unless (eval { 2800 unless (eval {
2801 $self->deactivate_recursive; # just to be sure
2802
2803 # random map handling
2804 {
2805 my $guard = cf::lock_acquire "exit_prepare:$exit";
2806
2807 prepare_random_map $exit
2808 if $exit->slaying eq "/!";
2809 }
2810
2811 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2812 my $x = $exit->stats->hp;
2813 my $y = $exit->stats->sp;
2814
2595 $self->goto ($slaying, $hp, $sp); 2815 $self->goto ($map, $x, $y);
2596 2816
2817 # if exit is damned, update players death & WoR home-position
2818 $self->contr->savebed ($map, $x, $y)
2819 if $exit->flag (cf::FLAG_DAMNED);
2820
2597 1; 2821 1
2598 }) { 2822 }) {
2599 $self->message ("Something went wrong deep within the crossfire server. " 2823 $self->message ("Something went wrong deep within the deliantra server. "
2600 . "I'll try to bring you back to the map you were before. " 2824 . "I'll try to bring you back to the map you were before. "
2601 . "Please report this to the dungeon master!", 2825 . "Please report this to the dungeon master!",
2602 cf::NDI_UNIQUE | cf::NDI_RED); 2826 cf::NDI_UNIQUE | cf::NDI_RED);
2603 2827
2604 warn "ERROR in enter_exit: $@"; 2828 warn "ERROR in enter_exit: $@";
2621sub cf::client::send_drawinfo { 2845sub cf::client::send_drawinfo {
2622 my ($self, $text, $flags) = @_; 2846 my ($self, $text, $flags) = @_;
2623 2847
2624 utf8::encode $text; 2848 utf8::encode $text;
2625 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2849 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2850}
2851
2852=item $client->send_big_packet ($pkt)
2853
2854Like C<send_packet>, but tries to compress large packets, and fragments
2855them as required.
2856
2857=cut
2858
2859our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2860
2861sub cf::client::send_big_packet {
2862 my ($self, $pkt) = @_;
2863
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2626} 2875}
2627 2876
2628=item $client->send_msg ($channel, $msg, $color, [extra...]) 2877=item $client->send_msg ($channel, $msg, $color, [extra...])
2629 2878
2630Send a drawinfo or msg packet to the client, formatting the msg for the 2879Send 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 2881the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet. 2882the message unless the client supports the msg packet.
2634 2883
2635=cut 2884=cut
2636 2885
2886# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2887our %CHANNEL = (
2888 "c/motd" => {
2889 id => "infobox",
2890 title => "MOTD",
2891 reply => undef,
2892 tooltip => "The message of the day",
2893 },
2638 "c/identify" => { 2894 "c/identify" => {
2639 id => "infobox", 2895 id => "infobox",
2640 title => "Identify", 2896 title => "Identify",
2641 reply => undef, 2897 reply => undef,
2642 tooltip => "Items recently identified", 2898 tooltip => "Items recently identified",
2645 id => "infobox", 2901 id => "infobox",
2646 title => "Examine", 2902 title => "Examine",
2647 reply => undef, 2903 reply => undef,
2648 tooltip => "Signs and other items you examined", 2904 tooltip => "Signs and other items you examined",
2649 }, 2905 },
2906 "c/shopinfo" => {
2907 id => "infobox",
2908 title => "Shop Info",
2909 reply => undef,
2910 tooltip => "What your bargaining skill tells you about the shop",
2911 },
2912 "c/book" => {
2913 id => "infobox",
2914 title => "Book",
2915 reply => undef,
2916 tooltip => "The contents of a note or book",
2917 },
2650 "c/lookat" => { 2918 "c/lookat" => {
2651 id => "infobox", 2919 id => "infobox",
2652 title => "Look", 2920 title => "Look",
2653 reply => undef, 2921 reply => undef,
2654 tooltip => "What you saw there", 2922 tooltip => "What you saw there",
2655 }, 2923 },
2924 "c/who" => {
2925 id => "infobox",
2926 title => "Players",
2927 reply => undef,
2928 tooltip => "Shows players who are currently online",
2929 },
2930 "c/body" => {
2931 id => "infobox",
2932 title => "Body Parts",
2933 reply => undef,
2934 tooltip => "Shows which body parts you posess and are available",
2935 },
2936 "c/statistics" => {
2937 id => "infobox",
2938 title => "Statistics",
2939 reply => undef,
2940 tooltip => "Shows your primary statistics",
2941 },
2942 "c/skills" => {
2943 id => "infobox",
2944 title => "Skills",
2945 reply => undef,
2946 tooltip => "Shows your experience per skill and item power",
2947 },
2948 "c/shopitems" => {
2949 id => "infobox",
2950 title => "Shop Items",
2951 reply => undef,
2952 tooltip => "Shows the items currently for sale in this shop",
2953 },
2954 "c/resistances" => {
2955 id => "infobox",
2956 title => "Resistances",
2957 reply => undef,
2958 tooltip => "Shows your resistances",
2959 },
2960 "c/pets" => {
2961 id => "infobox",
2962 title => "Pets",
2963 reply => undef,
2964 tooltip => "Shows information abotu your pets/a specific pet",
2965 },
2966 "c/perceiveself" => {
2967 id => "infobox",
2968 title => "Perceive Self",
2969 reply => undef,
2970 tooltip => "You gained detailed knowledge about yourself",
2971 },
2972 "c/uptime" => {
2973 id => "infobox",
2974 title => "Uptime",
2975 reply => undef,
2976 tooltip => "How long the server has been running since last restart",
2977 },
2978 "c/mapinfo" => {
2979 id => "infobox",
2980 title => "Map Info",
2981 reply => undef,
2982 tooltip => "Information related to the maps",
2983 },
2984 "c/party" => {
2985 id => "party",
2986 title => "Party",
2987 reply => "gsay ",
2988 tooltip => "Messages and chat related to your party",
2989 },
2990 "c/death" => {
2991 id => "death",
2992 title => "Death",
2993 reply => undef,
2994 tooltip => "Reason for and more info about your most recent death",
2995 },
2996 "c/say" => $SAY_CHANNEL,
2997 "c/chat" => $CHAT_CHANNEL,
2656); 2998);
2657 2999
2658sub cf::client::send_msg { 3000sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 3001 my ($self, $channel, $msg, $color, @extra) = @_;
2660 3002
2661 $msg = $self->pl->expand_cfpod ($msg); 3003 $msg = $self->pl->expand_cfpod ($msg)
3004 unless $color & cf::NDI_VERBATIM;
2662 3005
2663 $color &= cf::NDI_CLIENT_MASK; # just in case... 3006 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664 3007
2665 # check predefined channels, for the benefit of C 3008 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) { 3009 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel}; 3010 $channel = $CHANNEL{$channel};
2668 3011
2669 $self->ext_msg (channel_info => $channel) 3012 $self->ext_msg (channel_info => $channel);
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id}; 3013 $channel = $channel->{id};
2673 3014
2674 } elsif (ref $channel) { 3015 } elsif (ref $channel) {
2675 # send meta info to client, if not yet sent 3016 # send meta info to client, if not yet sent
2676 unless (exists $self->{channel}{$channel->{id}}) { 3017 unless (exists $self->{channel}{$channel->{id}}) {
2677 $self->{channel}{$channel->{id}} = $channel; 3018 $self->{channel}{$channel->{id}} = $channel;
2678 $self->ext_msg (channel_info => $channel) 3019 $self->ext_msg (channel_info => $channel);
2679 if $self->can_msg;
2680 } 3020 }
2681 3021
2682 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2683 } 3023 }
2684 3024
2685 return unless @extra || length $msg; 3025 return unless @extra || length $msg;
2686 3026
2687 if ($self->can_msg) {
2688 # default colour, mask it out 3027 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3028 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF; 3029 if $color & cf::NDI_DEF;
2691 3030
2692 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3031 my $pkt = "msg "
3032 . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3033 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2694 } else { 3034 );
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 3035
2706 $color &= cf::NDI_COLOR_MASK; 3036 $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} 3037}
2720 3038
2721=item $client->ext_msg ($type, @msg) 3039=item $client->ext_msg ($type, @msg)
2722 3040
2723Sends an ext event to the client. 3041Sends an ext event to the client.
2726 3044
2727sub cf::client::ext_msg($$@) { 3045sub cf::client::ext_msg($$@) {
2728 my ($self, $type, @msg) = @_; 3046 my ($self, $type, @msg) = @_;
2729 3047
2730 if ($self->extcmd == 2) { 3048 if ($self->extcmd == 2) {
2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove 3050 } elsif ($self->extcmd == 1) { # TODO: remove
2733 push @msg, msgtype => "event_$type"; 3051 push @msg, msgtype => "event_$type";
2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3052 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 } 3053 }
2736} 3054}
2737 3055
2738=item $client->ext_reply ($msgid, @msg) 3056=item $client->ext_reply ($msgid, @msg)
2739 3057
2743 3061
2744sub cf::client::ext_reply($$@) { 3062sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_; 3063 my ($self, $id, @msg) = @_;
2746 3064
2747 if ($self->extcmd == 2) { 3065 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) { 3067 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove 3068 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id; 3069 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 } 3071 }
2754} 3072}
2755 3073
2756=item $success = $client->query ($flags, "text", \&cb) 3074=item $success = $client->query ($flags, "text", \&cb)
2757 3075
2858 3176
2859 $coro 3177 $coro
2860} 3178}
2861 3179
2862cf::client->attach ( 3180cf::client->attach (
2863 on_destroy => sub { 3181 on_client_destroy => sub {
2864 my ($ns) = @_; 3182 my ($ns) = @_;
2865 3183
2866 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3184 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2867 }, 3185 },
2868); 3186);
2884our $safe_hole = new Safe::Hole; 3202our $safe_hole = new Safe::Hole;
2885 3203
2886$SIG{FPE} = 'IGNORE'; 3204$SIG{FPE} = 'IGNORE';
2887 3205
2888$safe->permit_only (Opcode::opset qw( 3206$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math 3207 :base_core :base_mem :base_orig :base_math :base_loop
2890 grepstart grepwhile mapstart mapwhile 3208 grepstart grepwhile mapstart mapwhile
2891 sort time 3209 sort time
2892)); 3210));
2893 3211
2894# here we export the classes and methods available to script code 3212# here we export the classes and methods available to script code
2896=pod 3214=pod
2897 3215
2898The following functions and methods are available within a safe environment: 3216The following functions and methods are available within a safe environment:
2899 3217
2900 cf::object 3218 cf::object
2901 contr pay_amount pay_player map x y force_find force_add 3219 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr 3220 insert remove name archname title slaying race decrease split
3221 value
2903 3222
2904 cf::object::player 3223 cf::object::player
2905 player 3224 player
2906 3225
2907 cf::player 3226 cf::player
2912 3231
2913=cut 3232=cut
2914 3233
2915for ( 3234for (
2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3235 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race 3236 insert remove inv nrof name archname title slaying race
2918 decrease_ob_nr)], 3237 decrease split destroy change_exp value msg lore send_msg)],
2919 ["cf::object::player" => qw(player)], 3238 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3239 ["cf::player" => qw(peaceful send_msg)],
2921 ["cf::map" => qw(trigger)], 3240 ["cf::map" => qw(trigger)],
2922) { 3241) {
2923 no strict 'refs'; 3242 no strict 'refs';
2924 my ($pkg, @funs) = @$_; 3243 my ($pkg, @funs) = @$_;
2925 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2943 3262
2944 my $qcode = $code; 3263 my $qcode = $code;
2945 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3264 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2946 $qcode =~ s/\n/\\n/g; 3265 $qcode =~ s/\n/\\n/g;
2947 3266
3267 %vars = (_dummy => 0) unless %vars;
3268
3269 my @res;
2948 local $_; 3270 local $_;
2949 local @safe::cf::_safe_eval_args = values %vars;
2950 3271
2951 my $eval = 3272 my $eval =
2952 "do {\n" 3273 "do {\n"
2953 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3274 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2954 . "#line 0 \"{$qcode}\"\n" 3275 . "#line 0 \"{$qcode}\"\n"
2955 . $code 3276 . $code
2956 . "\n}" 3277 . "\n}"
2957 ; 3278 ;
2958 3279
3280 if ($CFG{safe_eval}) {
2959 sub_generation_inc; 3281 sub_generation_inc;
3282 local @safe::cf::_safe_eval_args = values %vars;
2960 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3283 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2961 sub_generation_inc; 3284 sub_generation_inc;
3285 } else {
3286 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval;
3288 }
2962 3289
2963 if ($@) { 3290 if ($@) {
2964 warn "$@"; 3291 warn "$@";
2965 warn "while executing safe code '$code'\n"; 3292 warn "while executing safe code '$code'\n";
2966 warn "with arguments " . (join " ", %vars) . "\n"; 3293 warn "with arguments " . (join " ", %vars) . "\n";
2985=cut 3312=cut
2986 3313
2987sub register_script_function { 3314sub register_script_function {
2988 my ($fun, $cb) = @_; 3315 my ($fun, $cb) = @_;
2989 3316
2990 no strict 'refs'; 3317 $fun = "safe::$fun" if $CFG{safe_eval};
2991 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3318 *$fun = $safe_hole->wrap ($cb);
2992} 3319}
2993 3320
2994=back 3321=back
2995 3322
2996=cut 3323=cut
3017 3344
3018 $facedata->{version} == 2 3345 $facedata->{version} == 2
3019 or cf::cleanup "$path: version mismatch, cannot proceed."; 3346 or cf::cleanup "$path: version mismatch, cannot proceed.";
3020 3347
3021 # patch in the exptable 3348 # patch in the exptable
3349 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3022 $facedata->{resource}{"res/exp_table"} = { 3350 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC, 3351 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3352 data => $exp_table,
3353 hash => (Digest::MD5::md5 $exp_table),
3025 }; 3354 };
3026 cf::cede_to_tick; 3355 cf::cede_to_tick;
3027 3356
3028 { 3357 {
3029 my $faces = $facedata->{faceinfo}; 3358 my $faces = $facedata->{faceinfo};
3030 3359
3031 while (my ($face, $info) = each %$faces) { 3360 while (my ($face, $info) = each %$faces) {
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3361 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3362
3033 cf::face::set_visibility $idx, $info->{visibility}; 3363 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3364 cf::face::set_magicmap $idx, $info->{magicmap};
3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3037 3367
3038 cf::cede_to_tick; 3368 cf::cede_to_tick;
3039 } 3369 }
3040 3370
3041 while (my ($face, $info) = each %$faces) { 3371 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3372 next unless $info->{smooth};
3373
3043 my $idx = cf::face::find $face 3374 my $idx = cf::face::find $face
3044 or next; 3375 or next;
3376
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3377 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3378 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3380 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3381 warn "smooth face '$info->{smooth}' not found for face '$face'";
3063 3395
3064 cf::anim::invalidate_all; # d'oh 3396 cf::anim::invalidate_all; # d'oh
3065 } 3397 }
3066 3398
3067 { 3399 {
3068 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3400 my $res = $facedata->{resource};
3071 3401
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) { 3402 while (my ($name, $info) = each %$res) {
3403 if (defined $info->{type}) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3404 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
3077 3405
3078 if ($info->{type} & 1) { 3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3079 # prepend meta info 3407 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 { 3408 } else {
3088 $data = $info->{data}; 3409 $RESOURCE{$name} = $info;
3089 } 3410 }
3090 3411
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; 3412 cf::cede_to_tick;
3095 } 3413 }
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 } 3414 }
3415
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115 3417
3116 1 3418 1
3117} 3419}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3118 3440
3119register_exticmd fx_want => sub { 3441register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_; 3442 my ($ns, $want) = @_;
3121 3443
3122 while (my ($k, $v) = each %$want) { 3444 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v); 3445 $ns->fx_want ($k, $v);
3124 } 3446 }
3125}; 3447};
3448
3449sub load_resource_file($) {
3450 my $guard = lock_acquire "load_resource_file";
3451
3452 my $status = load_resource_file_ $_[0];
3453 get_slot 0.1, 100;
3454 cf::arch::commit_load;
3455
3456 $status
3457}
3126 3458
3127sub reload_regions { 3459sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework 3460 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?) 3461 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3144} 3476}
3145 3477
3146sub reload_archetypes { 3478sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes" 3479 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n"; 3480 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} 3481}
3155 3482
3156sub reload_treasures { 3483sub reload_treasures {
3157 load_resource_file "$DATADIR/treasures" 3484 load_resource_file "$DATADIR/treasures"
3158 or die "unable to load treasurelists\n"; 3485 or die "unable to load treasurelists\n";
3159} 3486}
3160 3487
3161sub reload_resources { 3488sub reload_resources {
3162 warn "reloading resource files...\n"; 3489 warn "reloading resource files...\n";
3163 3490
3491 reload_facedata;
3492 reload_archetypes;
3164 reload_regions; 3493 reload_regions;
3165 reload_facedata;
3166 #reload_archetypes;#d#
3167 reload_archetypes;
3168 reload_treasures; 3494 reload_treasures;
3169 3495
3170 warn "finished reloading resource files\n"; 3496 warn "finished reloading resource files\n";
3171} 3497}
3172 3498
3173sub init {
3174 reload_resources;
3175}
3176
3177sub reload_config { 3499sub reload_config {
3500 warn "reloading config file...\n";
3501
3178 open my $fh, "<:utf8", "$CONFDIR/config" 3502 open my $fh, "<:utf8", "$CONFDIR/config"
3179 or return; 3503 or return;
3180 3504
3181 local $/; 3505 local $/;
3182 *CFG = YAML::Syck::Load <$fh>; 3506 *CFG = YAML::XS::Load scalar <$fh>;
3183 3507
3184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3185 3509
3186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3510 $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}; 3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3192 and die "WARNING: m(un)lockall failed: $!\n"; 3516 and die "WARNING: m(un)lockall failed: $!\n";
3193 }; 3517 };
3194 warn $@ if $@; 3518 warn $@ if $@;
3195 } 3519 }
3520
3521 warn "finished reloading resource files\n";
3522}
3523
3524sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!";
3527 flock $fh, &Fcntl::LOCK_EX
3528 or die "$PIDFILE: flock: $!";
3529 $fh
3530}
3531
3532# make sure only one server instance is running at any one time
3533sub atomic {
3534 my $fh = pidfile;
3535
3536 my $pid = <$fh>;
3537 kill 9, $pid if $pid > 0;
3538
3539 seek $fh, 0, 0;
3540 print $fh $$;
3541}
3542
3543sub main_loop {
3544 warn "EV::loop starting\n";
3545 if (1) {
3546 EV::loop;
3547 }
3548 warn "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP;
3196} 3550}
3197 3551
3198sub main { 3552sub main {
3553 cf::init_globals; # initialise logging
3554
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561
3199 # we must not ever block the main coroutine 3562 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3563 local $Coro::idle = sub {
3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3564 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3202 (async { 3565 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3566 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3567 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3568 })->prio (Coro::PRIO_MAX);
3206 }; 3569 };
3207 3570
3571 evthread_start IO::AIO::poll_fileno;
3572
3573 cf::sync_job {
3574 cf::init_experience;
3575 cf::init_anim;
3576 cf::init_attackmess;
3577 cf::init_dynamic;
3578
3579 cf::load_settings;
3580 cf::load_materials;
3581
3582 reload_resources;
3208 reload_config; 3583 reload_config;
3209 db_init; 3584 db_init;
3585
3586 cf::init_uuid;
3587 cf::init_signals;
3588 cf::init_skills;
3589
3590 cf::init_beforeplay;
3591
3592 atomic;
3593
3210 load_extensions; 3594 load_extensions;
3211 3595
3212 $TICK_WATCHER->start; 3596 utime time, time, $RUNTIMEFILE;
3213 Event::loop; 3597
3598 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601
3602 (pop @POST_INIT)->(0) while @POST_INIT;
3603 };
3604
3605 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n";
3607
3608 main_loop;
3214} 3609}
3215 3610
3216############################################################################# 3611#############################################################################
3217# initialisation and cleanup 3612# initialisation and cleanup
3218 3613
3219# install some emergency cleanup handlers 3614# install some emergency cleanup handlers
3220BEGIN { 3615BEGIN {
3616 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3617 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3618 $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"; 3619 cf::cleanup "SIG$signal";
3229 },
3230 ); 3620 };
3231 } 3621 }
3232} 3622}
3233 3623
3234sub write_runtime { 3624sub write_runtime_sync {
3235 my $runtime = "$LOCALDIR/runtime"; 3625 my $t0 = AE::time;
3236 3626
3237 # first touch the runtime file to show we are still running: 3627 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time. 3628 # the fsync below can take a very very long time.
3239 3629
3240 IO::AIO::aio_utime $runtime, undef, undef; 3630 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3241 3631
3242 my $guard = cf::lock_acquire "write_runtime"; 3632 my $guard = cf::lock_acquire "write_runtime";
3243 3633
3244 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3634 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3245 or return; 3635 or return;
3246 3636
3247 my $value = $cf::RUNTIME + 90 + 10; 3637 my $value = $cf::RUNTIME + 90 + 10;
3248 # 10 is the runtime save interval, for a monotonic clock 3638 # 10 is the runtime save interval, for a monotonic clock
3249 # 60 allows for the watchdog to kill the server. 3639 # 60 allows for the watchdog to kill the server.
3259 aio_utime $fh, undef, undef; 3649 aio_utime $fh, undef, undef;
3260 3650
3261 close $fh 3651 close $fh
3262 or return; 3652 or return;
3263 3653
3264 aio_rename "$runtime~", $runtime 3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3265 and return; 3655 and return;
3266 3656
3267 warn "runtime file written.\n"; 3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3268 3658
3269 1 3659 1
3660}
3661
3662our $uuid_lock;
3663our $uuid_skip;
3664
3665sub write_uuid_sync($) {
3666 $uuid_skip ||= $_[0];
3667
3668 return if $uuid_lock;
3669 local $uuid_lock = 1;
3670
3671 my $uuid = "$LOCALDIR/uuid";
3672
3673 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3674 or return;
3675
3676 my $value = uuid_seq uuid_cur;
3677
3678 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n";
3680 return;
3681 }
3682
3683 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0;
3685
3686 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3687 and return;
3688
3689 # always fsync - this file is important
3690 aio_fsync $fh
3691 and return;
3692
3693 close $fh
3694 or return;
3695
3696 aio_rename "$uuid~", $uuid
3697 and return;
3698
3699 warn "uuid file written ($value).\n";
3700
3701 1
3702
3703}
3704
3705sub write_uuid($$) {
3706 my ($skip, $sync) = @_;
3707
3708 $sync ? write_uuid_sync $skip
3709 : async { write_uuid_sync $skip };
3270} 3710}
3271 3711
3272sub emergency_save() { 3712sub emergency_save() {
3273 my $freeze_guard = cf::freeze_mainloop; 3713 my $freeze_guard = cf::freeze_mainloop;
3274 3714
3275 warn "enter emergency perl save\n"; 3715 warn "emergency_perl_save: enter\n";
3276 3716
3277 cf::sync_job { 3717 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722
3278 # use a peculiar iteration method to avoid tripping on perl 3723 # use a peculiar iteration method to avoid tripping on perl
3279 # refcount bugs in for. also avoids problems with players 3724 # refcount bugs in for. also avoids problems with players
3280 # and maps saved/destroyed asynchronously. 3725 # and maps saved/destroyed asynchronously.
3281 warn "begin emergency player save\n"; 3726 warn "emergency_perl_save: begin player save\n";
3282 for my $login (keys %cf::PLAYER) { 3727 for my $login (keys %cf::PLAYER) {
3283 my $pl = $cf::PLAYER{$login} or next; 3728 my $pl = $cf::PLAYER{$login} or next;
3284 $pl->valid or next; 3729 $pl->valid or next;
3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3285 $pl->save; 3731 $pl->save;
3286 } 3732 }
3287 warn "end emergency player save\n"; 3733 warn "emergency_perl_save: end player save\n";
3288 3734
3289 warn "begin emergency map save\n"; 3735 warn "emergency_perl_save: begin map save\n";
3290 for my $path (keys %cf::MAP) { 3736 for my $path (keys %cf::MAP) {
3291 my $map = $cf::MAP{$path} or next; 3737 my $map = $cf::MAP{$path} or next;
3292 $map->valid or next; 3738 $map->valid or next;
3293 $map->save; 3739 $map->save;
3294 } 3740 }
3295 warn "end emergency map save\n"; 3741 warn "emergency_perl_save: end map save\n";
3296 3742
3297 warn "begin emergency database checkpoint\n"; 3743 warn "emergency_perl_save: begin database checkpoint\n";
3298 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
3299 warn "end emergency database checkpoint\n"; 3745 warn "emergency_perl_save: end database checkpoint\n";
3746
3747 warn "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1;
3749 warn "emergency_perl_save: end write uuid\n";
3300 }; 3750 };
3301 3751
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3302 warn "leave emergency perl save\n"; 3757 warn "emergency_perl_save: leave\n";
3303} 3758}
3304 3759
3305sub post_cleanup { 3760sub post_cleanup {
3306 my ($make_core) = @_; 3761 my ($make_core) = @_;
3307 3762
3308 warn Carp::longmess "post_cleanup backtrace" 3763 warn Carp::longmess "post_cleanup backtrace"
3309 if $make_core; 3764 if $make_core;
3765
3766 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$;
3768}
3769
3770# a safer delete_package, copied from Symbol
3771sub clear_package($) {
3772 my $pkg = shift;
3773
3774 # expand to full symbol table name if needed
3775 unless ($pkg =~ /^main::.*::$/) {
3776 $pkg = "main$pkg" if $pkg =~ /^::/;
3777 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3778 $pkg .= '::' unless $pkg =~ /::$/;
3779 }
3780
3781 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3782 my $stem_symtab = *{$stem}{HASH};
3783
3784 defined $stem_symtab and exists $stem_symtab->{$leaf}
3785 or return;
3786
3787 # clear all symbols
3788 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3789 for my $name (keys %$leaf_symtab) {
3790 _gv_clear *{"$pkg$name"};
3791# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3792 }
3310} 3793}
3311 3794
3312sub do_reload_perl() { 3795sub do_reload_perl() {
3313 # can/must only be called in main 3796 # can/must only be called in main
3314 if ($Coro::current != $Coro::main) { 3797 if ($Coro::current != $Coro::main) {
3315 warn "can only reload from main coroutine"; 3798 warn "can only reload from main coroutine";
3316 return; 3799 return;
3317 } 3800 }
3318 3801
3802 return if $RELOAD++;
3803
3804 my $t1 = AE::time;
3805
3806 while ($RELOAD) {
3319 warn "reloading..."; 3807 warn "reloading...";
3320 3808
3321 warn "entering sync_job"; 3809 warn "entering sync_job";
3322 3810
3323 cf::sync_job { 3811 cf::sync_job {
3324 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3325 cf::emergency_save; 3813 cf::emergency_save;
3326 cf::write_runtime; # external watchdog should not bark 3814 cf::write_runtime_sync; # external watchdog should not bark
3327 3815
3328 warn "syncing database to disk"; 3816 warn "syncing database to disk";
3329 BDB::db_env_txn_checkpoint $DB_ENV; 3817 BDB::db_env_txn_checkpoint $DB_ENV;
3330 3818
3331 # if anything goes wrong in here, we should simply crash as we already saved 3819 # if anything goes wrong in here, we should simply crash as we already saved
3332 3820
3333 warn "cancelling all WF_AUTOCANCEL watchers";
3334 for (Event::all_watchers) {
3335 $_->cancel if $_->data & WF_AUTOCANCEL;
3336 }
3337
3338 warn "flushing outstanding aio requests"; 3821 warn "flushing outstanding aio requests";
3339 for (;;) {
3340 BDB::flush;
3341 IO::AIO::flush;
3342 Coro::cede;
3343 last unless IO::AIO::nreqs || BDB::nreqs; 3822 while (IO::AIO::nreqs || BDB::nreqs) {
3344 warn "iterate..."; 3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3345 }
3346
3347 ++$RELOAD;
3348
3349 warn "cancelling all extension coros";
3350 $_->cancel for values %EXT_CORO;
3351 %EXT_CORO = ();
3352
3353 warn "removing commands";
3354 %COMMAND = ();
3355
3356 warn "removing ext/exti commands";
3357 %EXTCMD = ();
3358 %EXTICMD = ();
3359
3360 warn "unloading/nuking all extensions";
3361 for my $pkg (@EXTS) {
3362 warn "... unloading $pkg";
3363
3364 if (my $cb = $pkg->can ("unload")) {
3365 eval {
3366 $cb->($pkg);
3367 1
3368 } or warn "$pkg unloaded, but with errors: $@";
3369 } 3824 }
3370 3825
3371 warn "... nuking $pkg"; 3826 warn "cancelling all extension coros";
3372 Symbol::delete_package $pkg; 3827 $_->cancel for values %EXT_CORO;
3373 } 3828 %EXT_CORO = ();
3374 3829
3375 warn "unloading all perl modules loaded from $LIBDIR"; 3830 warn "removing commands";
3376 while (my ($k, $v) = each %INC) { 3831 %COMMAND = ();
3377 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3378 3832
3833 warn "removing ext/exti commands";
3834 %EXTCMD = ();
3835 %EXTICMD = ();
3836
3837 warn "unloading/nuking all extensions";
3838 for my $pkg (@EXTS) {
3379 warn "... unloading $k"; 3839 warn "... unloading $pkg";
3380 delete $INC{$k};
3381 3840
3382 $k =~ s/\.pm$//;
3383 $k =~ s/\//::/g;
3384
3385 if (my $cb = $k->can ("unload_module")) { 3841 if (my $cb = $pkg->can ("unload")) {
3842 eval {
3386 $cb->(); 3843 $cb->($pkg);
3844 1
3845 } or warn "$pkg unloaded, but with errors: $@";
3846 }
3847
3848 warn "... clearing $pkg";
3849 clear_package $pkg;
3387 } 3850 }
3388 3851
3389 Symbol::delete_package $k; 3852 warn "unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855
3856 warn "... unloading $k";
3857 delete $INC{$k};
3858
3859 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g;
3861
3862 if (my $cb = $k->can ("unload_module")) {
3863 $cb->();
3864 }
3865
3866 clear_package $k;
3390 } 3867 }
3391 3868
3392 warn "getting rid of safe::, as good as possible"; 3869 warn "getting rid of safe::, as good as possible";
3393 Symbol::delete_package "safe::$_" 3870 clear_package "safe::$_"
3394 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3395 3872
3396 warn "unloading cf.pm \"a bit\""; 3873 warn "unloading cf.pm \"a bit\"";
3397 delete $INC{"cf.pm"}; 3874 delete $INC{"cf.pm"};
3398 delete $INC{"cf/pod.pm"}; 3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3399 3876
3400 # don't, removes xs symbols, too, 3877 # don't, removes xs symbols, too,
3401 # and global variables created in xs 3878 # and global variables created in xs
3402 #Symbol::delete_package __PACKAGE__; 3879 #clear_package __PACKAGE__;
3403 3880
3404 warn "unload completed, starting to reload now"; 3881 warn "unload completed, starting to reload now";
3405 3882
3406 warn "reloading cf.pm"; 3883 warn "reloading cf.pm";
3407 require cf; 3884 require cf;
3408 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3885 cf::_connect_to_perl_1;
3409 3886
3410 warn "loading config and database again"; 3887 warn "loading config and database again";
3411 cf::reload_config; 3888 cf::reload_config;
3412 3889
3413 warn "loading extensions"; 3890 warn "loading extensions";
3414 cf::load_extensions; 3891 cf::load_extensions;
3415 3892
3893 if ($REATTACH_ON_RELOAD) {
3416 warn "reattaching attachments to objects/players"; 3894 warn "reattaching attachments to objects/players";
3417 _global_reattach; # objects, sockets 3895 _global_reattach; # objects, sockets
3418 warn "reattaching attachments to maps"; 3896 warn "reattaching attachments to maps";
3419 reattach $_ for values %MAP; 3897 reattach $_ for values %MAP;
3420 warn "reattaching attachments to players"; 3898 warn "reattaching attachments to players";
3421 reattach $_ for values %PLAYER; 3899 reattach $_ for values %PLAYER;
3900 }
3422 3901
3902 warn "running post_init jobs";
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904
3423 warn "leaving sync_job"; 3905 warn "leaving sync_job";
3424 3906
3425 1 3907 1
3426 } or do { 3908 } or do {
3427 warn $@; 3909 warn $@;
3428 warn "error while reloading, exiting."; 3910 cf::cleanup "error while reloading, exiting.";
3429 exit 1;
3430 }; 3911 };
3431 3912
3432 warn "reloaded"; 3913 warn "reloaded";
3914 --$RELOAD;
3915 }
3916
3917 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n";
3433}; 3919};
3434 3920
3435our $RELOAD_WATCHER; # used only during reload 3921our $RELOAD_WATCHER; # used only during reload
3436 3922
3437sub reload_perl() { 3923sub reload_perl() {
3438 # doing reload synchronously and two reloads happen back-to-back, 3924 # doing reload synchronously and two reloads happen back-to-back,
3439 # coro crashes during coro_state_free->destroy here. 3925 # coro crashes during coro_state_free->destroy here.
3440 3926
3441 $RELOAD_WATCHER ||= Event->timer ( 3927 $RELOAD_WATCHER ||= cf::async {
3442 reentrant => 0, 3928 Coro::AIO::aio_wait cache_extensions;
3443 after => 0, 3929
3444 data => WF_AUTOCANCEL, 3930 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3445 cb => sub {
3446 do_reload_perl; 3931 do_reload_perl;
3447 undef $RELOAD_WATCHER; 3932 undef $RELOAD_WATCHER;
3448 }, 3933 };
3449 ); 3934 };
3450} 3935}
3451 3936
3452register_command "reload" => sub { 3937register_command "reload" => sub {
3453 my ($who, $arg) = @_; 3938 my ($who, $arg) = @_;
3454 3939
3467 3952
3468our @WAIT_FOR_TICK; 3953our @WAIT_FOR_TICK;
3469our @WAIT_FOR_TICK_BEGIN; 3954our @WAIT_FOR_TICK_BEGIN;
3470 3955
3471sub wait_for_tick { 3956sub wait_for_tick {
3472 return unless $TICK_WATCHER->is_active;
3473 return if $Coro::current == $Coro::main; 3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3474 3958
3475 my $signal = new Coro::Signal; 3959 my $signal = new Coro::Signal;
3476 push @WAIT_FOR_TICK, $signal; 3960 push @WAIT_FOR_TICK, $signal;
3477 $signal->wait; 3961 $signal->wait;
3478} 3962}
3479 3963
3480sub wait_for_tick_begin { 3964sub wait_for_tick_begin {
3481 return unless $TICK_WATCHER->is_active;
3482 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3483 3966
3484 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3485 push @WAIT_FOR_TICK_BEGIN, $signal; 3968 push @WAIT_FOR_TICK_BEGIN, $signal;
3486 $signal->wait; 3969 $signal->wait;
3487} 3970}
3488 3971
3489$TICK_WATCHER = Event->timer ( 3972sub tick {
3490 reentrant => 0,
3491 parked => 1,
3492 prio => 0,
3493 at => $NEXT_TICK || $TICK,
3494 data => WF_AUTOCANCEL,
3495 cb => sub {
3496 if ($Coro::current != $Coro::main) { 3973 if ($Coro::current != $Coro::main) {
3497 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3974 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3498 unless ++$bug_warning > 10; 3975 unless ++$bug_warning > 10;
3499 return; 3976 return;
3500 } 3977 }
3501 3978
3502 $NOW = $tick_start = Event::time;
3503
3504 cf::server_tick; # one server iteration 3979 cf::server_tick; # one server iteration
3505 3980
3506 $RUNTIME += $TICK; 3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3507 $NEXT_TICK += $TICK;
3508 3982
3509 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3983 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3510 $NEXT_RUNTIME_WRITE = $NOW + 10; 3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3511 Coro::async_pool { 3985 Coro::async_pool {
3512 $Coro::current->{desc} = "runtime saver"; 3986 $Coro::current->{desc} = "runtime saver";
3513 write_runtime 3987 write_runtime_sync
3514 or warn "ERROR: unable to write runtime file: $!"; 3988 or warn "ERROR: unable to write runtime file: $!";
3515 };
3516 } 3989 };
3990 }
3517 3991
3518 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3519 $sig->send; 3993 $sig->send;
3520 } 3994 }
3521 while (my $sig = shift @WAIT_FOR_TICK) { 3995 while (my $sig = shift @WAIT_FOR_TICK) {
3522 $sig->send; 3996 $sig->send;
3523 } 3997 }
3524 3998
3525 $NOW = Event::time; 3999 $LOAD = ($NOW - $TICK_START) / $TICK;
3526
3527 # if we are delayed by four ticks or more, skip them all
3528 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3529
3530 $TICK_WATCHER->at ($NEXT_TICK);
3531 $TICK_WATCHER->start;
3532
3533 $LOAD = ($NOW - $tick_start) / $TICK;
3534 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4000 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3535 4001
3536 _post_tick; 4002 if (0) {
4003 if ($NEXT_TICK) {
4004 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d#
4007 }
3537 }, 4008 }
3538); 4009}
3539 4010
3540{ 4011{
4012 # configure BDB
4013
3541 BDB::min_parallel 8; 4014 BDB::min_parallel 16;
3542 BDB::max_poll_time $TICK * 0.1; 4015 BDB::max_poll_reqs $TICK * 0.1;
3543 $BDB_POLL_WATCHER = Event->io ( 4016 $AnyEvent::BDB::WATCHER->priority (1);
3544 reentrant => 0,
3545 fd => BDB::poll_fileno,
3546 poll => 'r',
3547 prio => 0,
3548 data => WF_AUTOCANCEL,
3549 cb => \&BDB::poll_cb,
3550 );
3551
3552 BDB::set_sync_prepare {
3553 my $status;
3554 my $current = $Coro::current;
3555 (
3556 sub {
3557 $status = $!;
3558 $current->ready; undef $current;
3559 },
3560 sub {
3561 Coro::schedule while defined $current;
3562 $! = $status;
3563 },
3564 )
3565 };
3566 4017
3567 unless ($DB_ENV) { 4018 unless ($DB_ENV) {
3568 $DB_ENV = BDB::db_env_create; 4019 $DB_ENV = BDB::db_env_create;
3569 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4020 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3570 | BDB::LOG_AUTOREMOVE, 1); 4021 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4022 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3571 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4023 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3572 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4024 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3573 4025
3574 cf::sync_job { 4026 cf::sync_job {
3575 eval { 4027 eval {
3585 4037
3586 cf::cleanup "db_env_open(db): $@" if $@; 4038 cf::cleanup "db_env_open(db): $@" if $@;
3587 }; 4039 };
3588 } 4040 }
3589 4041
3590 $BDB_DEADLOCK_WATCHER = Event->timer ( 4042 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3591 after => 3,
3592 interval => 1,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4043 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3598 },
3599 ); 4044 };
3600 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4045 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3601 after => 11,
3602 interval => 60,
3603 hard => 1,
3604 prio => 0,
3605 data => WF_AUTOCANCEL,
3606 cb => sub {
3607 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4046 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3608 },
3609 ); 4047 };
3610 $BDB_TRICKLE_WATCHER = Event->timer ( 4048 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3611 after => 5,
3612 interval => 10,
3613 hard => 1,
3614 prio => 0,
3615 data => WF_AUTOCANCEL,
3616 cb => sub {
3617 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4049 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3618 },
3619 ); 4050 };
3620} 4051}
3621 4052
3622{ 4053{
4054 # configure IO::AIO
4055
3623 IO::AIO::min_parallel 8; 4056 IO::AIO::min_parallel 8;
3624
3625 undef $Coro::AIO::WATCHER;
3626 IO::AIO::max_poll_time $TICK * 0.1; 4057 IO::AIO::max_poll_time $TICK * 0.1;
3627 $AIO_POLL_WATCHER = Event->io ( 4058 undef $AnyEvent::AIO::WATCHER;
3628 reentrant => 0,
3629 data => WF_AUTOCANCEL,
3630 fd => IO::AIO::poll_fileno,
3631 poll => 'r',
3632 prio => 0,
3633 cb => \&IO::AIO::poll_cb,
3634 );
3635} 4059}
3636 4060
3637my $_log_backtrace; 4061my $_log_backtrace;
3638 4062
3639sub _log_backtrace { 4063sub _log_backtrace {
3642 $msg =~ s/\n//; 4066 $msg =~ s/\n//;
3643 4067
3644 # limit the # of concurrent backtraces 4068 # limit the # of concurrent backtraces
3645 if ($_log_backtrace < 2) { 4069 if ($_log_backtrace < 2) {
3646 ++$_log_backtrace; 4070 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg;
3647 async { 4072 async {
3648 $Coro::current->{desc} = "abt $msg"; 4073 $Coro::current->{desc} = "abt $msg";
3649 4074
3650 my @bt = fork_call { 4075 my @bt = fork_call {
3651 @addr = map { sprintf "%x", $_ } @addr; 4076 @addr = map { sprintf "%x", $_ } @addr;
3662 } 4087 }
3663 4088
3664 @funcs 4089 @funcs
3665 }; 4090 };
3666 4091
3667 LOG llevInfo, "[ABT] $msg\n"; 4092 LOG llevInfo, "[ABT] $perl_bt\n";
4093 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3668 LOG llevInfo, "[ABT] $_\n" for @bt; 4094 LOG llevInfo, "[ABT] $_\n" for @bt;
3669 --$_log_backtrace; 4095 --$_log_backtrace;
3670 }; 4096 };
3671 } else { 4097 } else {
3672 LOG llevInfo, "[ABT] $msg\n"; 4098 LOG llevInfo, "[ABT] $msg\n";
3673 LOG llevInfo, "[ABT] [suppressed]\n"; 4099 LOG llevInfo, "[ABT] [suppressed]\n";
3674 } 4100 }
3675} 4101}
3676 4102
3677# load additional modules 4103# load additional modules
3678use cf::pod; 4104require "cf/$_.pm" for @EXTRA_MODULES;
4105cf::_connect_to_perl_2;
3679 4106
3680END { cf::emergency_save } 4107END { cf::emergency_save }
3681 4108
36821 41091
3683 4110

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines