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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines