ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.380 by root, Mon Oct 8 13:58:07 2007 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
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);
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 process
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
176=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
177 242
178This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 245that call.
181 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
182=back 253=back
183 254
184=cut 255=cut
185 256
186BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 264 my $msg = join "", @_;
189 265
190 $msg .= "\n" 266 $msg .= "\n"
191 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
192 268
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 270
195 LOG llevError, $msg; 271 LOG llevWarn, $msg;
196 }; 272};
197} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
198 287
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 298for my $pkg (qw(
210 cf::global cf::attachable 299 cf::global cf::attachable
211 cf::object cf::object::player 300 cf::object cf::object::player
212 cf::client cf::player 301 cf::client cf::player
213 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
214 cf::map cf::party cf::region 304 cf::party cf::region
215)) { 305)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 307}
219 308
220$Event::DIED = sub { 309$EV::DIED = sub {
221 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
222}; 311};
223 312
224############################################################################# 313#############################################################################
225 314
226=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 338 $d
250 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
251} 340}
252 341
253=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
254 343
255Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
256 345
257=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
258 347
259Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
260 349
261=cut 350=cut
262 351
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 353
265sub to_json ($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
267 370
268=item cf::lock_wait $string 371=item cf::lock_wait $string
269 372
270Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
271 374
272=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
273 376
274Wait until the given lock is available and then acquires it and returns 377Wait 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, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
277returned. 380returned.
278 381
279Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 383deadlocked coro.
286 389
287Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
288 391
289=cut 392=cut
290 393
291our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 395
294sub lock_wait($) { 396sub lock_wait($) {
295 my ($key) = @_; 397 $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} 398}
308 399
309sub lock_acquire($) { 400sub lock_acquire($) {
310 my ($key) = @_; 401 $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} 402}
324 403
325sub lock_active($) { 404sub lock_active($) {
326 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 406}
330 407
331sub freeze_mainloop { 408sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
333 410
334 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 412}
336 }; 413
337 $TICK_WATCHER->stop; 414=item cf::periodic $interval, $cb
338 $guard 415
416Like EV::periodic, but randomly selects a starting point so that the actions
417get spread over time.
418
419=cut
420
421sub periodic($$) {
422 my ($interval, $cb) = @_;
423
424 my $start = rand List::Util::min 180, $interval;
425
426 EV::periodic $start, $interval, 0, $cb
339} 427}
340 428
341=item cf::get_slot $time[, $priority[, $name]] 429=item cf::get_slot $time[, $priority[, $name]]
342 430
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 431Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 439
352=cut 440=cut
353 441
354our @SLOT_QUEUE; 442our @SLOT_QUEUE;
355our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
356 445
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
360 449
361 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
362 452
363 while () { 453 while () {
364 next_job: 454 next_job:
455
365 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 457
367 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 462 $job->[2]->send;
371 Coro::cede; 463 Coro::cede;
372 goto next_job; 464 goto next_job;
373 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 467 }
375 } 468 }
376 469
377 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 473 $signal->wait;
381 } else { 474 } else {
475 $busy = 0;
382 Coro::schedule; 476 Coro::schedule;
383 } 477 }
384 } 478 }
385}; 479};
386 480
387sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
388 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
389 485
390 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
391 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
392 489
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
406 503
407BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
408 505
409=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
410 507
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 509is 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 510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 511acceptable.
415 512
416If it must be done, put the blocking parts into C<sync_job>. This will run 513If 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 514the given BLOCK in another coroutine while waiting for the result. The
421=cut 518=cut
422 519
423sub sync_job(&) { 520sub sync_job(&) {
424 my ($job) = @_; 521 my ($job) = @_;
425 522
426 if ($Coro::current == $Coro::main) { 523 if (in_main) {
427 my $time = Event::time; 524 my $time = AE::time;
428 525
429 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
431 528
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
433 530
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
437 532
438 my $busy = 1; 533 my $busy = 1;
439 my @res; 534 my @res;
440 535
441 (async { 536 (async {
442 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 538 @res = eval { $job->() };
444 warn $@ if $@; 539 error $@ if $@;
445 undef $busy; 540 undef $busy;
446 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
447 542
448 while ($busy) { 543 while ($busy) {
449 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
450 } 548 }
549 }
451 550
452 $time = Event::time - $time; 551 my $time = AE::time - $time;
453 552
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
458 554
459 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
460 } else { 556 } else {
461 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
462 558
487=item fork_call { }, $args 583=item fork_call { }, $args
488 584
489Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
493 589
494=cut 590=cut
495 591
496sub fork_call(&@) { 592sub fork_call(&@) {
497 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
506 }, @args; 602 }, @args;
507 603
508 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
509} 605}
510 606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
511=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
512 646
513Returns a single value from the environment database. 647Returns a single value from the environment database.
514 648
515=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
523within each server. 657within each server.
524 658
525=cut 659=cut
526 660
527sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
528 my ($name) = @_; 665 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
530 667
531 eval { 668 eval {
532 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
542} 679}
543 680
544our $DB; 681our $DB;
545 682
546sub db_init { 683sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
549 };
550} 685}
551 686
552sub db_get($$) { 687sub db_get($$) {
553 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
554 689
555 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
556 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
557 694
558 $! ? () 695 $! ? ()
559 : $data 696 : $data
560 }
561} 697}
562 698
563sub db_put($$$) { 699sub db_put($$$) {
564 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
621 757
622 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data); 759 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
625 761
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
627 763
628 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
631 767
641 777
642=cut 778=cut
643 779
644sub datalog($@) { 780sub datalog($@) {
645 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
646 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
647} 783}
648 784
649=back 785=back
650 786
651=cut 787=cut
652 788
653############################################################################# 789#############################################################################
654 790
655=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
656 792
657Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
660 796
661In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 799Deliantra).
664 800
665=over 4 801=over 4
666 802
667=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
668 804
712=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
713 849
714Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
716 852
717Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
719 855
720These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
721 857
722=over 4 858=over 4
846 982
847 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
848 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
849 985
850 } elsif (ref $type) { 986 } elsif (ref $type) {
851 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
852 988
853 } else { 989 } else {
854 shift @arg; 990 shift @arg;
855 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
856 } 992 }
857 } 993 }
858} 994}
859 995
860sub _object_attach { 996sub _object_attach {
870 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
871 } 1007 }
872 1008
873 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
874 } else { 1010 } else {
875 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
876 } 1012 }
877 1013
878 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
879} 1015}
880 1016
939 1075
940 for (@$callbacks) { 1076 for (@$callbacks) {
941 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
942 1078
943 if ($@) { 1079 if ($@) {
944 warn "$@";
945 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
946 override; 1081 override;
947 } 1082 }
948 1083
949 return 1 if $override; 1084 return 1 if $override;
950 } 1085 }
951 1086
952 0 1087 0
953} 1088}
954 1089
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1091
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1093
959Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
960 1095
966 1101
967=cut 1102=cut
968 1103
969############################################################################# 1104#############################################################################
970# object support 1105# object support
971#
972 1106
1107sub _object_equal($$);
1108sub _object_equal($$) {
1109 my ($a, $b) = @_;
1110
1111 return 0 unless (ref $a) eq (ref $b);
1112
1113 if ("HASH" eq ref $a) {
1114 my @ka = keys %$a;
1115 my @kb = keys %$b;
1116
1117 return 0 if @ka != @kb;
1118
1119 for (0 .. $#ka) {
1120 return 0 unless $ka[$_] eq $kb[$_];
1121 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1122 }
1123
1124 } elsif ("ARRAY" eq ref $a) {
1125
1126 return 0 if @$a != @$b;
1127
1128 for (0 .. $#$a) {
1129 return 0 unless _object_equal $a->[$_], $b->[$_];
1130 }
1131
1132 } elsif ($a ne $b) {
1133 return 0;
1134 }
1135
1136 1
1137}
1138
1139our $SLOW_MERGES;#d#
973sub _can_merge { 1140sub _can_merge {
974 my ($ob1, $ob2) = @_; 1141 my ($ob1, $ob2) = @_;
975 1142
976 local $Storable::canonical = 1; 1143 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1144
980 $fob1 eq $fob2 1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
981} 1147}
982 1148
983sub reattach { 1149sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1151 my ($obj) = @_;
986 1152
1153 # no longer needed after getting rid of delete_package?
987 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
988 1155
989 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
990 1157
991 @$registry = (); 1158 @$registry = ();
992 1159
997 for (@$attach) { 1164 for (@$attach) {
998 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
999 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1000 } 1167 }
1001 } else { 1168 } else {
1002 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1003 } 1170 }
1004 } 1171 }
1005} 1172}
1006 1173
1007cf::attachable->attach ( 1174cf::attachable->attach (
1008 prio => -1000000, 1175 prio => -1000000,
1009 on_instantiate => sub { 1176 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
1011 1178
1012 $data = from_json $data; 1179 $data = decode_json $data;
1013 1180
1014 for (@$data) { 1181 for (@$data) {
1015 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
1016 1183
1017 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
1034 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1035 1202
1036 sync_job { 1203 sync_job {
1037 if (length $$rdata) { 1204 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1041 1209
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1046 close $fh; 1217 aio_close $fh;
1047 1218
1048 if (@$objs) { 1219 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
1054 close $fh; 1228 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1230 }
1057 } else { 1231 } else {
1058 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1059 } 1233 }
1060 1234
1061 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1239 } else {
1063 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1064 } 1241 }
1065 } else { 1242 } else {
1066 aio_unlink $filename; 1243 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1068 } 1245 }
1087 1264
1088 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1267 or return;
1091 1268
1092 my $st = eval { Coro::Storable::thaw $av } 1269 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1270 $av = $st->{objs};
1095 } 1271 }
1096 1272
1097 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1100 1277
1101 ($data, $av) 1278 ($data, $av)
1102} 1279}
1103 1280
1104=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1160 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1161 1338
1162 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1163} 1340}
1164 1341
1342use File::Glob ();
1343
1165cf::player->attach ( 1344cf::player->attach (
1166 on_command => sub { 1345 on_unknown_command => sub {
1167 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1168 1347
1169 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1170 or return; 1349 or return;
1171 1350
1194 1373
1195 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1196 if $reply; 1375 if $reply;
1197 1376
1198 } else { 1377 } else {
1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1200 } 1379 }
1201 1380
1202 cf::override; 1381 cf::override;
1203 }, 1382 },
1204); 1383);
1205 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1206sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1207 cf::sync_job { 1401 cf::sync_job {
1208 my %todo; 1402 my %todo;
1209 1403
1210 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1211 next unless -r $path; 1405 next unless -r $path;
1229 1423
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1426
1233 $ext{source} = 1427 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1235 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1236 . $source 1430 . $source
1237 . "\n};\n1"; 1431 . "\n};\n1";
1238 1432
1239 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1240 } 1434 }
1241 1435
1436 my $pass = 0;
1242 my %done; 1437 my %done;
1243 while (%todo) { 1438 while (%todo) {
1244 my $progress; 1439 my $progress;
1245 1440
1441 ++$pass;
1442
1443 ext:
1246 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip 1446 next ext
1249 unless exists $done{$_}; 1447 unless exists $done{$_};
1250 } 1448 }
1251 1449
1252 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1253 1451
1254 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1255 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1256 : "$v->{base}: extension inactive.\n";
1257 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1258 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1259 warn $msg; 1459
1260 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1261 exit 1; 1461 delete $todo{$k};
1262 } 1462 } else {
1263 1463 $done{$k} = delete $todo{$k};
1264 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1265 } 1469 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1470 }
1271 1471
1272 skip: 1472 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1275 } 1480 }
1276 }; 1481 };
1277} 1482}
1278 1483
1279############################################################################# 1484#############################################################################
1280 1485
1281=back 1486=back
1282 1487
1283=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1284 1489
1285Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1286 1491
1287=cut 1492=cut
1288 1493
1289package cf::player; 1494package cf::player;
1290 1495
1333 1538
1334sub exists($) { 1539sub exists($) {
1335 my ($login) = @_; 1540 my ($login) = @_;
1336 1541
1337 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1339} 1544}
1340 1545
1341sub find($) { 1546sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1548 my $login = $_[0];
1355 my $f = new_from_file cf::object::thawer path $login 1560 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1561 or return;
1357 1562
1358 my $pl = cf::player::load_pl $f 1563 my $pl = cf::player::load_pl $f
1359 or return; 1564 or return;
1565
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1566 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1567 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1363 } 1569 }
1364 } 1570 }
1365} 1571}
1366 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1367sub save($) { 1586sub save($) {
1368 my ($pl) = @_; 1587 my ($pl) = @_;
1369 1588
1370 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1371 1590
1374 1593
1375 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1376 1595
1377 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1603
1380 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1605 cf::cede_to_tick;
1382} 1606}
1383 1607
1415 my ($pl) = @_; 1639 my ($pl) = @_;
1416 1640
1417 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1418 1642
1419 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1645
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1426 1651
1427 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1692
1468 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1469 my $path = path $login; 1694 my $path = path $login;
1470 1695
1471 # a .pst is a dead give-away for a valid player 1696 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1702 }
1477 1703
1481 1707
1482 \@logins 1708 \@logins
1483} 1709}
1484 1710
1485=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1486 1714
1487Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1488player. May block. 1716player. May block.
1489 1717
1490=cut 1718=cut
1508 } 1736 }
1509 1737
1510 \@paths 1738 \@paths
1511} 1739}
1512 1740
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1742
1515Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1744
1564=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1565 1746
1566Sends an ext reply to the player. 1747Sends an ext reply to the player.
1567 1748
1599 1780
1600=cut 1781=cut
1601 1782
1602sub find_by_path($) { 1783sub find_by_path($) {
1603 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1604 1787
1605 my ($match, $specificity); 1788 my ($match, $specificity);
1606 1789
1607 for my $region (list) { 1790 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1634our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1636 1819
1637sub generate_random_map { 1820sub generate_random_map {
1638 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1639 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1826 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1662 1848
1663sub register { 1849sub register {
1664 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller; 1851 my $pkg = caller;
1666 1852
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1669 1854
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1856}
1672 1857
1673# also paths starting with '/' 1858# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1860
1676sub thawer_merge { 1861sub thawer_merge {
1677 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1678 1863
1679 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1765 1950
1766# the temporary/swap location 1951# the temporary/swap location
1767sub save_path { 1952sub save_path {
1768 my ($self) = @_; 1953 my ($self) = @_;
1769 1954
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1772} 1957}
1773 1958
1774# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1775sub uniq_path { 1960sub uniq_path {
1776 my ($self) = @_; 1961 my ($self) = @_;
1777 1962
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1965}
1790 1966
1791sub decay_objects { 1967sub decay_objects {
1792 my ($self) = @_; 1968 my ($self) = @_;
1793 1969
1877sub find { 2053sub find {
1878 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1879 2055
1880 $path = normalise $path, $origin && $origin->path; 2056 $path = normalise $path, $origin && $origin->path;
1881 2057
1882 cf::lock_wait "map_data:$path";#d#remove 2058 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2059 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2060
1885 $cf::MAP{$path} || do { 2061 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2062 my $map = new_from_path cf::map $path
1890 or return; 2063 or return;
1891 2064
1892 $map->{last_save} = $cf::RUNTIME; 2065 $map->{last_save} = $cf::RUNTIME;
1893 2066
1895 or return; 2068 or return;
1896 2069
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2070 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2071 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2072 #$cf::WAIT_FOR_TICK->wait;
2073 undef $guard2;
1900 undef $guard1; 2074 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2075 $map->reset;
1903 return find $path; 2076 return find $path;
1904 } 2077 }
1905 2078
1906 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1907 } 2080 }
1908} 2081}
1909 2082
1910sub pre_load { } 2083sub pre_load { }
1911sub post_load { } 2084#sub post_load { } # XS
1912 2085
1913sub load { 2086sub load {
1914 my ($self) = @_; 2087 my ($self) = @_;
1915 2088
1916 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2106 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2107 $f->skip_block;
1935 $self->_load_objects ($f) 2108 $self->_load_objects ($f)
1936 or return; 2109 or return;
1937 2110
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2111 $self->post_load_original
1939 if delete $self->{load_original}; 2112 if delete $self->{load_original};
1940 2113
1941 if (my $uniq = $self->uniq_path) { 2114 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2115 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2116 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2134 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2135 $self->decay_objects;
1963 $self->fix_auto_apply; 2136 $self->fix_auto_apply;
1964 $self->update_buttons; 2137 $self->update_buttons;
1965 cf::cede_to_tick; 2138 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2139 $self->activate;
1969 } 2140 }
1970 2141
1971 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2143 $self->last_access ($cf::RUNTIME);
1973 2144
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2145 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2146 }
1976 2147
1977 $self->post_load; 2148 $self->post_load;
1978} 2149}
1979 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
1980sub customise_for { 2154sub customise_for {
1981 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
1982 2156
1983 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2158 if $self->per_player;
2000 or next; 2174 or next;
2001 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2002 or next; 2176 or next;
2003 $neigh->load; 2177 $neigh->load;
2004 2178
2179 # now find the diagonal neighbours
2005 push @neigh, 2180 push @neigh,
2006 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2007 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2008 } 2183 }
2009 2184
2016} 2191}
2017 2192
2018sub find_sync { 2193sub find_sync {
2019 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2020 2195
2021 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2022} 2200}
2023 2201
2024sub do_load_sync { 2202sub do_load_sync {
2025 my ($map) = @_; 2203 my ($map) = @_;
2026 2204
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2029 2207
2030 cf::sync_job { $map->load }; 2208 $map->load;
2031} 2209}
2032 2210
2033our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2035 2213
2037 my ($path, $origin, $load) = @_; 2215 my ($path, $origin, $load) = @_;
2038 2216
2039 $path = normalise $path, $origin && $origin->{path}; 2217 $path = normalise $path, $origin && $origin->{path};
2040 2218
2041 if (my $map = $cf::MAP{$path}) { 2219 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2220 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2221 }
2044 2222
2045 $MAP_PREFETCH{$path} |= $load; 2223 $MAP_PREFETCH{$path} |= $load;
2046 2224
2047 $MAP_PREFETCHER ||= cf::async { 2225 $MAP_PREFETCHER ||= cf::async {
2061 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2062 2240
2063 () 2241 ()
2064} 2242}
2065 2243
2244# common code, used by both ->save and ->swapout
2066sub save { 2245sub _save {
2067 my ($self) = @_; 2246 my ($self) = @_;
2068
2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
2070 2247
2071 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2072 2249
2073 return unless $self->dirty; 2250 return unless $self->dirty;
2074 2251
2083 2260
2084 cf::async { 2261 cf::async {
2085 $Coro::current->{desc} = "map player save"; 2262 $Coro::current->{desc} = "map player save";
2086 $_->contr->save for $self->players; 2263 $_->contr->save for $self->players;
2087 }; 2264 };
2265
2266 cf::get_slot 0.02;
2088 2267
2089 if ($uniq) { 2268 if ($uniq) {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2269 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2091 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2270 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2092 } else { 2271 } else {
2093 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2094 } 2273 }
2095} 2274}
2096 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2097sub swap_out { 2284sub swap_out {
2098 my ($self) = @_; 2285 my ($self) = @_;
2099 2286
2100 # save first because save cedes
2101 $self->save;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2288
2289 return if $self->in_memory != cf::MAP_ACTIVE;
2290 return if $self->{deny_save};
2105 return if $self->players; 2291 return if $self->players;
2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2107 return if $self->{deny_save};
2108 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2110 2343
2111 $self->deactivate; 2344 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2113 $self->clear; 2346 $self->clear;
2114}
2115
2116sub reset_at {
2117 my ($self) = @_;
2118
2119 # TODO: safety, remove and allow resettable per-player maps
2120 return 1e99 if $self->{deny_reset};
2121
2122 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2123 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2124
2125 $time + $to
2126}
2127
2128sub should_reset {
2129 my ($self) = @_;
2130
2131 $self->reset_at <= $cf::RUNTIME
2132}
2133
2134sub reset {
2135 my ($self) = @_;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
2139 return if $self->players;
2140
2141 warn "resetting map ", $self->path;
2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 # need to save uniques path
2146 unless ($self->{deny_save}) {
2147 my $uniq = $self->uniq_path; utf8::encode $uniq;
2148
2149 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2150 if $uniq;
2151 }
2152
2153 delete $cf::MAP{$self->path};
2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2157 $self->clear;
2158 2347
2159 $self->unlink_save; 2348 $self->unlink_save;
2160 $self->destroy; 2349 $self->destroy;
2161} 2350}
2162 2351
2170 2359
2171 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2172 2361
2173 $self->unlink_save; 2362 $self->unlink_save;
2174 2363
2175 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2176 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2177 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2178 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2180 2369
2229 2418
2230sub unique_maps() { 2419sub unique_maps() {
2231 [ 2420 [
2232 map { 2421 map {
2233 utf8::decode $_; 2422 utf8::decode $_;
2234 /\.map$/ 2423 s/\.map$//; # TODO future compatibility hack
2424 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2425 ? ()
2235 ? normalise $_ 2426 : normalise $_
2236 : ()
2237 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2238 ] 2428 ]
2239} 2429}
2240 2430
2241package cf; 2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
2242 2462
2243=back 2463=back
2244 2464
2245=head3 cf::object 2465=head3 cf::object
2246 2466
2250 2470
2251=over 4 2471=over 4
2252 2472
2253=item $ob->inv_recursive 2473=item $ob->inv_recursive
2254 2474
2255Returns the inventory of the object _and_ their inventories, recursively. 2475Returns the inventory of the object I<and> their inventories, recursively,
2476but I<not> the object itself.
2256 2477
2257=cut 2478=cut
2258 2479
2259sub inv_recursive_; 2480sub inv_recursive_;
2260sub inv_recursive_ { 2481sub inv_recursive_ {
2265 inv_recursive_ inv $_[0] 2486 inv_recursive_ inv $_[0]
2266} 2487}
2267 2488
2268=item $ref = $ob->ref 2489=item $ref = $ob->ref
2269 2490
2270creates and returns a persistent reference to an objetc that can be stored as a string. 2491Creates and returns a persistent reference to an object that can be stored as a string.
2271 2492
2272=item $ob = cf::object::deref ($refstring) 2493=item $ob = cf::object::deref ($refstring)
2273 2494
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2495returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block. 2496even if the object actually exists. May block.
2307can be C<undef>. Does the right thing when the player is currently in a 2528can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2529dialogue with the given NPC character.
2309 2530
2310=cut 2531=cut
2311 2532
2533our $SAY_CHANNEL = {
2534 id => "say",
2535 title => "Map",
2536 reply => "say ",
2537 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2538};
2539
2540our $CHAT_CHANNEL = {
2541 id => "chat",
2542 title => "Chat",
2543 reply => "chat ",
2544 tooltip => "Player chat and shouts, global to the server.",
2545};
2546
2312# rough implementation of a future "reply" method that works 2547# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2548# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2549#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2550sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2551 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2562 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2563 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2564
2330 } else { 2565 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2566 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2567 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2568 }
2334 } 2569 }
2335} 2570}
2336 2571
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2572=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2597
2363=item $player_object->enter_link 2598=item $player_object->enter_link
2364 2599
2365Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2366 2601
2367The player should be reasonably safe there for short amounts of time. You 2602The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2603for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2604though, as the player cannot control the character while it is on the link
2605map.
2369 2606
2370Will never block. 2607Will never block.
2371 2608
2372=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2373 2610
2393sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2394 my ($self) = @_; 2631 my ($self) = @_;
2395 2632
2396 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2397 2634
2635 ++$self->{_link_recursion};
2636
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2638
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2402 2641
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2643}
2405 2644
2406sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2408 2647
2425 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2427 2666
2428 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2431 2670
2432 $map->load; 2671 $map->load;
2433 $map->load_neighbours; 2672 $map->load_neighbours;
2434 2673
2435 return unless $self->contr->active; 2674 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2675
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2440} 2678 # entering was successful
2679 delete $self->{_link_recursion};
2680 # only activate afterwards, to support waiting in hooks
2681 $self->activate_recursive;
2682 }
2441 2683
2684}
2685
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2687
2444Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2690that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2691the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2692be called at the end of this process.
2449 2693
2694Note that $check will be called with a potentially non-loaded map, so if
2695it needs a loaded map it has to call C<< ->load >>.
2696
2450=cut 2697=cut
2451 2698
2452our $GOTOGEN; 2699our $GOTOGEN;
2453 2700
2454sub cf::object::player::goto { 2701sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2456 2709
2457 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2712
2460 $self->enter_link; 2713 $self->enter_link;
2484 my $map = eval { 2737 my $map = eval {
2485 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2486 2739
2487 if ($map) { 2740 if ($map) {
2488 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2489 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2490 } else { 2743 } else {
2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2492 } 2745 }
2493 2746
2494 $map 2747 $map
2502 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2503 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2504 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2505 } 2758 }
2506 2759
2507 $done->() if $done; 2760 $done->($self) if $done;
2508 })->prio (1); 2761 })->prio (1);
2509} 2762}
2510 2763
2511=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2512 2765
2532} 2785}
2533 2786
2534sub prepare_random_map { 2787sub prepare_random_map {
2535 my ($exit) = @_; 2788 my ($exit) = @_;
2536 2789
2537 my $guard = cf::lock_acquire "exit_prepare:$exit";
2538
2539 # all this does is basically replace the /! path by 2790 # all this does is basically replace the /! path by
2540 # a new random map path (?random/...) with a seed 2791 # a new random map path (?random/...) with a seed
2541 # that depends on the exit object 2792 # that depends on the exit object
2542 2793
2543 my $rmp = parse_random_map_params $exit->msg; 2794 my $rmp = parse_random_map_params $exit->msg;
2545 if ($exit->map) { 2796 if ($exit->map) {
2546 $rmp->{region} = $exit->region->name; 2797 $rmp->{region} = $exit->region->name;
2547 $rmp->{origin_map} = $exit->map->path; 2798 $rmp->{origin_map} = $exit->map->path;
2548 $rmp->{origin_x} = $exit->x; 2799 $rmp->{origin_x} = $exit->x;
2549 $rmp->{origin_y} = $exit->y; 2800 $rmp->{origin_y} = $exit->y;
2801
2802 $exit->map->touch;
2550 } 2803 }
2551 2804
2552 $rmp->{random_seed} ||= $exit->random_seed; 2805 $rmp->{random_seed} ||= $exit->random_seed;
2553 2806
2554 my $data = cf::to_json $rmp; 2807 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2555 my $md5 = Digest::MD5::md5_hex $data; 2808 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2809 my $meta = "$RANDOMDIR/$md5.meta";
2557 2810
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2811 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2812 aio_write $fh, 0, (length $data), $data, 0;
2560 undef $fh; 2813 undef $fh;
2561 aio_rename "$meta~", $meta; 2814 aio_rename "$meta~", $meta;
2562 2815
2816 my $slaying = "?random/$md5";
2817
2818 if ($exit->valid) {
2563 $exit->slaying ("?random/$md5"); 2819 $exit->slaying ("?random/$md5");
2564 $exit->msg (undef); 2820 $exit->msg (undef);
2821 }
2565 } 2822 }
2566} 2823}
2567 2824
2568sub cf::object::player::enter_exit { 2825sub cf::object::player::enter_exit {
2569 my ($self, $exit) = @_; 2826 my ($self, $exit) = @_;
2570 2827
2571 return unless $self->type == cf::PLAYER; 2828 return unless $self->type == cf::PLAYER;
2572 2829
2573 if ($exit->slaying eq "/!") {
2574 #TODO: this should de-fi-ni-te-ly not be a sync-job
2575 # the problem is that $exit might not survive long enough
2576 # so it needs to be done right now, right here
2577 cf::sync_job { prepare_random_map $exit };
2578 }
2579
2580 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2581 my $hp = $exit->stats->hp;
2582 my $sp = $exit->stats->sp;
2583
2584 $self->enter_link; 2830 $self->enter_link;
2585 2831
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2590 (async { 2832 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2833 $Coro::current->{desc} = "enter_exit";
2592 2834
2593 $self->deactivate_recursive; # just to be sure
2594 unless (eval { 2835 unless (eval {
2836 $self->deactivate_recursive; # just to be sure
2837
2838 # random map handling
2839 {
2840 my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842 prepare_random_map $exit
2843 if $exit->slaying eq "/!";
2844 }
2845
2846 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2847 my $x = $exit->stats->hp;
2848 my $y = $exit->stats->sp;
2849
2595 $self->goto ($slaying, $hp, $sp); 2850 $self->goto ($map, $x, $y);
2596 2851
2852 # if exit is damned, update players death & WoR home-position
2853 $self->contr->savebed ($map, $x, $y)
2854 if $exit->flag (cf::FLAG_DAMNED);
2855
2597 1; 2856 1
2598 }) { 2857 }) {
2599 $self->message ("Something went wrong deep within the crossfire server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2600 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2601 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2602 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2603 2862
2604 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2605 $self->leave_link; 2864 $self->leave_link;
2606 } 2865 }
2607 })->prio (1); 2866 })->prio (1);
2608} 2867}
2609 2868
2621sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2622 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2623 2882
2624 utf8::encode $text; 2883 utf8::encode $text;
2625 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2626} 2910}
2627 2911
2628=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2629 2913
2630Send a drawinfo or msg packet to the client, formatting the msg for the 2914Send a drawinfo or msg packet to the client, formatting the msg for the
2632the message, with C<log> being the default. If C<$color> is negative, suppress 2916the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet. 2917the message unless the client supports the msg packet.
2634 2918
2635=cut 2919=cut
2636 2920
2921# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2638 "c/identify" => { 2929 "c/identify" => {
2639 id => "infobox", 2930 id => "infobox",
2640 title => "Identify", 2931 title => "Identify",
2641 reply => undef, 2932 reply => undef,
2642 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
2645 id => "infobox", 2936 id => "infobox",
2646 title => "Examine", 2937 title => "Examine",
2647 reply => undef, 2938 reply => undef,
2648 tooltip => "Signs and other items you examined", 2939 tooltip => "Signs and other items you examined",
2649 }, 2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2946 },
2947 "c/book" => {
2948 id => "infobox",
2949 title => "Book",
2950 reply => undef,
2951 tooltip => "The contents of a note or book",
2952 },
2650 "c/lookat" => { 2953 "c/lookat" => {
2651 id => "infobox", 2954 id => "infobox",
2652 title => "Look", 2955 title => "Look",
2653 reply => undef, 2956 reply => undef,
2654 tooltip => "What you saw there", 2957 tooltip => "What you saw there",
2655 }, 2958 },
2959 "c/who" => {
2960 id => "infobox",
2961 title => "Players",
2962 reply => undef,
2963 tooltip => "Shows players who are currently online",
2964 },
2965 "c/body" => {
2966 id => "infobox",
2967 title => "Body Parts",
2968 reply => undef,
2969 tooltip => "Shows which body parts you posess and are available",
2970 },
2971 "c/statistics" => {
2972 id => "infobox",
2973 title => "Statistics",
2974 reply => undef,
2975 tooltip => "Shows your primary statistics",
2976 },
2977 "c/skills" => {
2978 id => "infobox",
2979 title => "Skills",
2980 reply => undef,
2981 tooltip => "Shows your experience per skill and item power",
2982 },
2983 "c/shopitems" => {
2984 id => "infobox",
2985 title => "Shop Items",
2986 reply => undef,
2987 tooltip => "Shows the items currently for sale in this shop",
2988 },
2989 "c/resistances" => {
2990 id => "infobox",
2991 title => "Resistances",
2992 reply => undef,
2993 tooltip => "Shows your resistances",
2994 },
2995 "c/pets" => {
2996 id => "infobox",
2997 title => "Pets",
2998 reply => undef,
2999 tooltip => "Shows information abotu your pets/a specific pet",
3000 },
3001 "c/perceiveself" => {
3002 id => "infobox",
3003 title => "Perceive Self",
3004 reply => undef,
3005 tooltip => "You gained detailed knowledge about yourself",
3006 },
3007 "c/uptime" => {
3008 id => "infobox",
3009 title => "Uptime",
3010 reply => undef,
3011 tooltip => "How long the server has been running since last restart",
3012 },
3013 "c/mapinfo" => {
3014 id => "infobox",
3015 title => "Map Info",
3016 reply => undef,
3017 tooltip => "Information related to the maps",
3018 },
3019 "c/party" => {
3020 id => "party",
3021 title => "Party",
3022 reply => "gsay ",
3023 tooltip => "Messages and chat related to your party",
3024 },
3025 "c/death" => {
3026 id => "death",
3027 title => "Death",
3028 reply => undef,
3029 tooltip => "Reason for and more info about your most recent death",
3030 },
3031 "c/say" => $SAY_CHANNEL,
3032 "c/chat" => $CHAT_CHANNEL,
2656); 3033);
2657 3034
2658sub cf::client::send_msg { 3035sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 3036 my ($self, $channel, $msg, $color, @extra) = @_;
2660 3037
2661 $msg = $self->pl->expand_cfpod ($msg); 3038 $msg = $self->pl->expand_cfpod ($msg)
3039 unless $color & cf::NDI_VERBATIM;
2662 3040
2663 $color &= cf::NDI_CLIENT_MASK; # just in case... 3041 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664 3042
2665 # check predefined channels, for the benefit of C 3043 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) { 3044 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel}; 3045 $channel = $CHANNEL{$channel};
2668 3046
2669 $self->ext_msg (channel_info => $channel) 3047 $self->ext_msg (channel_info => $channel);
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id}; 3048 $channel = $channel->{id};
2673 3049
2674 } elsif (ref $channel) { 3050 } elsif (ref $channel) {
2675 # send meta info to client, if not yet sent 3051 # send meta info to client, if not yet sent
2676 unless (exists $self->{channel}{$channel->{id}}) { 3052 unless (exists $self->{channel}{$channel->{id}}) {
2677 $self->{channel}{$channel->{id}} = $channel; 3053 $self->{channel}{$channel->{id}} = $channel;
2678 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2679 if $self->can_msg;
2680 } 3055 }
2681 3056
2682 $channel = $channel->{id}; 3057 $channel = $channel->{id};
2683 } 3058 }
2684 3059
2685 return unless @extra || length $msg; 3060 return unless @extra || length $msg;
2686 3061
2687 if ($self->can_msg) {
2688 # default colour, mask it out 3062 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3063 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF; 3064 if $color & cf::NDI_DEF;
2691 3065
2692 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3066 my $pkt = "msg "
3067 . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2694 } else { 3069 );
2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705 3070
2706 $color &= cf::NDI_COLOR_MASK; 3071 $self->send_big_packet ($pkt);
2707
2708 utf8::encode $msg;
2709
2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2713 } else {
2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2715 $self->send_packet ("drawinfo $color $msg")
2716 }
2717 }
2718 }
2719} 3072}
2720 3073
2721=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2722 3075
2723Sends an ext event to the client. 3076Sends an ext event to the client.
2726 3079
2727sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2728 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2729 3082
2730 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2733 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 } 3088 }
2736} 3089}
2737 3090
2738=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2739 3092
2743 3096
2744sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2746 3099
2747 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove 3103 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 } 3106 }
2754} 3107}
2755 3108
2756=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2757 3110
2828 3181
2829 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
2830 if $reply; 3183 if $reply;
2831 3184
2832 } else { 3185 } else {
2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2834 } 3187 }
2835 3188
2836 cf::override; 3189 cf::override;
2837 }, 3190 },
2838); 3191);
2858 3211
2859 $coro 3212 $coro
2860} 3213}
2861 3214
2862cf::client->attach ( 3215cf::client->attach (
2863 on_destroy => sub { 3216 on_client_destroy => sub {
2864 my ($ns) = @_; 3217 my ($ns) = @_;
2865 3218
2866 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2867 }, 3220 },
2868); 3221);
2884our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
2885 3238
2886$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
2887 3240
2888$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
2890 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
2891 sort time 3244 sort time
2892)); 3245));
2893 3246
2894# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
2896=pod 3249=pod
2897 3250
2898The following functions and methods are available within a safe environment: 3251The following functions and methods are available within a safe environment:
2899 3252
2900 cf::object 3253 cf::object
2901 contr pay_amount pay_player map x y force_find force_add 3254 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr 3255 insert remove name archname title slaying race decrease split
3256 value
2903 3257
2904 cf::object::player 3258 cf::object::player
2905 player 3259 player
2906 3260
2907 cf::player 3261 cf::player
2912 3266
2913=cut 3267=cut
2914 3268
2915for ( 3269for (
2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3270 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race 3271 insert remove inv nrof name archname title slaying race
2918 decrease_ob_nr)], 3272 decrease split destroy change_exp value msg lore send_msg)],
2919 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
2920 ["cf::player" => qw(peaceful)], 3274 ["cf::player" => qw(peaceful send_msg)],
2921 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
2922) { 3276) {
2923 no strict 'refs';
2924 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
2925 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2926 for @funs; 3279 for @funs;
2927} 3280}
2928 3281
2943 3296
2944 my $qcode = $code; 3297 my $qcode = $code;
2945 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2946 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
2947 3300
3301 %vars = (_dummy => 0) unless %vars;
3302
3303 my @res;
2948 local $_; 3304 local $_;
2949 local @safe::cf::_safe_eval_args = values %vars;
2950 3305
2951 my $eval = 3306 my $eval =
2952 "do {\n" 3307 "do {\n"
2953 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2954 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
2955 . $code 3310 . $code
2956 . "\n}" 3311 . "\n}"
2957 ; 3312 ;
2958 3313
3314 if ($CFG{safe_eval}) {
2959 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
2960 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2961 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
2962 3323
2963 if ($@) { 3324 if ($@) {
2964 warn "$@"; 3325 warn "$@",
2965 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
2966 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
2967 } 3328 }
2968 3329
2969 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
2970} 3331}
2971 3332
2985=cut 3346=cut
2986 3347
2987sub register_script_function { 3348sub register_script_function {
2988 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
2989 3350
2990 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
2991 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
2992} 3353}
2993 3354
2994=back 3355=back
2995 3356
2996=cut 3357=cut
2997 3358
2998############################################################################# 3359#############################################################################
2999# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3000 3403
3001sub load_facedata($) { 3404sub load_facedata($) {
3002 my ($path) = @_; 3405 my ($path) = @_;
3003 3406
3004 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?) 3408 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3007 3410
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009 3412
3010 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3011 3414
3012 my $facedata; 3415 my $facedata;
3013 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3014 or die "$path: $!"; 3417 or die "$path: $!";
3015 3418
3017 3420
3018 $facedata->{version} == 2 3421 $facedata->{version} == 2
3019 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3020 3423
3021 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3022 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC, 3427 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3025 }; 3430 };
3026 cf::cede_to_tick; 3431 cf::cede_to_tick;
3027 3432
3028 { 3433 {
3029 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3030 3435
3031 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438
3033 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3037 3443
3038 cf::cede_to_tick; 3444 cf::cede_to_tick;
3039 } 3445 }
3040 3446
3041 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3448 next unless $info->{smooth};
3449
3043 my $idx = cf::face::find $face 3450 my $idx = cf::face::find $face
3044 or next; 3451 or next;
3452
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3456 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3050 } 3458 }
3051 3459
3052 cf::cede_to_tick; 3460 cf::cede_to_tick;
3053 } 3461 }
3054 } 3462 }
3063 3471
3064 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3065 } 3473 }
3066 3474
3067 { 3475 {
3068 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3071 3477
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3479 if (defined $info->{type}) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
3077 3481
3078 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3079 # prepend meta info 3483 cf::face::set_type $idx, $info->{type};
3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
3086 $data = pack "(w/a*)*", $meta, $info->{data};
3087 } else { 3484 } else {
3088 $data = $info->{data}; 3485 $RESOURCE{$name} = $info; # unused
3089 } 3486 }
3090 3487
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick; 3488 cf::cede_to_tick;
3095 } 3489 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 } 3490 }
3491
3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115 3493
3116 1 3494 1
3117} 3495}
3118 3496
3119register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3121 3499
3122 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v); 3501 $ns->fx_want ($k, $v);
3124 } 3502 }
3125}; 3503};
3504
3505sub load_resource_file($) {
3506 my $guard = lock_acquire "load_resource_file";
3507
3508 my $status = load_resource_file_ $_[0];
3509 get_slot 0.1, 100;
3510 cf::arch::commit_load;
3511
3512 $status
3513}
3126 3514
3127sub reload_regions { 3515sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework 3516 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?) 3517 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3518 %ext::player_env::MUSIC_FACE_CACHE = ();
3144} 3532}
3145 3533
3146sub reload_archetypes { 3534sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes" 3535 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n"; 3536 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references
3150 # this really needs to be done in an extra post-pass
3151 # (which needs to be synchronous, so solve it differently)
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
3154} 3537}
3155 3538
3156sub reload_treasures { 3539sub reload_treasures {
3157 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3158 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3159} 3542}
3160 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3161sub reload_resources { 3567sub reload_resources {
3162 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3163 3569
3570 reload_facedata;
3571 reload_sound;
3572 reload_archetypes;
3164 reload_regions; 3573 reload_regions;
3165 reload_facedata;
3166 #reload_archetypes;#d#
3167 reload_archetypes;
3168 reload_treasures; 3574 reload_treasures;
3169 3575
3170 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3171}
3172
3173sub init {
3174 reload_resources;
3175} 3577}
3176 3578
3177sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3178 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3179 or return; 3583 or return;
3180 3584
3181 local $/; 3585 local $/;
3182 *CFG = YAML::Syck::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3183 3587
3184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3185 3589
3186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3188 3592
3189 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3192 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3193 }; 3597 };
3194 warn $@ if $@; 3598 warn $@ if $@;
3195 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3602}
3603
3604sub pidfile() {
3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606 or die "$PIDFILE: $!";
3607 flock $fh, &Fcntl::LOCK_EX
3608 or die "$PIDFILE: flock: $!";
3609 $fh
3610}
3611
3612# make sure only one server instance is running at any one time
3613sub atomic {
3614 my $fh = pidfile;
3615
3616 my $pid = <$fh>;
3617 kill 9, $pid if $pid > 0;
3618
3619 seek $fh, 0, 0;
3620 print $fh $$;
3621}
3622
3623sub main_loop {
3624 trace "EV::loop starting\n";
3625 if (1) {
3626 EV::loop;
3627 }
3628 trace "EV::loop returned\n";
3629 goto &main_loop unless $REALLY_UNLOOP;
3196} 3630}
3197 3631
3198sub main { 3632sub main {
3633 cf::init_globals; # initialise logging
3634
3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639
3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641
3199 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3644 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3202 (async { 3645 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3646 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3647 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3648 })->prio (Coro::PRIO_MAX);
3206 }; 3649 };
3207 3650
3651 evthread_start IO::AIO::poll_fileno;
3652
3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3664 reload_resources;
3208 reload_config; 3665 reload_config;
3209 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
3210 load_extensions; 3676 load_extensions;
3211 3677
3212 $TICK_WATCHER->start; 3678 utime time, time, $RUNTIMEFILE;
3213 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 (pop @POST_INIT)->(0) while @POST_INIT;
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;
3214} 3696}
3215 3697
3216############################################################################# 3698#############################################################################
3217# initialisation and cleanup 3699# initialisation and cleanup
3218 3700
3219# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3220BEGIN { 3702BEGIN {
3703 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3229 },
3230 ); 3707 };
3231 } 3708 }
3232} 3709}
3233 3710
3234sub write_runtime { 3711sub write_runtime_sync {
3235 my $runtime = "$LOCALDIR/runtime"; 3712 my $t0 = AE::time;
3236 3713
3237 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3239 3716
3240 IO::AIO::aio_utime $runtime, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3241 3718
3242 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3243 3720
3244 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3245 or return; 3722 or return;
3246 3723
3247 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3248 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3249 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3259 aio_utime $fh, undef, undef; 3736 aio_utime $fh, undef, undef;
3260 3737
3261 close $fh 3738 close $fh
3262 or return; 3739 or return;
3263 3740
3264 aio_rename "$runtime~", $runtime 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3265 and return; 3742 and return;
3266 3743
3267 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3268 3745
3269 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 };
3270} 3797}
3271 3798
3272sub emergency_save() { 3799sub emergency_save() {
3273 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3274 3801
3275 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;
3276 3808
3277 cf::sync_job { 3809 cf::sync_job {
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3278 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3279 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3280 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3281 warn "begin emergency player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3282 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3283 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3284 $pl->valid or next; 3818 $pl->valid or next;
3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3285 $pl->save; 3820 $pl->save;
3286 } 3821 }
3287 warn "end emergency player save\n"; 3822 info "emergency_perl_save: end player save\n";
3288 3823
3289 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";
3290 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3291 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3292 $map->valid or next; 3829 $map->valid or next;
3293 $map->save; 3830 $map->save;
3294 } 3831 }
3295 warn "end emergency map save\n"; 3832 info "emergency_perl_save: end map save\n";
3296 3833
3297 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";
3298 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3299 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
3300 }; 3862 };
3301 3863
3302 warn "leave emergency perl save\n"; 3864 info "emergency_perl_save: leave\n";
3303} 3865}
3304 3866
3305sub post_cleanup { 3867sub post_cleanup {
3306 my ($make_core) = @_; 3868 my ($make_core) = @_;
3307 3869
3870 IO::AIO::flush;
3871
3308 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3309 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 }
3310} 3902}
3311 3903
3312sub do_reload_perl() { 3904sub do_reload_perl() {
3313 # can/must only be called in main 3905 # can/must only be called in main
3314 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3315 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3316 return; 3908 return;
3317 } 3909 }
3318 3910
3911 return if $RELOAD++;
3912
3913 my $t1 = AE::time;
3914
3915 while ($RELOAD) {
3319 warn "reloading..."; 3916 info "reloading...";
3320 3917
3321 warn "entering sync_job"; 3918 trace "entering sync_job";
3322 3919
3323 cf::sync_job { 3920 cf::sync_job {
3324 cf::write_runtime; # external watchdog should not bark
3325 cf::emergency_save; 3921 cf::emergency_save;
3326 cf::write_runtime; # external watchdog should not bark
3327 3922
3328 warn "syncing database to disk";
3329 BDB::db_env_txn_checkpoint $DB_ENV;
3330
3331 # if anything goes wrong in here, we should simply crash as we already saved
3332
3333 warn "cancelling all WF_AUTOCANCEL watchers";
3334 for (Event::all_watchers) {
3335 $_->cancel if $_->data & WF_AUTOCANCEL;
3336 }
3337
3338 warn "flushing outstanding aio requests";
3339 for (;;) {
3340 BDB::flush;
3341 IO::AIO::flush;
3342 Coro::cede;
3343 last unless IO::AIO::nreqs || BDB::nreqs;
3344 warn "iterate...";
3345 }
3346
3347 ++$RELOAD;
3348
3349 warn "cancelling all extension coros"; 3923 trace "cancelling all extension coros";
3350 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3351 %EXT_CORO = (); 3925 %EXT_CORO = ();
3352 3926
3353 warn "removing commands"; 3927 trace "removing commands";
3354 %COMMAND = (); 3928 %COMMAND = ();
3355 3929
3356 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3357 %EXTCMD = (); 3931 %EXTCMD = ();
3358 %EXTICMD = (); 3932 %EXTICMD = ();
3359 3933
3360 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3361 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3362 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3363 3937
3364 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3365 eval { 3939 eval {
3366 $cb->($pkg); 3940 $cb->($pkg);
3367 1 3941 1
3368 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3943 }
3944
3945 trace "... clearing $pkg";
3946 clear_package $pkg;
3369 } 3947 }
3370 3948
3371 warn "... nuking $pkg";
3372 Symbol::delete_package $pkg;
3373 }
3374
3375 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3376 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3377 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3378 3952
3379 warn "... unloading $k"; 3953 trace "... unloading $k";
3380 delete $INC{$k}; 3954 delete $INC{$k};
3381 3955
3382 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3383 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3384 3958
3385 if (my $cb = $k->can ("unload_module")) { 3959 if (my $cb = $k->can ("unload_module")) {
3386 $cb->(); 3960 $cb->();
3961 }
3962
3963 clear_package $k;
3387 } 3964 }
3388 3965
3389 Symbol::delete_package $k;
3390 }
3391
3392 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3393 Symbol::delete_package "safe::$_" 3967 clear_package "safe::$_"
3394 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3395 3969
3396 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3397 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3398 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3399 3973
3400 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3401 # and global variables created in xs 3975 # and global variables created in xs
3402 #Symbol::delete_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3403 3977
3404 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3405 3979
3406 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3407 require cf; 3981 require cf;
3408 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3409 3983
3410 warn "loading config and database again"; 3984 trace "loading config and database again";
3411 cf::reload_config; 3985 cf::reload_config;
3412 3986
3413 warn "loading extensions"; 3987 trace "loading extensions";
3414 cf::load_extensions; 3988 cf::load_extensions;
3415 3989
3990 if ($REATTACH_ON_RELOAD) {
3416 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3417 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3418 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3419 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3420 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3421 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3997 }
3422 3998
3999 trace "running post_init jobs";
4000 (pop @POST_INIT)->(1) while @POST_INIT;
4001
3423 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3424 4003
3425 1 4004 1
3426 } or do { 4005 } or do {
3427 warn $@; 4006 error $@;
3428 warn "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3429 exit 1; 4008 };
4009
4010 info "reloaded";
4011 --$RELOAD;
3430 }; 4012 }
3431 4013
3432 warn "reloaded"; 4014 $t1 = AE::time - $t1;
4015 info "reload completed in ${t1}s\n";
3433}; 4016};
3434 4017
3435our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3436 4019
3437sub reload_perl() { 4020sub reload_perl() {
3438 # doing reload synchronously and two reloads happen back-to-back, 4021 # doing reload synchronously and two reloads happen back-to-back,
3439 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3440 4023
3441 $RELOAD_WATCHER ||= Event->timer ( 4024 $RELOAD_WATCHER ||= cf::async {
3442 reentrant => 0, 4025 Coro::AIO::aio_wait cache_extensions;
3443 after => 0, 4026
3444 data => WF_AUTOCANCEL, 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3445 cb => sub {
3446 do_reload_perl; 4028 do_reload_perl;
3447 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3448 }, 4030 };
3449 ); 4031 };
3450} 4032}
3451 4033
3452register_command "reload" => sub { 4034register_command "reload" => sub {
3453 my ($who, $arg) = @_; 4035 my ($who, $arg) = @_;
3454 4036
3459 reload_perl; 4041 reload_perl;
3460 }; 4042 };
3461 } 4043 }
3462}; 4044};
3463 4045
3464unshift @INC, $LIBDIR; 4046#############################################################################
3465 4047
3466my $bug_warning = 0; 4048my $bug_warning = 0;
3467 4049
3468our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3469our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3470 4052
3471sub wait_for_tick { 4053sub wait_for_tick {
3472 return unless $TICK_WATCHER->is_active;
3473 return if $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3474 4055
3475 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3476 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3477 $signal->wait; 4058 $signal->wait;
3478} 4059}
3479 4060
3480sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3481 return unless $TICK_WATCHER->is_active;
3482 return if $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3483 4063
3484 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3485 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3486 $signal->wait; 4066 $signal->wait;
3487} 4067}
3488 4068
3489$TICK_WATCHER = Event->timer ( 4069sub tick {
3490 reentrant => 0,
3491 parked => 1,
3492 prio => 0,
3493 at => $NEXT_TICK || $TICK,
3494 data => WF_AUTOCANCEL,
3495 cb => sub {
3496 if ($Coro::current != $Coro::main) { 4070 if ($Coro::current != $Coro::main) {
3497 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4071 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3498 unless ++$bug_warning > 10; 4072 unless ++$bug_warning > 10;
3499 return; 4073 return;
3500 } 4074 }
3501 4075
3502 $NOW = $tick_start = Event::time;
3503
3504 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3505 4077
3506 $RUNTIME += $TICK; 4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3507 $NEXT_TICK += $TICK;
3508 4079
3509 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3510 $NEXT_RUNTIME_WRITE = $NOW + 10; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3511 Coro::async_pool { 4082 Coro::async_pool {
3512 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3513 write_runtime 4084 write_runtime_sync
3514 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3515 };
3516 } 4086 };
4087 }
3517 4088
3518 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3519 $sig->send; 4090 $sig->send;
3520 } 4091 }
3521 while (my $sig = shift @WAIT_FOR_TICK) { 4092 while (my $sig = shift @WAIT_FOR_TICK) {
3522 $sig->send; 4093 $sig->send;
3523 } 4094 }
3524 4095
3525 $NOW = Event::time; 4096 $LOAD = ($NOW - $TICK_START) / $TICK;
3526
3527 # if we are delayed by four ticks or more, skip them all
3528 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3529
3530 $TICK_WATCHER->at ($NEXT_TICK);
3531 $TICK_WATCHER->start;
3532
3533 $LOAD = ($NOW - $tick_start) / $TICK;
3534 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4097 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3535 4098
3536 _post_tick; 4099 if (0) {
4100 if ($NEXT_TICK) {
4101 my $jitter = $TICK_START - $NEXT_TICK;
4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4103 debug "jitter $JITTER\n";#d#
4104 }
3537 }, 4105 }
3538); 4106}
3539 4107
3540{ 4108{
4109 # configure BDB
4110
3541 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3542 BDB::max_poll_time $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3543 $BDB_POLL_WATCHER = Event->io ( 4113 $AnyEvent::BDB::WATCHER->priority (1);
3544 reentrant => 0,
3545 fd => BDB::poll_fileno,
3546 poll => 'r',
3547 prio => 0,
3548 data => WF_AUTOCANCEL,
3549 cb => \&BDB::poll_cb,
3550 );
3551
3552 BDB::set_sync_prepare {
3553 my $status;
3554 my $current = $Coro::current;
3555 (
3556 sub {
3557 $status = $!;
3558 $current->ready; undef $current;
3559 },
3560 sub {
3561 Coro::schedule while defined $current;
3562 $! = $status;
3563 },
3564 )
3565 };
3566 4114
3567 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3568 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
3569 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4117 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3570 | BDB::LOG_AUTOREMOVE, 1); 4118 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4119 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3571 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4120 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3572 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4121 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3573 4122
3574 cf::sync_job { 4123 cf::sync_job {
3575 eval { 4124 eval {
3585 4134
3586 cf::cleanup "db_env_open(db): $@" if $@; 4135 cf::cleanup "db_env_open(db): $@" if $@;
3587 }; 4136 };
3588 } 4137 }
3589 4138
3590 $BDB_DEADLOCK_WATCHER = Event->timer ( 4139 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3591 after => 3,
3592 interval => 1,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4140 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3598 },
3599 ); 4141 };
3600 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4142 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3601 after => 11,
3602 interval => 60,
3603 hard => 1,
3604 prio => 0,
3605 data => WF_AUTOCANCEL,
3606 cb => sub {
3607 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4143 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3608 },
3609 ); 4144 };
3610 $BDB_TRICKLE_WATCHER = Event->timer ( 4145 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3611 after => 5,
3612 interval => 10,
3613 hard => 1,
3614 prio => 0,
3615 data => WF_AUTOCANCEL,
3616 cb => sub {
3617 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4146 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3618 },
3619 ); 4147 };
3620} 4148}
3621 4149
3622{ 4150{
4151 # configure IO::AIO
4152
3623 IO::AIO::min_parallel 8; 4153 IO::AIO::min_parallel 8;
3624
3625 undef $Coro::AIO::WATCHER;
3626 IO::AIO::max_poll_time $TICK * 0.1; 4154 IO::AIO::max_poll_time $TICK * 0.1;
3627 $AIO_POLL_WATCHER = Event->io ( 4155 undef $AnyEvent::AIO::WATCHER;
3628 reentrant => 0,
3629 data => WF_AUTOCANCEL,
3630 fd => IO::AIO::poll_fileno,
3631 poll => 'r',
3632 prio => 0,
3633 cb => \&IO::AIO::poll_cb,
3634 );
3635} 4156}
3636 4157
3637my $_log_backtrace; 4158my $_log_backtrace;
3638 4159
3639sub _log_backtrace { 4160sub _log_backtrace {
3642 $msg =~ s/\n//; 4163 $msg =~ s/\n//;
3643 4164
3644 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
3645 if ($_log_backtrace < 2) { 4166 if ($_log_backtrace < 2) {
3646 ++$_log_backtrace; 4167 ++$_log_backtrace;
4168 my $perl_bt = Carp::longmess $msg;
3647 async { 4169 async {
3648 $Coro::current->{desc} = "abt $msg"; 4170 $Coro::current->{desc} = "abt $msg";
3649 4171
3650 my @bt = fork_call { 4172 my @bt = fork_call {
3651 @addr = map { sprintf "%x", $_ } @addr; 4173 @addr = map { sprintf "%x", $_ } @addr;
3662 } 4184 }
3663 4185
3664 @funcs 4186 @funcs
3665 }; 4187 };
3666 4188
3667 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $perl_bt\n";
4190 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3668 LOG llevInfo, "[ABT] $_\n" for @bt; 4191 LOG llevInfo, "[ABT] $_\n" for @bt;
3669 --$_log_backtrace; 4192 --$_log_backtrace;
3670 }; 4193 };
3671 } else { 4194 } else {
3672 LOG llevInfo, "[ABT] $msg\n"; 4195 LOG llevInfo, "[ABT] $msg\n";
3673 LOG llevInfo, "[ABT] [suppressed]\n"; 4196 LOG llevInfo, "[ABT] [suppressed]\n";
3674 } 4197 }
3675} 4198}
3676 4199
3677# load additional modules 4200# load additional modules
3678use cf::pod; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3679 4203
3680END { cf::emergency_save } 4204END { cf::emergency_save }
3681 4205
36821 42061
3683 4207

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines