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.385 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.517 by root, Thu Apr 15 06:07:51 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 Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 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, 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 return 1;#d# 1129 ++$SLOW_MERGES;#d#
977 1130
978 #todo#d# kill yourself and do some recursive checking manually without storable 1131 # we do the slow way here
979 sync_job { 1132 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1133}
987 1134
988sub reattach { 1135sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1137 my ($obj) = @_;
991 1138
1139 # no longer needed after getting rid of delete_package?
992 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
993 1141
994 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
995 1143
996 @$registry = (); 1144 @$registry = ();
997 1145
1012cf::attachable->attach ( 1160cf::attachable->attach (
1013 prio => -1000000, 1161 prio => -1000000,
1014 on_instantiate => sub { 1162 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1163 my ($obj, $data) = @_;
1016 1164
1017 $data = from_json $data; 1165 $data = decode_json $data;
1018 1166
1019 for (@$data) { 1167 for (@$data) {
1020 my ($name, $args) = @$_; 1168 my ($name, $args) = @$_;
1021 1169
1022 $obj->attach ($name, %{$args || {} }); 1170 $obj->attach ($name, %{$args || {} });
1043 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1044 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1045 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1046 1194
1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1050 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 }
1051 close $fh; 1202 aio_close $fh;
1052 1203
1053 if (@$objs) { 1204 if (@$objs) {
1054 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) {
1055 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1058 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 }
1059 close $fh; 1213 aio_close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1215 }
1062 } else { 1216 } else {
1063 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1064 } 1218 }
1065 1219
1066 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1067 } else { 1224 } else {
1068 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1069 } 1226 }
1070 } else { 1227 } else {
1071 aio_unlink $filename; 1228 aio_unlink $filename;
1072 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1073 } 1230 }
1092 1249
1093 unless (aio_stat "$filename.pst") { 1250 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1251 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1252 or return;
1096 1253
1097 my $st = eval { Coro::Storable::thaw $av } 1254 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1255 $av = $st->{objs};
1100 } 1256 }
1101 1257
1102 utf8::decode (my $decname = $filename); 1258 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1259 warn sprintf "loading %s (%d,%d)\n",
1165 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1166 1322
1167 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1168} 1324}
1169 1325
1326use File::Glob ();
1327
1170cf::player->attach ( 1328cf::player->attach (
1171 on_command => sub { 1329 on_unknown_command => sub {
1172 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1173 1331
1174 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1175 or return; 1333 or return;
1176 1334
1206 1364
1207 cf::override; 1365 cf::override;
1208 }, 1366 },
1209); 1367);
1210 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
1211sub load_extensions { 1382sub load_extensions {
1212 cf::sync_job { 1383 cf::sync_job {
1213 my %todo; 1384 my %todo;
1214 1385
1215 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1234 1405
1235 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1236 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1237 1408
1238 $ext{source} = 1409 $ext{source} =
1239 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1240 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1241 . $source 1412 . $source
1242 . "\n};\n1"; 1413 . "\n};\n1";
1243 1414
1244 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1245 } 1416 }
1246 1417
1418 my $pass = 0;
1247 my %done; 1419 my %done;
1248 while (%todo) { 1420 while (%todo) {
1249 my $progress; 1421 my $progress;
1250 1422
1423 ++$pass;
1424
1425 ext:
1251 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1252 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1253 goto skip 1428 next ext
1254 unless exists $done{$_}; 1429 unless exists $done{$_};
1255 } 1430 }
1256 1431
1257 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1258 1433
1259 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1260 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1261 : "$v->{base}: extension inactive.\n";
1262 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1263 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1264 warn $msg; 1441 } else {
1265 warn "mandatory extension failed to load, exiting.\n"; 1442 $done{$k} = delete $todo{$k};
1266 exit 1; 1443 push @EXTS, $v->{pkg};
1267 } 1444 $progress = 1;
1268 1445
1269 warn $msg; 1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1270 } 1448 }
1271
1272 $done{$k} = delete $todo{$k};
1273 push @EXTS, $v->{pkg};
1274 $progress = 1;
1275 } 1449 }
1276 1450
1277 skip: 1451 unless ($progress) {
1278 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1279 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1280 } 1459 }
1281 }; 1460 };
1282} 1461}
1283 1462
1284############################################################################# 1463#############################################################################
1285 1464
1286=back 1465=back
1287 1466
1288=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1289 1468
1290Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1291 1470
1292=cut 1471=cut
1293 1472
1294package cf::player; 1473package cf::player;
1295 1474
1338 1517
1339sub exists($) { 1518sub exists($) {
1340 my ($login) = @_; 1519 my ($login) = @_;
1341 1520
1342 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1343 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1344} 1523}
1345 1524
1346sub find($) { 1525sub find($) {
1347 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1348 my $login = $_[0]; 1527 my $login = $_[0];
1360 my $f = new_from_file cf::object::thawer path $login 1539 my $f = new_from_file cf::object::thawer path $login
1361 or return; 1540 or return;
1362 1541
1363 my $pl = cf::player::load_pl $f 1542 my $pl = cf::player::load_pl $f
1364 or return; 1543 or return;
1544
1365 local $cf::PLAYER_LOADING{$login} = $pl; 1545 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs; 1546 $f->resolve_delayed_derefs;
1367 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1368 } 1548 }
1369 } 1549 }
1370} 1550}
1371 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1372sub save($) { 1565sub save($) {
1373 my ($pl) = @_; 1566 my ($pl) = @_;
1374 1567
1375 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1376 1569
1379 1572
1380 return if $pl->{deny_save}; 1573 return if $pl->{deny_save};
1381 1574
1382 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1383 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1577
1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1384 1582
1385 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1386 cf::cede_to_tick; 1584 cf::cede_to_tick;
1387} 1585}
1388 1586
1420 my ($pl) = @_; 1618 my ($pl) = @_;
1421 1619
1422 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1423 1621
1424 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1425 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1426 1624
1427 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1428 $pl->deactivate; 1626 $pl->deactivate;
1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628 $pl->ob->check_score;
1429 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1629 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1430 $pl->ns->destroy if $pl->ns; 1630 $pl->ns->destroy if $pl->ns;
1431 1631
1432 my $path = playerdir $pl; 1632 my $path = playerdir $pl;
1433 my $temp = "$path~$cf::RUNTIME~deleting~"; 1633 my $temp = "$path~$cf::RUNTIME~deleting~";
1472 1672
1473 for my $login (@$dirs) { 1673 for my $login (@$dirs) {
1474 my $path = path $login; 1674 my $path = path $login;
1475 1675
1476 # a .pst is a dead give-away for a valid player 1676 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") { 1677 # if no pst file found, open and chekc for blocked users
1678 if (aio_stat "$path.pst") {
1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1679 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1479 aio_read $fh, 0, 512, my $buf, 0 or next; 1680 aio_read $fh, 0, 512, my $buf, 0 or next;
1480 $buf !~ /^password -------------$/m or next; # official not-valid tag 1681 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 } 1682 }
1482 1683
1513 } 1714 }
1514 1715
1515 \@paths 1716 \@paths
1516} 1717}
1517 1718
1518=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1519 1720
1520Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1521
1522=cut
1523
1524sub expand_cfpod {
1525 ((my $self), (local $_)) = @_;
1526
1527 # escape & and <
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530
1531 # this is buggy, it needs to properly take care of nested <'s
1532
1533 1 while
1534 # replace B<>, I<>, U<> etc.
1535 s/B<([^\>]*)>/<b>$1<\/b>/
1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1539 # replace G<male|female> tags
1540 || s{G<([^>|]*)\|([^>]*)>}{
1541 $self->gender ? $2 : $1
1542 }ge
1543 # replace H<hint text>
1544 || s{H<([^\>]*)>}
1545 {
1546 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "")
1549 [$self->{hintmode}]
1550 }ge;
1551
1552 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g;
1554
1555 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines
1560
1561 $_
1562}
1563
1564sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode}
1567}
1568 1722
1569=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1570 1724
1571Sends an ext reply to the player. 1725Sends an ext reply to the player.
1572 1726
1639our $MAX_RESET = 3600; 1793our $MAX_RESET = 3600;
1640our $DEFAULT_RESET = 3000; 1794our $DEFAULT_RESET = 3000;
1641 1795
1642sub generate_random_map { 1796sub generate_random_map {
1643 my ($self, $rmp) = @_; 1797 my ($self, $rmp) = @_;
1798
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800
1644 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1645 $self->_create_random_map ( 1802 $self->_create_random_map (
1646 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1647 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1648 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1649 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1650 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1651 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1652 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1770 1927
1771# the temporary/swap location 1928# the temporary/swap location
1772sub save_path { 1929sub save_path {
1773 my ($self) = @_; 1930 my ($self) = @_;
1774 1931
1775 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1776 "$TMPDIR/$path.map" 1933 "$TMPDIR/$path.map"
1777} 1934}
1778 1935
1779# the unique path, undef == no special unique path 1936# the unique path, undef == no special unique path
1780sub uniq_path { 1937sub uniq_path {
1781 my ($self) = @_; 1938 my ($self) = @_;
1782 1939
1783 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1784 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1785}
1786
1787# and all this just because we cannot iterate over
1788# all maps in C++...
1789sub change_all_map_light {
1790 my ($change) = @_;
1791
1792 $_->change_map_light ($change)
1793 for grep $_->outdoor, values %cf::MAP;
1794} 1942}
1795 1943
1796sub decay_objects { 1944sub decay_objects {
1797 my ($self) = @_; 1945 my ($self) = @_;
1798 1946
1882sub find { 2030sub find {
1883 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1884 2032
1885 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1886 2034
1887 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1888 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1889 2037
1890 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1894 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1895 or return; 2040 or return;
1896 2041
1897 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1898 2043
1900 or return; 2045 or return;
1901 2046
1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1903 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1904 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
1905 undef $guard1; 2051 undef $guard1;
1906 undef $guard2;
1907 $map->reset; 2052 $map->reset;
1908 return find $path; 2053 return find $path;
1909 } 2054 }
1910 2055
1911 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1912 } 2057 }
1913} 2058}
1914 2059
1915sub pre_load { } 2060sub pre_load { }
1916sub post_load { } 2061#sub post_load { } # XS
1917 2062
1918sub load { 2063sub load {
1919 my ($self) = @_; 2064 my ($self) = @_;
1920 2065
1921 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1938 my $f = new_from_file cf::object::thawer $self->{load_path}; 2083 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block; 2084 $f->skip_block;
1940 $self->_load_objects ($f) 2085 $self->_load_objects ($f)
1941 or return; 2086 or return;
1942 2087
1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->post_load_original
1944 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1945 2090
1946 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1947 utf8::encode $uniq; 2092 utf8::encode $uniq;
1948 unless (aio_stat $uniq) { 2093 unless (aio_stat $uniq) {
1966 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1967 $self->decay_objects; 2112 $self->decay_objects;
1968 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1969 $self->update_buttons; 2114 $self->update_buttons;
1970 cf::cede_to_tick; 2115 cf::cede_to_tick;
1971 $self->set_darkness_map;
1972 cf::cede_to_tick;
1973 $self->activate; 2116 $self->activate;
1974 } 2117 }
1975 2118
1976 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1977 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1978 2121
1979 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1980 } 2123 }
1981 2124
1982 $self->post_load; 2125 $self->post_load;
1983} 2126}
1984 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
1985sub customise_for { 2131sub customise_for {
1986 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
1987 2133
1988 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
1989 if $self->per_player; 2135 if $self->per_player;
2042 my ($path, $origin, $load) = @_; 2188 my ($path, $origin, $load) = @_;
2043 2189
2044 $path = normalise $path, $origin && $origin->{path}; 2190 $path = normalise $path, $origin && $origin->{path};
2045 2191
2046 if (my $map = $cf::MAP{$path}) { 2192 if (my $map = $cf::MAP{$path}) {
2047 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2193 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2048 } 2194 }
2049 2195
2050 $MAP_PREFETCH{$path} |= $load; 2196 $MAP_PREFETCH{$path} |= $load;
2051 2197
2052 $MAP_PREFETCHER ||= cf::async { 2198 $MAP_PREFETCHER ||= cf::async {
2089 cf::async { 2235 cf::async {
2090 $Coro::current->{desc} = "map player save"; 2236 $Coro::current->{desc} = "map player save";
2091 $_->contr->save for $self->players; 2237 $_->contr->save for $self->players;
2092 }; 2238 };
2093 2239
2240 cf::get_slot 0.02;
2241
2094 if ($uniq) { 2242 if ($uniq) {
2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2096 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2244 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2097 } else { 2245 } else {
2098 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2106 $self->save; 2254 $self->save;
2107 2255
2108 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2109 2257
2110 return if $self->players; 2258 return if $self->players;
2111 return if $self->in_memory != cf::MAP_IN_MEMORY; 2259 return if $self->in_memory != cf::MAP_ACTIVE;
2112 return if $self->{deny_save}; 2260 return if $self->{deny_save};
2113 2261
2114 $self->in_memory (cf::MAP_SWAPPED); 2262 $self->in_memory (cf::MAP_SWAPPED);
2115 2263
2116 $self->deactivate; 2264 $self->deactivate;
2141 2289
2142 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2291
2144 return if $self->players; 2292 return if $self->players;
2145 2293
2146 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2147 2295
2148 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2149 2297
2150 # need to save uniques path 2298 # need to save uniques path
2151 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
2234 2382
2235sub unique_maps() { 2383sub unique_maps() {
2236 [ 2384 [
2237 map { 2385 map {
2238 utf8::decode $_; 2386 utf8::decode $_;
2239 /\.map$/ 2387 s/\.map$//; # TODO future compatibility hack
2388 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2389 ? ()
2240 ? normalise $_ 2390 : normalise $_
2241 : ()
2242 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2243 ] 2392 ]
2244} 2393}
2245 2394
2246package cf; 2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2247 2426
2248=back 2427=back
2249 2428
2250=head3 cf::object 2429=head3 cf::object
2251 2430
2255 2434
2256=over 4 2435=over 4
2257 2436
2258=item $ob->inv_recursive 2437=item $ob->inv_recursive
2259 2438
2260Returns the inventory of the object _and_ their inventories, recursively. 2439Returns the inventory of the object I<and> their inventories, recursively,
2440but I<not> the object itself.
2261 2441
2262=cut 2442=cut
2263 2443
2264sub inv_recursive_; 2444sub inv_recursive_;
2265sub inv_recursive_ { 2445sub inv_recursive_ {
2270 inv_recursive_ inv $_[0] 2450 inv_recursive_ inv $_[0]
2271} 2451}
2272 2452
2273=item $ref = $ob->ref 2453=item $ref = $ob->ref
2274 2454
2275creates and returns a persistent reference to an objetc that can be stored as a string. 2455Creates and returns a persistent reference to an object that can be stored as a string.
2276 2456
2277=item $ob = cf::object::deref ($refstring) 2457=item $ob = cf::object::deref ($refstring)
2278 2458
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2459returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block. 2460even if the object actually exists. May block.
2312can be C<undef>. Does the right thing when the player is currently in a 2492can be C<undef>. Does the right thing when the player is currently in a
2313dialogue with the given NPC character. 2493dialogue with the given NPC character.
2314 2494
2315=cut 2495=cut
2316 2496
2497our $SAY_CHANNEL = {
2498 id => "say",
2499 title => "Map",
2500 reply => "say ",
2501 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2502};
2503
2504our $CHAT_CHANNEL = {
2505 id => "chat",
2506 title => "Chat",
2507 reply => "chat ",
2508 tooltip => "Player chat and shouts, global to the server.",
2509};
2510
2317# rough implementation of a future "reply" method that works 2511# rough implementation of a future "reply" method that works
2318# with dialog boxes. 2512# with dialog boxes.
2319#TODO: the first argument must go, split into a $npc->reply_to ( method 2513#TODO: the first argument must go, split into a $npc->reply_to ( method
2320sub cf::object::player::reply($$$;$) { 2514sub cf::object::player::reply($$$;$) {
2321 my ($self, $npc, $msg, $flags) = @_; 2515 my ($self, $npc, $msg, $flags) = @_;
2332 my $dialog = $pl->{npc_dialog}; 2526 my $dialog = $pl->{npc_dialog};
2333 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2527 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2334 2528
2335 } else { 2529 } else {
2336 $msg = $npc->name . " says: $msg" if $npc; 2530 $msg = $npc->name . " says: $msg" if $npc;
2337 $self->message ($msg, $flags); 2531 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2338 } 2532 }
2339 } 2533 }
2340} 2534}
2341 2535
2342=item $object->send_msg ($channel, $msg, $color, [extra...]) 2536=item $object->send_msg ($channel, $msg, $color, [extra...])
2367 2561
2368=item $player_object->enter_link 2562=item $player_object->enter_link
2369 2563
2370Freezes the player and moves him/her to a special map (C<{link}>). 2564Freezes the player and moves him/her to a special map (C<{link}>).
2371 2565
2372The player should be reasonably safe there for short amounts of time. You 2566The player should be reasonably safe there for short amounts of time (e.g.
2373I<MUST> call C<leave_link> as soon as possible, though. 2567for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link
2569map.
2374 2570
2375Will never block. 2571Will never block.
2376 2572
2377=item $player_object->leave_link ($map, $x, $y) 2573=item $player_object->leave_link ($map, $x, $y)
2378 2574
2430 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2431 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2432 2628
2433 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2434 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2435 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2436 2632
2437 $map->load; 2633 $map->load;
2438 $map->load_neighbours; 2634 $map->load_neighbours;
2439 2635
2440 return unless $self->contr->active; 2636 return unless $self->contr->active;
2441 $self->activate_recursive;
2442 2637
2443 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2444 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2445} 2643}
2446 2644
2447=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2448 2646
2449Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
2450her, loading and preparing them map, calling the provided $check callback 2648her, loading and preparing them map, calling the provided $check callback
2451that has to return the map if sucecssful, and then unfreezes the player on 2649that has to return the map if sucecssful, and then unfreezes the player on
2452the new (success) or old (failed) map position. In either case, $done will 2650the new (success) or old (failed) map position. In either case, $done will
2453be called at the end of this process. 2651be called at the end of this process.
2652
2653Note that $check will be called with a potentially non-loaded map, so if
2654it needs a loaded map it has to call C<< ->load >>.
2454 2655
2455=cut 2656=cut
2456 2657
2457our $GOTOGEN; 2658our $GOTOGEN;
2458 2659
2537} 2738}
2538 2739
2539sub prepare_random_map { 2740sub prepare_random_map {
2540 my ($exit) = @_; 2741 my ($exit) = @_;
2541 2742
2542 my $guard = cf::lock_acquire "exit_prepare:$exit";
2543
2544 # all this does is basically replace the /! path by 2743 # all this does is basically replace the /! path by
2545 # a new random map path (?random/...) with a seed 2744 # a new random map path (?random/...) with a seed
2546 # that depends on the exit object 2745 # that depends on the exit object
2547 2746
2548 my $rmp = parse_random_map_params $exit->msg; 2747 my $rmp = parse_random_map_params $exit->msg;
2550 if ($exit->map) { 2749 if ($exit->map) {
2551 $rmp->{region} = $exit->region->name; 2750 $rmp->{region} = $exit->region->name;
2552 $rmp->{origin_map} = $exit->map->path; 2751 $rmp->{origin_map} = $exit->map->path;
2553 $rmp->{origin_x} = $exit->x; 2752 $rmp->{origin_x} = $exit->x;
2554 $rmp->{origin_y} = $exit->y; 2753 $rmp->{origin_y} = $exit->y;
2754
2755 $exit->map->touch;
2555 } 2756 }
2556 2757
2557 $rmp->{random_seed} ||= $exit->random_seed; 2758 $rmp->{random_seed} ||= $exit->random_seed;
2558 2759
2559 my $data = cf::to_json $rmp; 2760 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2560 my $md5 = Digest::MD5::md5_hex $data; 2761 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2762 my $meta = "$RANDOMDIR/$md5.meta";
2562 2763
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2764 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2765 aio_write $fh, 0, (length $data), $data, 0;
2565 undef $fh; 2766 undef $fh;
2566 aio_rename "$meta~", $meta; 2767 aio_rename "$meta~", $meta;
2567 2768
2769 my $slaying = "?random/$md5";
2770
2771 if ($exit->valid) {
2568 $exit->slaying ("?random/$md5"); 2772 $exit->slaying ("?random/$md5");
2569 $exit->msg (undef); 2773 $exit->msg (undef);
2774 }
2570 } 2775 }
2571} 2776}
2572 2777
2573sub cf::object::player::enter_exit { 2778sub cf::object::player::enter_exit {
2574 my ($self, $exit) = @_; 2779 my ($self, $exit) = @_;
2575 2780
2576 return unless $self->type == cf::PLAYER; 2781 return unless $self->type == cf::PLAYER;
2577 2782
2578 if ($exit->slaying eq "/!") {
2579 #TODO: this should de-fi-ni-te-ly not be a sync-job
2580 # the problem is that $exit might not survive long enough
2581 # so it needs to be done right now, right here
2582 cf::sync_job { prepare_random_map $exit };
2583 }
2584
2585 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2586 my $hp = $exit->stats->hp;
2587 my $sp = $exit->stats->sp;
2588
2589 $self->enter_link; 2783 $self->enter_link;
2590 2784
2591 # if exit is damned, update players death & WoR home-position
2592 $self->contr->savebed ($slaying, $hp, $sp)
2593 if $exit->flag (FLAG_DAMNED);
2594
2595 (async { 2785 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2786 $Coro::current->{desc} = "enter_exit";
2597 2787
2598 $self->deactivate_recursive; # just to be sure
2599 unless (eval { 2788 unless (eval {
2789 $self->deactivate_recursive; # just to be sure
2790
2791 # random map handling
2792 {
2793 my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795 prepare_random_map $exit
2796 if $exit->slaying eq "/!";
2797 }
2798
2799 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2800 my $x = $exit->stats->hp;
2801 my $y = $exit->stats->sp;
2802
2600 $self->goto ($slaying, $hp, $sp); 2803 $self->goto ($map, $x, $y);
2601 2804
2805 # if exit is damned, update players death & WoR home-position
2806 $self->contr->savebed ($map, $x, $y)
2807 if $exit->flag (cf::FLAG_DAMNED);
2808
2602 1; 2809 1
2603 }) { 2810 }) {
2604 $self->message ("Something went wrong deep within the crossfire server. " 2811 $self->message ("Something went wrong deep within the deliantra server. "
2605 . "I'll try to bring you back to the map you were before. " 2812 . "I'll try to bring you back to the map you were before. "
2606 . "Please report this to the dungeon master!", 2813 . "Please report this to the dungeon master!",
2607 cf::NDI_UNIQUE | cf::NDI_RED); 2814 cf::NDI_UNIQUE | cf::NDI_RED);
2608 2815
2609 warn "ERROR in enter_exit: $@"; 2816 warn "ERROR in enter_exit: $@";
2626sub cf::client::send_drawinfo { 2833sub cf::client::send_drawinfo {
2627 my ($self, $text, $flags) = @_; 2834 my ($self, $text, $flags) = @_;
2628 2835
2629 utf8::encode $text; 2836 utf8::encode $text;
2630 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838}
2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2631} 2863}
2632 2864
2633=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2634 2866
2635Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2637the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
2638the message unless the client supports the msg packet. 2870the message unless the client supports the msg packet.
2639 2871
2640=cut 2872=cut
2641 2873
2874# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2643 "c/identify" => { 2882 "c/identify" => {
2644 id => "infobox", 2883 id => "infobox",
2645 title => "Identify", 2884 title => "Identify",
2646 reply => undef, 2885 reply => undef,
2647 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
2650 id => "infobox", 2889 id => "infobox",
2651 title => "Examine", 2890 title => "Examine",
2652 reply => undef, 2891 reply => undef,
2653 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2654 }, 2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2899 },
2900 "c/book" => {
2901 id => "infobox",
2902 title => "Book",
2903 reply => undef,
2904 tooltip => "The contents of a note or book",
2905 },
2655 "c/lookat" => { 2906 "c/lookat" => {
2656 id => "infobox", 2907 id => "infobox",
2657 title => "Look", 2908 title => "Look",
2658 reply => undef, 2909 reply => undef,
2659 tooltip => "What you saw there", 2910 tooltip => "What you saw there",
2660 }, 2911 },
2912 "c/who" => {
2913 id => "infobox",
2914 title => "Players",
2915 reply => undef,
2916 tooltip => "Shows players who are currently online",
2917 },
2918 "c/body" => {
2919 id => "infobox",
2920 title => "Body Parts",
2921 reply => undef,
2922 tooltip => "Shows which body parts you posess and are available",
2923 },
2924 "c/statistics" => {
2925 id => "infobox",
2926 title => "Statistics",
2927 reply => undef,
2928 tooltip => "Shows your primary statistics",
2929 },
2930 "c/skills" => {
2931 id => "infobox",
2932 title => "Skills",
2933 reply => undef,
2934 tooltip => "Shows your experience per skill and item power",
2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2942 "c/resistances" => {
2943 id => "infobox",
2944 title => "Resistances",
2945 reply => undef,
2946 tooltip => "Shows your resistances",
2947 },
2948 "c/pets" => {
2949 id => "infobox",
2950 title => "Pets",
2951 reply => undef,
2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2959 },
2960 "c/uptime" => {
2961 id => "infobox",
2962 title => "Uptime",
2963 reply => undef,
2964 tooltip => "How long the server has been running since last restart",
2965 },
2966 "c/mapinfo" => {
2967 id => "infobox",
2968 title => "Map Info",
2969 reply => undef,
2970 tooltip => "Information related to the maps",
2971 },
2972 "c/party" => {
2973 id => "party",
2974 title => "Party",
2975 reply => "gsay ",
2976 tooltip => "Messages and chat related to your party",
2977 },
2978 "c/death" => {
2979 id => "death",
2980 title => "Death",
2981 reply => undef,
2982 tooltip => "Reason for and more info about your most recent death",
2983 },
2984 "c/say" => $SAY_CHANNEL,
2985 "c/chat" => $CHAT_CHANNEL,
2661); 2986);
2662 2987
2663sub cf::client::send_msg { 2988sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2989 my ($self, $channel, $msg, $color, @extra) = @_;
2665 2990
2666 $msg = $self->pl->expand_cfpod ($msg); 2991 $msg = $self->pl->expand_cfpod ($msg)
2992 unless $color & cf::NDI_VERBATIM;
2667 2993
2668 $color &= cf::NDI_CLIENT_MASK; # just in case... 2994 $color &= cf::NDI_CLIENT_MASK; # just in case...
2669 2995
2670 # check predefined channels, for the benefit of C 2996 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) { 2997 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel}; 2998 $channel = $CHANNEL{$channel};
2673 2999
2674 $self->ext_msg (channel_info => $channel) 3000 $self->ext_msg (channel_info => $channel);
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id}; 3001 $channel = $channel->{id};
2678 3002
2679 } elsif (ref $channel) { 3003 } elsif (ref $channel) {
2680 # send meta info to client, if not yet sent 3004 # send meta info to client, if not yet sent
2681 unless (exists $self->{channel}{$channel->{id}}) { 3005 unless (exists $self->{channel}{$channel->{id}}) {
2682 $self->{channel}{$channel->{id}} = $channel; 3006 $self->{channel}{$channel->{id}} = $channel;
2683 $self->ext_msg (channel_info => $channel) 3007 $self->ext_msg (channel_info => $channel);
2684 if $self->can_msg;
2685 } 3008 }
2686 3009
2687 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2688 } 3011 }
2689 3012
2690 return unless @extra || length $msg; 3013 return unless @extra || length $msg;
2691 3014
2692 if ($self->can_msg) {
2693 # default colour, mask it out 3015 # default colour, mask it out
2694 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3016 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2695 if $color & cf::NDI_DEF; 3017 if $color & cf::NDI_DEF;
2696 3018
2697 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3019 my $pkt = "msg "
3020 . $self->{json_coder}->encode (
2698 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2699 } else { 3022 );
2700 if ($color >= 0) {
2701 # replace some tags by gcfclient-compatible ones
2702 for ($msg) {
2703 1 while
2704 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2705 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2706 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2707 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2708 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2709 }
2710 3023
2711 $color &= cf::NDI_COLOR_MASK; 3024 $self->send_big_packet ($pkt);
2712
2713 utf8::encode $msg;
2714
2715 if (0 && $msg =~ /\[/) {
2716 # COMMAND/INFO
2717 $self->send_packet ("drawextinfo $color 10 8 $msg")
2718 } else {
2719 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2720 $self->send_packet ("drawinfo $color $msg")
2721 }
2722 }
2723 }
2724} 3025}
2725 3026
2726=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2727 3028
2728Sends an ext event to the client. 3029Sends an ext event to the client.
2731 3032
2732sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2733 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2734 3035
2735 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2737 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2738 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2740 } 3041 }
2741} 3042}
2742 3043
2743=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2744 3045
2748 3049
2749sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2750 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2751 3052
2752 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2754 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2755 #TODO: version 1, remove 3056 #TODO: version 1, remove
2756 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2758 } 3059 }
2759} 3060}
2760 3061
2761=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2762 3063
2863 3164
2864 $coro 3165 $coro
2865} 3166}
2866 3167
2867cf::client->attach ( 3168cf::client->attach (
2868 on_destroy => sub { 3169 on_client_destroy => sub {
2869 my ($ns) = @_; 3170 my ($ns) = @_;
2870 3171
2871 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2872 }, 3173 },
2873); 3174);
2889our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
2890 3191
2891$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
2892 3193
2893$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
2894 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
2895 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
2896 sort time 3197 sort time
2897)); 3198));
2898 3199
2899# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
2902 3203
2903The following functions and methods are available within a safe environment: 3204The following functions and methods are available within a safe environment:
2904 3205
2905 cf::object 3206 cf::object
2906 contr pay_amount pay_player map x y force_find force_add destroy 3207 contr pay_amount pay_player map x y force_find force_add destroy
2907 insert remove name archname title slaying race decrease_ob_nr 3208 insert remove name archname title slaying race decrease split
3209 value
2908 3210
2909 cf::object::player 3211 cf::object::player
2910 player 3212 player
2911 3213
2912 cf::player 3214 cf::player
2917 3219
2918=cut 3220=cut
2919 3221
2920for ( 3222for (
2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3223 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2922 insert remove inv name archname title slaying race 3224 insert remove inv nrof name archname title slaying race
2923 decrease_ob_nr destroy)], 3225 decrease split destroy change_exp value msg lore send_msg)],
2924 ["cf::object::player" => qw(player)], 3226 ["cf::object::player" => qw(player)],
2925 ["cf::player" => qw(peaceful)], 3227 ["cf::player" => qw(peaceful send_msg)],
2926 ["cf::map" => qw(trigger)], 3228 ["cf::map" => qw(trigger)],
2927) { 3229) {
2928 no strict 'refs'; 3230 no strict 'refs';
2929 my ($pkg, @funs) = @$_; 3231 my ($pkg, @funs) = @$_;
2930 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2948 3250
2949 my $qcode = $code; 3251 my $qcode = $code;
2950 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2951 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
2952 3254
3255 %vars = (_dummy => 0) unless %vars;
3256
3257 my @res;
2953 local $_; 3258 local $_;
2954 local @safe::cf::_safe_eval_args = values %vars;
2955 3259
2956 my $eval = 3260 my $eval =
2957 "do {\n" 3261 "do {\n"
2958 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2959 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
2960 . $code 3264 . $code
2961 . "\n}" 3265 . "\n}"
2962 ; 3266 ;
2963 3267
3268 if ($CFG{safe_eval}) {
2964 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
2965 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2966 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
2967 3277
2968 if ($@) { 3278 if ($@) {
2969 warn "$@"; 3279 warn "$@";
2970 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
2971 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
2990=cut 3300=cut
2991 3301
2992sub register_script_function { 3302sub register_script_function {
2993 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
2994 3304
2995 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
2996 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
2997} 3307}
2998 3308
2999=back 3309=back
3000 3310
3001=cut 3311=cut
3022 3332
3023 $facedata->{version} == 2 3333 $facedata->{version} == 2
3024 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3025 3335
3026 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3027 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3028 type => FT_RSRC, 3339 type => FT_RSRC,
3029 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3030 }; 3342 };
3031 cf::cede_to_tick; 3343 cf::cede_to_tick;
3032 3344
3033 { 3345 {
3034 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
3035 3347
3036 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350
3038 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3040 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3041 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3042 3355
3043 cf::cede_to_tick; 3356 cf::cede_to_tick;
3044 } 3357 }
3045 3358
3046 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3360 next unless $info->{smooth};
3361
3048 my $idx = cf::face::find $face 3362 my $idx = cf::face::find $face
3049 or next; 3363 or next;
3364
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3365 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3366 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3368 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3369 warn "smooth face '$info->{smooth}' not found for face '$face'";
3068 3383
3069 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3070 } 3385 }
3071 3386
3072 { 3387 {
3073 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3076 3389
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3391 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data;
3082 3393
3083 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3084 # prepend meta info 3395 cf::face::set_type $idx, $info->{type};
3085
3086 my $meta = $enc->encode ({
3087 name => $name,
3088 %{ $info->{meta} || {} },
3089 });
3090
3091 $data = pack "(w/a*)*", $meta, $info->{data};
3092 } else { 3396 } else {
3093 $data = $info->{data}; 3397 $RESOURCE{$name} = $info;
3094 } 3398 }
3095 3399
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3400 cf::cede_to_tick;
3100 } 3401 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3402 }
3403
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3405
3121 1 3406 1
3122} 3407}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3123 3428
3124register_exticmd fx_want => sub { 3429register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3430 my ($ns, $want) = @_;
3126 3431
3127 while (my ($k, $v) = each %$want) { 3432 while (my ($k, $v) = each %$want) {
3128 $ns->fx_want ($k, $v); 3433 $ns->fx_want ($k, $v);
3129 } 3434 }
3130}; 3435};
3436
3437sub load_resource_file($) {
3438 my $guard = lock_acquire "load_resource_file";
3439
3440 my $status = load_resource_file_ $_[0];
3441 get_slot 0.1, 100;
3442 cf::arch::commit_load;
3443
3444 $status
3445}
3131 3446
3132sub reload_regions { 3447sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework 3448 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?) 3449 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = (); 3450 %ext::player_env::MUSIC_FACE_CACHE = ();
3149} 3464}
3150 3465
3151sub reload_archetypes { 3466sub reload_archetypes {
3152 load_resource_file "$DATADIR/archetypes" 3467 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n"; 3468 or die "unable to load archetypes\n";
3154 #d# NEED to laod twice to resolve forward references
3155 # this really needs to be done in an extra post-pass
3156 # (which needs to be synchronous, so solve it differently)
3157 load_resource_file "$DATADIR/archetypes"
3158 or die "unable to load archetypes\n";
3159} 3469}
3160 3470
3161sub reload_treasures { 3471sub reload_treasures {
3162 load_resource_file "$DATADIR/treasures" 3472 load_resource_file "$DATADIR/treasures"
3163 or die "unable to load treasurelists\n"; 3473 or die "unable to load treasurelists\n";
3164} 3474}
3165 3475
3166sub reload_resources { 3476sub reload_resources {
3167 warn "reloading resource files...\n"; 3477 warn "reloading resource files...\n";
3168 3478
3479 reload_facedata;
3480 reload_archetypes;
3169 reload_regions; 3481 reload_regions;
3170 reload_facedata;
3171 #reload_archetypes;#d#
3172 reload_archetypes;
3173 reload_treasures; 3482 reload_treasures;
3174 3483
3175 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3176} 3485}
3177 3486
3178sub init {
3179 reload_resources;
3180}
3181
3182sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3491 or return;
3185 3492
3186 local $/; 3493 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3188 3495
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3497
3191 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3192 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3196 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3197 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3198 }; 3505 };
3199 warn $@ if $@; 3506 warn $@ if $@;
3200 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3510}
3511
3512sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!";
3515 flock $fh, &Fcntl::LOCK_EX
3516 or die "$PIDFILE: flock: $!";
3517 $fh
3518}
3519
3520# make sure only one server instance is running at any one time
3521sub atomic {
3522 my $fh = pidfile;
3523
3524 my $pid = <$fh>;
3525 kill 9, $pid if $pid > 0;
3526
3527 seek $fh, 0, 0;
3528 print $fh $$;
3529}
3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3201} 3538}
3202 3539
3203sub main { 3540sub main {
3541 cf::init_globals; # initialise logging
3542
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549
3204 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3552 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3207 (async { 3553 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3554 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3555 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3556 })->prio (Coro::PRIO_MAX);
3211 }; 3557 };
3212 3558
3559 evthread_start IO::AIO::poll_fileno;
3560
3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3570 reload_resources;
3213 reload_config; 3571 reload_config;
3214 db_init; 3572 db_init;
3573
3574 cf::init_uuid;
3575 cf::init_signals;
3576 cf::init_skills;
3577
3578 cf::init_beforeplay;
3579
3580 atomic;
3581
3215 load_extensions; 3582 load_extensions;
3216 3583
3217 $TICK_WATCHER->start; 3584 utime time, time, $RUNTIMEFILE;
3218 Event::loop; 3585
3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589
3590 (pop @POST_INIT)->(0) while @POST_INIT;
3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n";
3595
3596 main_loop;
3219} 3597}
3220 3598
3221############################################################################# 3599#############################################################################
3222# initialisation and cleanup 3600# initialisation and cleanup
3223 3601
3224# install some emergency cleanup handlers 3602# install some emergency cleanup handlers
3225BEGIN { 3603BEGIN {
3604 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3605 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3606 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3607 cf::cleanup "SIG$signal";
3234 },
3235 ); 3608 };
3236 } 3609 }
3237} 3610}
3238 3611
3239sub write_runtime { 3612sub write_runtime_sync {
3240 my $runtime = "$LOCALDIR/runtime"; 3613 my $t0 = AE::time;
3241 3614
3242 # first touch the runtime file to show we are still running: 3615 # first touch the runtime file to show we are still running:
3243 # the fsync below can take a very very long time. 3616 # the fsync below can take a very very long time.
3244 3617
3245 IO::AIO::aio_utime $runtime, undef, undef; 3618 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3246 3619
3247 my $guard = cf::lock_acquire "write_runtime"; 3620 my $guard = cf::lock_acquire "write_runtime";
3248 3621
3249 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3622 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3250 or return; 3623 or return;
3251 3624
3252 my $value = $cf::RUNTIME + 90 + 10; 3625 my $value = $cf::RUNTIME + 90 + 10;
3253 # 10 is the runtime save interval, for a monotonic clock 3626 # 10 is the runtime save interval, for a monotonic clock
3254 # 60 allows for the watchdog to kill the server. 3627 # 60 allows for the watchdog to kill the server.
3264 aio_utime $fh, undef, undef; 3637 aio_utime $fh, undef, undef;
3265 3638
3266 close $fh 3639 close $fh
3267 or return; 3640 or return;
3268 3641
3269 aio_rename "$runtime~", $runtime 3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3270 and return; 3643 and return;
3271 3644
3272 warn "runtime file written.\n"; 3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3273 3646
3274 1 3647 1
3648}
3649
3650our $uuid_lock;
3651our $uuid_skip;
3652
3653sub write_uuid_sync($) {
3654 $uuid_skip ||= $_[0];
3655
3656 return if $uuid_lock;
3657 local $uuid_lock = 1;
3658
3659 my $uuid = "$LOCALDIR/uuid";
3660
3661 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3662 or return;
3663
3664 my $value = uuid_seq uuid_cur;
3665
3666 unless ($value) {
3667 warn "cowardly refusing to write zero uuid value!\n";
3668 return;
3669 }
3670
3671 my $value = uuid_str $value + $uuid_skip;
3672 $uuid_skip = 0;
3673
3674 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3675 and return;
3676
3677 # always fsync - this file is important
3678 aio_fsync $fh
3679 and return;
3680
3681 close $fh
3682 or return;
3683
3684 aio_rename "$uuid~", $uuid
3685 and return;
3686
3687 warn "uuid file written ($value).\n";
3688
3689 1
3690
3691}
3692
3693sub write_uuid($$) {
3694 my ($skip, $sync) = @_;
3695
3696 $sync ? write_uuid_sync $skip
3697 : async { write_uuid_sync $skip };
3275} 3698}
3276 3699
3277sub emergency_save() { 3700sub emergency_save() {
3278 my $freeze_guard = cf::freeze_mainloop; 3701 my $freeze_guard = cf::freeze_mainloop;
3279 3702
3280 warn "enter emergency perl save\n"; 3703 warn "emergency_perl_save: enter\n";
3281 3704
3282 cf::sync_job { 3705 cf::sync_job {
3706 # this is a trade-off: we want to be very quick here, so
3707 # save all maps without fsync, and later call a global sync
3708 # (which in turn might be very very slow)
3709 local $USE_FSYNC = 0;
3710
3283 # use a peculiar iteration method to avoid tripping on perl 3711 # use a peculiar iteration method to avoid tripping on perl
3284 # refcount bugs in for. also avoids problems with players 3712 # refcount bugs in for. also avoids problems with players
3285 # and maps saved/destroyed asynchronously. 3713 # and maps saved/destroyed asynchronously.
3286 warn "begin emergency player save\n"; 3714 warn "emergency_perl_save: begin player save\n";
3287 for my $login (keys %cf::PLAYER) { 3715 for my $login (keys %cf::PLAYER) {
3288 my $pl = $cf::PLAYER{$login} or next; 3716 my $pl = $cf::PLAYER{$login} or next;
3289 $pl->valid or next; 3717 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3718 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3291 $pl->save; 3719 $pl->save;
3292 } 3720 }
3293 warn "end emergency player save\n"; 3721 warn "emergency_perl_save: end player save\n";
3294 3722
3295 warn "begin emergency map save\n"; 3723 warn "emergency_perl_save: begin map save\n";
3296 for my $path (keys %cf::MAP) { 3724 for my $path (keys %cf::MAP) {
3297 my $map = $cf::MAP{$path} or next; 3725 my $map = $cf::MAP{$path} or next;
3298 $map->valid or next; 3726 $map->valid or next;
3299 $map->save; 3727 $map->save;
3300 } 3728 }
3301 warn "end emergency map save\n"; 3729 warn "emergency_perl_save: end map save\n";
3302 3730
3303 warn "begin emergency database checkpoint\n"; 3731 warn "emergency_perl_save: begin database checkpoint\n";
3304 BDB::db_env_txn_checkpoint $DB_ENV; 3732 BDB::db_env_txn_checkpoint $DB_ENV;
3305 warn "end emergency database checkpoint\n"; 3733 warn "emergency_perl_save: end database checkpoint\n";
3734
3735 warn "emergency_perl_save: begin write uuid\n";
3736 write_uuid_sync 1;
3737 warn "emergency_perl_save: end write uuid\n";
3306 }; 3738 };
3307 3739
3740 warn "emergency_perl_save: starting sync()\n";
3741 IO::AIO::aio_sync sub {
3742 warn "emergency_perl_save: finished sync()\n";
3743 };
3744
3308 warn "leave emergency perl save\n"; 3745 warn "emergency_perl_save: leave\n";
3309} 3746}
3310 3747
3311sub post_cleanup { 3748sub post_cleanup {
3312 my ($make_core) = @_; 3749 my ($make_core) = @_;
3313 3750
3314 warn Carp::longmess "post_cleanup backtrace" 3751 warn Carp::longmess "post_cleanup backtrace"
3315 if $make_core; 3752 if $make_core;
3753
3754 my $fh = pidfile;
3755 unlink $PIDFILE if <$fh> == $$;
3756}
3757
3758# a safer delete_package, copied from Symbol
3759sub clear_package($) {
3760 my $pkg = shift;
3761
3762 # expand to full symbol table name if needed
3763 unless ($pkg =~ /^main::.*::$/) {
3764 $pkg = "main$pkg" if $pkg =~ /^::/;
3765 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3766 $pkg .= '::' unless $pkg =~ /::$/;
3767 }
3768
3769 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3770 my $stem_symtab = *{$stem}{HASH};
3771
3772 defined $stem_symtab and exists $stem_symtab->{$leaf}
3773 or return;
3774
3775 # clear all symbols
3776 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3777 for my $name (keys %$leaf_symtab) {
3778 _gv_clear *{"$pkg$name"};
3779# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3780 }
3781 warn "cleared package $pkg\n";#d#
3316} 3782}
3317 3783
3318sub do_reload_perl() { 3784sub do_reload_perl() {
3319 # can/must only be called in main 3785 # can/must only be called in main
3320 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3321 warn "can only reload from main coroutine"; 3787 warn "can only reload from main coroutine";
3322 return; 3788 return;
3323 } 3789 }
3324 3790
3791 return if $RELOAD++;
3792
3793 my $t1 = AE::time;
3794
3795 while ($RELOAD) {
3325 warn "reloading..."; 3796 warn "reloading...";
3326 3797
3327 warn "entering sync_job"; 3798 warn "entering sync_job";
3328 3799
3329 cf::sync_job { 3800 cf::sync_job {
3330 cf::write_runtime; # external watchdog should not bark 3801 cf::write_runtime_sync; # external watchdog should not bark
3331 cf::emergency_save; 3802 cf::emergency_save;
3332 cf::write_runtime; # external watchdog should not bark 3803 cf::write_runtime_sync; # external watchdog should not bark
3333 3804
3334 warn "syncing database to disk"; 3805 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3806 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3807
3337 # if anything goes wrong in here, we should simply crash as we already saved 3808 # if anything goes wrong in here, we should simply crash as we already saved
3338 3809
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests"; 3810 warn "flushing outstanding aio requests";
3345 for (;;) {
3346 BDB::flush;
3347 IO::AIO::flush;
3348 Coro::cede;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3811 while (IO::AIO::nreqs || BDB::nreqs) {
3350 warn "iterate..."; 3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3351 }
3352
3353 ++$RELOAD;
3354
3355 warn "cancelling all extension coros";
3356 $_->cancel for values %EXT_CORO;
3357 %EXT_CORO = ();
3358
3359 warn "removing commands";
3360 %COMMAND = ();
3361
3362 warn "removing ext/exti commands";
3363 %EXTCMD = ();
3364 %EXTICMD = ();
3365
3366 warn "unloading/nuking all extensions";
3367 for my $pkg (@EXTS) {
3368 warn "... unloading $pkg";
3369
3370 if (my $cb = $pkg->can ("unload")) {
3371 eval {
3372 $cb->($pkg);
3373 1
3374 } or warn "$pkg unloaded, but with errors: $@";
3375 } 3813 }
3376 3814
3377 warn "... nuking $pkg"; 3815 warn "cancelling all extension coros";
3378 Symbol::delete_package $pkg; 3816 $_->cancel for values %EXT_CORO;
3379 } 3817 %EXT_CORO = ();
3380 3818
3381 warn "unloading all perl modules loaded from $LIBDIR"; 3819 warn "removing commands";
3382 while (my ($k, $v) = each %INC) { 3820 %COMMAND = ();
3383 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3384 3821
3822 warn "removing ext/exti commands";
3823 %EXTCMD = ();
3824 %EXTICMD = ();
3825
3826 warn "unloading/nuking all extensions";
3827 for my $pkg (@EXTS) {
3385 warn "... unloading $k"; 3828 warn "... unloading $pkg";
3386 delete $INC{$k};
3387 3829
3388 $k =~ s/\.pm$//;
3389 $k =~ s/\//::/g;
3390
3391 if (my $cb = $k->can ("unload_module")) { 3830 if (my $cb = $pkg->can ("unload")) {
3831 eval {
3392 $cb->(); 3832 $cb->($pkg);
3833 1
3834 } or warn "$pkg unloaded, but with errors: $@";
3835 }
3836
3837 warn "... clearing $pkg";
3838 clear_package $pkg;
3393 } 3839 }
3394 3840
3395 Symbol::delete_package $k; 3841 warn "unloading all perl modules loaded from $LIBDIR";
3842 while (my ($k, $v) = each %INC) {
3843 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3844
3845 warn "... unloading $k";
3846 delete $INC{$k};
3847
3848 $k =~ s/\.pm$//;
3849 $k =~ s/\//::/g;
3850
3851 if (my $cb = $k->can ("unload_module")) {
3852 $cb->();
3853 }
3854
3855 clear_package $k;
3396 } 3856 }
3397 3857
3398 warn "getting rid of safe::, as good as possible"; 3858 warn "getting rid of safe::, as good as possible";
3399 Symbol::delete_package "safe::$_" 3859 clear_package "safe::$_"
3400 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3860 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3401 3861
3402 warn "unloading cf.pm \"a bit\""; 3862 warn "unloading cf.pm \"a bit\"";
3403 delete $INC{"cf.pm"}; 3863 delete $INC{"cf.pm"};
3404 delete $INC{"cf/pod.pm"}; 3864 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3405 3865
3406 # don't, removes xs symbols, too, 3866 # don't, removes xs symbols, too,
3407 # and global variables created in xs 3867 # and global variables created in xs
3408 #Symbol::delete_package __PACKAGE__; 3868 #clear_package __PACKAGE__;
3409 3869
3410 warn "unload completed, starting to reload now"; 3870 warn "unload completed, starting to reload now";
3411 3871
3412 warn "reloading cf.pm"; 3872 warn "reloading cf.pm";
3413 require cf; 3873 require cf;
3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3874 cf::_connect_to_perl_1;
3415 3875
3416 warn "loading config and database again"; 3876 warn "loading config and database again";
3417 cf::reload_config; 3877 cf::reload_config;
3418 3878
3419 warn "loading extensions"; 3879 warn "loading extensions";
3420 cf::load_extensions; 3880 cf::load_extensions;
3421 3881
3882 if ($REATTACH_ON_RELOAD) {
3422 warn "reattaching attachments to objects/players"; 3883 warn "reattaching attachments to objects/players";
3423 _global_reattach; # objects, sockets 3884 _global_reattach; # objects, sockets
3424 warn "reattaching attachments to maps"; 3885 warn "reattaching attachments to maps";
3425 reattach $_ for values %MAP; 3886 reattach $_ for values %MAP;
3426 warn "reattaching attachments to players"; 3887 warn "reattaching attachments to players";
3427 reattach $_ for values %PLAYER; 3888 reattach $_ for values %PLAYER;
3889 }
3428 3890
3891 warn "running post_init jobs";
3892 (pop @POST_INIT)->(1) while @POST_INIT;
3893
3429 warn "leaving sync_job"; 3894 warn "leaving sync_job";
3430 3895
3431 1 3896 1
3432 } or do { 3897 } or do {
3433 warn $@; 3898 warn $@;
3434 warn "error while reloading, exiting."; 3899 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3900 };
3437 3901
3438 warn "reloaded"; 3902 warn "reloaded";
3903 --$RELOAD;
3904 }
3905
3906 $t1 = AE::time - $t1;
3907 warn "reload completed in ${t1}s\n";
3439}; 3908};
3440 3909
3441our $RELOAD_WATCHER; # used only during reload 3910our $RELOAD_WATCHER; # used only during reload
3442 3911
3443sub reload_perl() { 3912sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3913 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3914 # coro crashes during coro_state_free->destroy here.
3446 3915
3447 $RELOAD_WATCHER ||= Event->timer ( 3916 $RELOAD_WATCHER ||= cf::async {
3448 reentrant => 0, 3917 Coro::AIO::aio_wait cache_extensions;
3449 after => 0, 3918
3450 data => WF_AUTOCANCEL, 3919 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3451 cb => sub {
3452 do_reload_perl; 3920 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3921 undef $RELOAD_WATCHER;
3454 }, 3922 };
3455 ); 3923 };
3456} 3924}
3457 3925
3458register_command "reload" => sub { 3926register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3927 my ($who, $arg) = @_;
3460 3928
3473 3941
3474our @WAIT_FOR_TICK; 3942our @WAIT_FOR_TICK;
3475our @WAIT_FOR_TICK_BEGIN; 3943our @WAIT_FOR_TICK_BEGIN;
3476 3944
3477sub wait_for_tick { 3945sub wait_for_tick {
3478 return unless $TICK_WATCHER->is_active;
3479 return if $Coro::current == $Coro::main; 3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3480 3947
3481 my $signal = new Coro::Signal; 3948 my $signal = new Coro::Signal;
3482 push @WAIT_FOR_TICK, $signal; 3949 push @WAIT_FOR_TICK, $signal;
3483 $signal->wait; 3950 $signal->wait;
3484} 3951}
3485 3952
3486sub wait_for_tick_begin { 3953sub wait_for_tick_begin {
3487 return unless $TICK_WATCHER->is_active;
3488 return if $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3489 3955
3490 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3957 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3958 $signal->wait;
3493} 3959}
3494 3960
3495$TICK_WATCHER = Event->timer ( 3961sub tick {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3962 if ($Coro::current != $Coro::main) {
3503 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3963 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3504 unless ++$bug_warning > 10; 3964 unless ++$bug_warning > 10;
3505 return; 3965 return;
3506 } 3966 }
3507 3967
3508 $NOW = $tick_start = Event::time;
3509
3510 cf::server_tick; # one server iteration 3968 cf::server_tick; # one server iteration
3511 3969
3512 $RUNTIME += $TICK; 3970 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3513 $NEXT_TICK += $TICK;
3514 3971
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3972 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3973 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3974 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3975 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3976 write_runtime_sync
3520 or warn "ERROR: unable to write runtime file: $!"; 3977 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3978 };
3979 }
3523 3980
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3981 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3982 $sig->send;
3526 } 3983 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3984 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3985 $sig->send;
3529 } 3986 }
3530 3987
3531 $NOW = Event::time; 3988 $LOAD = ($NOW - $TICK_START) / $TICK;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3989 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3990
3542 _post_tick; 3991 if (0) {
3992 if ($NEXT_TICK) {
3993 my $jitter = $TICK_START - $NEXT_TICK;
3994 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3995 warn "jitter $JITTER\n";#d#
3996 }
3543 }, 3997 }
3544); 3998}
3545 3999
3546{ 4000{
4001 # configure BDB
4002
3547 BDB::min_parallel 8; 4003 BDB::min_parallel 16;
3548 BDB::max_poll_time $TICK * 0.1; 4004 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 4005 $AnyEvent::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 4006
3573 unless ($DB_ENV) { 4007 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 4008 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4009 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3576 | BDB::LOG_AUTOREMOVE, 1); 4010 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4011 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4012 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4013 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3579 4014
3580 cf::sync_job { 4015 cf::sync_job {
3581 eval { 4016 eval {
3591 4026
3592 cf::cleanup "db_env_open(db): $@" if $@; 4027 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 4028 };
3594 } 4029 }
3595 4030
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 4031 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4032 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 ); 4033 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4034 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4035 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 4036 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 4037 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4038 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 4039 };
3626} 4040}
3627 4041
3628{ 4042{
4043 # configure IO::AIO
4044
3629 IO::AIO::min_parallel 8; 4045 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 4046 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 4047 undef $AnyEvent::AIO::WATCHER;
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 4048}
3642 4049
3643my $_log_backtrace; 4050my $_log_backtrace;
3644 4051
3645sub _log_backtrace { 4052sub _log_backtrace {
3648 $msg =~ s/\n//; 4055 $msg =~ s/\n//;
3649 4056
3650 # limit the # of concurrent backtraces 4057 # limit the # of concurrent backtraces
3651 if ($_log_backtrace < 2) { 4058 if ($_log_backtrace < 2) {
3652 ++$_log_backtrace; 4059 ++$_log_backtrace;
4060 my $perl_bt = Carp::longmess $msg;
3653 async { 4061 async {
3654 $Coro::current->{desc} = "abt $msg"; 4062 $Coro::current->{desc} = "abt $msg";
3655 4063
3656 my @bt = fork_call { 4064 my @bt = fork_call {
3657 @addr = map { sprintf "%x", $_ } @addr; 4065 @addr = map { sprintf "%x", $_ } @addr;
3668 } 4076 }
3669 4077
3670 @funcs 4078 @funcs
3671 }; 4079 };
3672 4080
3673 LOG llevInfo, "[ABT] $msg\n"; 4081 LOG llevInfo, "[ABT] $perl_bt\n";
4082 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3674 LOG llevInfo, "[ABT] $_\n" for @bt; 4083 LOG llevInfo, "[ABT] $_\n" for @bt;
3675 --$_log_backtrace; 4084 --$_log_backtrace;
3676 }; 4085 };
3677 } else { 4086 } else {
3678 LOG llevInfo, "[ABT] $msg\n"; 4087 LOG llevInfo, "[ABT] $msg\n";
3679 LOG llevInfo, "[ABT] [suppressed]\n"; 4088 LOG llevInfo, "[ABT] [suppressed]\n";
3680 } 4089 }
3681} 4090}
3682 4091
3683# load additional modules 4092# load additional modules
3684use cf::pod; 4093require "cf/$_.pm" for @EXTRA_MODULES;
4094cf::_connect_to_perl_2;
3685 4095
3686END { cf::emergency_save } 4096END { cf::emergency_save }
3687 4097
36881 40981
3689 4099

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines