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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 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 3.64 (); 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.32 (); 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 = 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 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
1093 } 1271 }
1094 1272
1095 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1098 1277
1099 ($data, $av) 1278 ($data, $av)
1100} 1279}
1101 1280
1102=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1158 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1159 1338
1160 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1161} 1340}
1162 1341
1342use File::Glob ();
1343
1163cf::player->attach ( 1344cf::player->attach (
1164 on_command => sub { 1345 on_unknown_command => sub {
1165 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1166 1347
1167 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1168 or return; 1349 or return;
1169 1350
1192 1373
1193 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1194 if $reply; 1375 if $reply;
1195 1376
1196 } else { 1377 } else {
1197 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1198 } 1379 }
1199 1380
1200 cf::override; 1381 cf::override;
1201 }, 1382 },
1202); 1383);
1203 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
1204sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1205 cf::sync_job { 1401 cf::sync_job {
1206 my %todo; 1402 my %todo;
1207 1403
1208 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1209 next unless -r $path; 1405 next unless -r $path;
1227 1423
1228 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1229 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1230 1426
1231 $ext{source} = 1427 $ext{source} =
1232 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1233 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1234 . $source 1430 . $source
1235 . "\n};\n1"; 1431 . "\n};\n1";
1236 1432
1237 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1238 } 1434 }
1239 1435
1436 my $pass = 0;
1240 my %done; 1437 my %done;
1241 while (%todo) { 1438 while (%todo) {
1242 my $progress; 1439 my $progress;
1243 1440
1441 ++$pass;
1442
1443 ext:
1244 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1245 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1246 goto skip 1446 next ext
1247 unless exists $done{$_}; 1447 unless exists $done{$_};
1248 } 1448 }
1249 1449
1250 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1251 1451
1252 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1253 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1254 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1255 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1256 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1257 warn $msg; 1460
1258 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1259 exit 1; 1462 delete $todo{$k};
1260 } 1463 } else {
1261 1464 $done{$k} = delete $todo{$k};
1262 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1263 } 1470 }
1264
1265 $done{$k} = delete $todo{$k};
1266 push @EXTS, $v->{pkg};
1267 $progress = 1;
1268 } 1471 }
1269 1472
1270 skip: 1473 unless ($progress) {
1271 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1272 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1273 } 1481 }
1274 }; 1482 };
1275} 1483}
1276 1484
1277############################################################################# 1485#############################################################################
1278 1486
1279=back 1487=back
1280 1488
1281=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1282 1490
1283Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1284 1492
1285=cut 1493=cut
1286 1494
1287package cf::player; 1495package cf::player;
1288 1496
1331 1539
1332sub exists($) { 1540sub exists($) {
1333 my ($login) = @_; 1541 my ($login) = @_;
1334 1542
1335 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1336 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1337} 1545}
1338 1546
1339sub find($) { 1547sub find($) {
1340 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1341 my $login = $_[0]; 1549 my $login = $_[0];
1353 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1562 or return;
1355 1563
1356 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1357 or return; 1565 or return;
1566
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1361 } 1570 }
1362 } 1571 }
1363} 1572}
1364 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1365sub save($) { 1587sub save($) {
1366 my ($pl) = @_; 1588 my ($pl) = @_;
1367 1589
1368 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1369 1591
1372 1594
1373 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1374 1596
1375 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1377 1604
1378 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1606 cf::cede_to_tick;
1380} 1607}
1381 1608
1413 my ($pl) = @_; 1640 my ($pl) = @_;
1414 1641
1415 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1416 1643
1417 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1418 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1419 1646
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1424 1652
1425 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1465 1693
1466 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1467 my $path = path $login; 1695 my $path = path $login;
1468 1696
1469 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1703 }
1475 1704
1479 1708
1480 \@logins 1709 \@logins
1481} 1710}
1482 1711
1483=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1484 1715
1485Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1486player. May block. 1717player. May block.
1487 1718
1488=cut 1719=cut
1506 } 1737 }
1507 1738
1508 \@paths 1739 \@paths
1509} 1740}
1510 1741
1511=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1512 1743
1513Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1514
1515=cut
1516
1517sub expand_cfpod {
1518 ((my $self), (local $_)) = @_;
1519
1520 # escape & and <
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523
1524 # this is buggy, it needs to properly take care of nested <'s
1525
1526 1 while
1527 # replace B<>, I<>, U<> etc.
1528 s/B<([^\>]*)>/<b>$1<\/b>/
1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1532 # replace G<male|female> tags
1533 || s{G<([^>|]*)\|([^>]*)>}{
1534 $self->gender ? $2 : $1
1535 }ge
1536 # replace H<hint text>
1537 || s{H<([^\>]*)>}
1538 {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "")
1542 [$self->{hintmode}]
1543 }ge;
1544
1545 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g;
1547
1548 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines
1553
1554 $_
1555}
1556
1557sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode}
1560}
1561 1745
1562=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1563 1747
1564Sends an ext reply to the player. 1748Sends an ext reply to the player.
1565 1749
1597 1781
1598=cut 1782=cut
1599 1783
1600sub find_by_path($) { 1784sub find_by_path($) {
1601 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1602 1788
1603 my ($match, $specificity); 1789 my ($match, $specificity);
1604 1790
1605 for my $region (list) { 1791 for my $region (list) {
1606 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1632our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1634 1820
1635sub generate_random_map { 1821sub generate_random_map {
1636 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1637 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1827 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1642 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1643 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1644 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1645 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1660 1849
1661sub register { 1850sub register {
1662 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1663 my $pkg = caller; 1852 my $pkg = caller;
1664 1853
1665 no strict;
1666 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1667 1855
1668 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1669} 1857}
1670 1858
1671# also paths starting with '/' 1859# also paths starting with '/'
1672$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1673 1861
1674sub thawer_merge { 1862sub thawer_merge {
1675 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1676 1864
1677 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1763 1951
1764# the temporary/swap location 1952# the temporary/swap location
1765sub save_path { 1953sub save_path {
1766 my ($self) = @_; 1954 my ($self) = @_;
1767 1955
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1770} 1958}
1771 1959
1772# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1773sub uniq_path { 1961sub uniq_path {
1774 my ($self) = @_; 1962 my ($self) = @_;
1775 1963
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1778}
1779
1780# and all this just because we cannot iterate over
1781# all maps in C++...
1782sub change_all_map_light {
1783 my ($change) = @_;
1784
1785 $_->change_map_light ($change)
1786 for grep $_->outdoor, values %cf::MAP;
1787} 1966}
1788 1967
1789sub decay_objects { 1968sub decay_objects {
1790 my ($self) = @_; 1969 my ($self) = @_;
1791 1970
1875sub find { 2054sub find {
1876 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1877 2056
1878 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1879 2058
1880 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1882 2061
1883 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1887 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1888 or return; 2064 or return;
1889 2065
1890 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1891 2067
1893 or return; 2069 or return;
1894 2070
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
1898 undef $guard1; 2075 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 2076 $map->reset;
1901 return find $path; 2077 return find $path;
1902 } 2078 }
1903 2079
1904 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1905 } 2081 }
1906} 2082}
1907 2083
1908sub pre_load { } 2084sub pre_load { }
1909sub post_load { } 2085#sub post_load { } # XS
1910 2086
1911sub load { 2087sub load {
1912 my ($self) = @_; 2088 my ($self) = @_;
1913 2089
1914 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
1931 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block; 2108 $f->skip_block;
1933 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
1934 or return; 2110 or return;
1935 2111
1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
1937 if delete $self->{load_original}; 2113 if delete $self->{load_original};
1938 2114
1939 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
1940 utf8::encode $uniq; 2116 utf8::encode $uniq;
1941 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
1959 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
1960 $self->decay_objects; 2136 $self->decay_objects;
1961 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
1962 $self->update_buttons; 2138 $self->update_buttons;
1963 cf::cede_to_tick; 2139 cf::cede_to_tick;
1964 $self->set_darkness_map;
1965 cf::cede_to_tick;
1966 $self->activate; 2140 $self->activate;
1967 } 2141 }
1968 2142
1969 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
1971 2145
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2147 }
1974 2148
1975 $self->post_load; 2149 $self->post_load;
1976} 2150}
1977 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
1978sub customise_for { 2155sub customise_for {
1979 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
1980 2157
1981 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
1982 if $self->per_player; 2159 if $self->per_player;
1998 or next; 2175 or next;
1999 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2000 or next; 2177 or next;
2001 $neigh->load; 2178 $neigh->load;
2002 2179
2180 # now find the diagonal neighbours
2003 push @neigh, 2181 push @neigh,
2004 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2005 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2006 } 2184 }
2007 2185
2014} 2192}
2015 2193
2016sub find_sync { 2194sub find_sync {
2017 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2018 2196
2019 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2020} 2201}
2021 2202
2022sub do_load_sync { 2203sub do_load_sync {
2023 my ($map) = @_; 2204 my ($map) = @_;
2024 2205
2025 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2026 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2027 2208
2028 cf::sync_job { $map->load }; 2209 $map->load;
2029} 2210}
2030 2211
2031our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2032our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2033 2214
2035 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2036 2217
2037 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2038 2219
2039 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2222 }
2042 2223
2043 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2044 2225
2045 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2059 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2060 2241
2061 () 2242 ()
2062} 2243}
2063 2244
2245# common code, used by both ->save and ->swapout
2064sub save { 2246sub _save {
2065 my ($self) = @_; 2247 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2248
2069 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2070 2250
2071 return unless $self->dirty; 2251 return unless $self->dirty;
2072 2252
2081 2261
2082 cf::async { 2262 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2263 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2085 }; 2265 };
2266
2267 cf::get_slot 0.02;
2086 2268
2087 if ($uniq) { 2269 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2272 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2092 } 2274 }
2093} 2275}
2094 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2095sub swap_out { 2285sub swap_out {
2096 my ($self) = @_; 2286 my ($self) = @_;
2097 2287
2098 # save first because save cedes
2099 $self->save;
2100
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2103 return if $self->players; 2292 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2105 return if $self->{deny_save};
2106 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2107 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2108 2344
2109 $self->deactivate; 2345 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2111 $self->clear; 2347 $self->clear;
2112}
2113
2114sub reset_at {
2115 my ($self) = @_;
2116
2117 # TODO: safety, remove and allow resettable per-player maps
2118 return 1e99 if $self->{deny_reset};
2119
2120 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2121 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2122
2123 $time + $to
2124}
2125
2126sub should_reset {
2127 my ($self) = @_;
2128
2129 $self->reset_at <= $cf::RUNTIME
2130}
2131
2132sub reset {
2133 my ($self) = @_;
2134
2135 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136
2137 return if $self->players;
2138
2139 warn "resetting map ", $self->path;
2140
2141 $self->in_memory (cf::MAP_SWAPPED);
2142
2143 # need to save uniques path
2144 unless ($self->{deny_save}) {
2145 my $uniq = $self->uniq_path; utf8::encode $uniq;
2146
2147 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2148 if $uniq;
2149 }
2150
2151 delete $cf::MAP{$self->path};
2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2155 $self->clear;
2156 2348
2157 $self->unlink_save; 2349 $self->unlink_save;
2158 $self->destroy; 2350 $self->destroy;
2159} 2351}
2160 2352
2168 2360
2169 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2170 2362
2171 $self->unlink_save; 2363 $self->unlink_save;
2172 2364
2173 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2174 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2175 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2176 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2178 2370
2227 2419
2228sub unique_maps() { 2420sub unique_maps() {
2229 [ 2421 [
2230 map { 2422 map {
2231 utf8::decode $_; 2423 utf8::decode $_;
2232 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2233 ? normalise $_ 2427 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2429 ]
2237} 2430}
2238 2431
2239package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2240 2463
2241=back 2464=back
2242 2465
2243=head3 cf::object 2466=head3 cf::object
2244 2467
2248 2471
2249=over 4 2472=over 4
2250 2473
2251=item $ob->inv_recursive 2474=item $ob->inv_recursive
2252 2475
2253Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2254 2478
2255=cut 2479=cut
2256 2480
2257sub inv_recursive_; 2481sub inv_recursive_;
2258sub inv_recursive_ { 2482sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2264} 2488}
2265 2489
2266=item $ref = $ob->ref 2490=item $ref = $ob->ref
2267 2491
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2269 2493
2270=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2271 2495
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2497even if the object actually exists. May block.
2305can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2306dialogue with the given NPC character. 2530dialogue with the given NPC character.
2307 2531
2308=cut 2532=cut
2309 2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2547
2310# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2549# with dialog boxes.
2312#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2313sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2327 2565
2328 } else { 2566 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2569 }
2332 } 2570 }
2333} 2571}
2334 2572
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2360 2598
2361=item $player_object->enter_link 2599=item $player_object->enter_link
2362 2600
2363Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2364 2602
2365The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2366I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2367 2607
2368Will never block. 2608Will never block.
2369 2609
2370=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2371 2611
2391sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2392 my ($self) = @_; 2632 my ($self) = @_;
2393 2633
2394 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2395 2635
2636 ++$self->{_link_recursion};
2637
2396 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2397 2639
2398 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2399 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2400 2642
2401 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2402} 2644}
2403 2645
2404sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2405 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2406 2648
2423 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2424 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2425 2667
2426 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2427 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2428 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2429 2671
2430 $map->load; 2672 $map->load;
2431 $map->load_neighbours; 2673 $map->load_neighbours;
2432 2674
2433 return unless $self->contr->active; 2675 return unless $self->contr->active;
2434 $self->activate_recursive;
2435 2676
2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2437 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2438} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2439 2684
2685}
2686
2440=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2441 2688
2442Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2443her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2444that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2445the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2446be called at the end of this process. 2693be called at the end of this process.
2447 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2448=cut 2698=cut
2449 2699
2450our $GOTOGEN; 2700our $GOTOGEN;
2451 2701
2452sub cf::object::player::goto { 2702sub cf::object::player::goto {
2453 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2454 2710
2455 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2457 2713
2458 $self->enter_link; 2714 $self->enter_link;
2482 my $map = eval { 2738 my $map = eval {
2483 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2484 2740
2485 if ($map) { 2741 if ($map) {
2486 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2487 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2488 } else { 2744 } else {
2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2490 } 2746 }
2491 2747
2492 $map 2748 $map
2500 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2501 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2502 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2503 } 2759 }
2504 2760
2505 $done->() if $done; 2761 $done->($self) if $done;
2506 })->prio (1); 2762 })->prio (1);
2507} 2763}
2508 2764
2509=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2510 2766
2530} 2786}
2531 2787
2532sub prepare_random_map { 2788sub prepare_random_map {
2533 my ($exit) = @_; 2789 my ($exit) = @_;
2534 2790
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2793 # that depends on the exit object
2540 2794
2541 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2797 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2548 } 2804 }
2549 2805
2550 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2551 2807
2552 my $data = cf::to_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2555 2811
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2814 undef $fh;
2559 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2560 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2563 } 2823 }
2564} 2824}
2565 2825
2566sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2568 2828
2569 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2570 2830
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2831 $self->enter_link;
2583 2832
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2833 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2834 $Coro::current->{desc} = "enter_exit";
2590 2835
2591 $self->deactivate_recursive; # just to be sure
2592 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2593 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2594 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2595 1; 2857 1
2596 }) { 2858 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2598 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2599 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2601 2863
2602 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2603 $self->leave_link; 2865 $self->leave_link;
2604 } 2866 }
2605 })->prio (1); 2867 })->prio (1);
2606} 2868}
2607 2869
2619sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2620 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2621 2883
2622 utf8::encode $text; 2884 utf8::encode $text;
2623 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2624} 2911}
2625 2912
2626=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2627 2914
2628Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2917the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2918the message unless the client supports the msg packet.
2632 2919
2633=cut 2920=cut
2634 2921
2922# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2636 "c/identify" => { 2930 "c/identify" => {
2637 id => "infobox", 2931 id => "infobox",
2638 title => "Identify", 2932 title => "Identify",
2639 reply => undef, 2933 reply => undef,
2640 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2643 id => "infobox", 2937 id => "infobox",
2644 title => "Examine", 2938 title => "Examine",
2645 reply => undef, 2939 reply => undef,
2646 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2647 }, 2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2947 },
2948 "c/book" => {
2949 id => "infobox",
2950 title => "Book",
2951 reply => undef,
2952 tooltip => "The contents of a note or book",
2953 },
2648 "c/lookat" => { 2954 "c/lookat" => {
2649 id => "infobox", 2955 id => "infobox",
2650 title => "Look", 2956 title => "Look",
2651 reply => undef, 2957 reply => undef,
2652 tooltip => "What you saw there", 2958 tooltip => "What you saw there",
2653 }, 2959 },
2960 "c/who" => {
2961 id => "infobox",
2962 title => "Players",
2963 reply => undef,
2964 tooltip => "Shows players who are currently online",
2965 },
2966 "c/body" => {
2967 id => "infobox",
2968 title => "Body Parts",
2969 reply => undef,
2970 tooltip => "Shows which body parts you posess and are available",
2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
3008 "c/uptime" => {
3009 id => "infobox",
3010 title => "Uptime",
3011 reply => undef,
3012 tooltip => "How long the server has been running since last restart",
3013 },
3014 "c/mapinfo" => {
3015 id => "infobox",
3016 title => "Map Info",
3017 reply => undef,
3018 tooltip => "Information related to the maps",
3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
2654); 3034);
2655 3035
2656sub cf::client::send_msg { 3036sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2658 3038
2659 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2660 3041
2661 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2662 3043
2663 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) { 3045 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel}; 3046 $channel = $CHANNEL{$channel};
2666 3047
2667 $self->ext_msg (channel_info => $channel) 3048 $self->ext_msg (channel_info => $channel);
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id}; 3049 $channel = $channel->{id};
2671 3050
2672 } elsif (ref $channel) { 3051 } elsif (ref $channel) {
2673 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2674 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2675 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2676 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2677 if $self->can_msg;
2678 } 3056 }
2679 3057
2680 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2681 } 3059 }
2682 3060
2683 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2684 3062
2685 if ($self->can_msg) {
2686 # default colour, mask it out 3063 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2689 3066
2690 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2692 } else { 3070 );
2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703 3071
2704 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2705
2706 utf8::encode $msg;
2707
2708 if (0 && $msg =~ /\[/) {
2709 # COMMAND/INFO
2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2711 } else {
2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2713 $self->send_packet ("drawinfo $color $msg")
2714 }
2715 }
2716 }
2717} 3073}
2718 3074
2719=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2720 3076
2721Sends an ext event to the client. 3077Sends an ext event to the client.
2724 3080
2725sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2726 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2727 3083
2728 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2730 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2731 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2732 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2733 } 3089 }
2734} 3090}
2735 3091
2736=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2737 3093
2741 3097
2742sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2743 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2744 3100
2745 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2746 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2747 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2748 #TODO: version 1, remove 3104 #TODO: version 1, remove
2749 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2750 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2751 } 3107 }
2752} 3108}
2753 3109
2754=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2755 3111
2826 3182
2827 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2828 if $reply; 3184 if $reply;
2829 3185
2830 } else { 3186 } else {
2831 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2832 } 3188 }
2833 3189
2834 cf::override; 3190 cf::override;
2835 }, 3191 },
2836); 3192);
2856 3212
2857 $coro 3213 $coro
2858} 3214}
2859 3215
2860cf::client->attach ( 3216cf::client->attach (
2861 on_destroy => sub { 3217 on_client_destroy => sub {
2862 my ($ns) = @_; 3218 my ($ns) = @_;
2863 3219
2864 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2865 }, 3221 },
2866); 3222);
2882our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
2883 3239
2884$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
2885 3241
2886$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
2887 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
2888 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
2889 sort time 3245 sort time
2890)); 3246));
2891 3247
2892# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
2894=pod 3250=pod
2895 3251
2896The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
2897 3253
2898 cf::object 3254 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3255 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
2901 3258
2902 cf::object::player 3259 cf::object::player
2903 player 3260 player
2904 3261
2905 cf::player 3262 cf::player
2910 3267
2911=cut 3268=cut
2912 3269
2913for ( 3270for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3273 decrease split destroy change_exp value msg lore send_msg)],
2917 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
2919 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
2920) { 3277) {
2921 no strict 'refs';
2922 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
2923 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2924 for @funs; 3280 for @funs;
2925} 3281}
2926 3282
2941 3297
2942 my $qcode = $code; 3298 my $qcode = $code;
2943 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2944 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
2945 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
2946 local $_; 3305 local $_;
2947 local @safe::cf::_safe_eval_args = values %vars;
2948 3306
2949 my $eval = 3307 my $eval =
2950 "do {\n" 3308 "do {\n"
2951 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2952 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
2953 . $code 3311 . $code
2954 . "\n}" 3312 . "\n}"
2955 ; 3313 ;
2956 3314
3315 if ($CFG{safe_eval}) {
2957 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
2958 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2959 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
2960 3324
2961 if ($@) { 3325 if ($@) {
2962 warn "$@"; 3326 warn "$@",
2963 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
2964 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
2965 } 3329 }
2966 3330
2967 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
2968} 3332}
2969 3333
2983=cut 3347=cut
2984 3348
2985sub register_script_function { 3349sub register_script_function {
2986 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
2987 3351
2988 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
2989 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
2990} 3354}
2991 3355
2992=back 3356=back
2993 3357
2994=cut 3358=cut
2995 3359
2996############################################################################# 3360#############################################################################
2997# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
2998 3405
2999sub load_facedata($) { 3406sub load_facedata($) {
3000 my ($path) = @_; 3407 my ($path) = @_;
3001 3408
3002 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3003 # for this (global event?) 3410 # for this (global event?)
3004 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3005 3412
3006 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3007 3414
3008 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3009 3416
3010 my $facedata; 3417 my $facedata;
3011 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3012 or die "$path: $!"; 3419 or die "$path: $!";
3013 3420
3015 3422
3016 $facedata->{version} == 2 3423 $facedata->{version} == 2
3017 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3018 3425
3019 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3020 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3021 type => FT_RSRC, 3429 type => FT_RSRC,
3022 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3023 }; 3432 };
3024 cf::cede_to_tick; 3433 cf::cede_to_tick;
3025 3434
3026 { 3435 {
3027 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
3028 3437
3029 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3440
3031 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3035 3445
3036 cf::cede_to_tick; 3446 cf::cede_to_tick;
3037 } 3447 }
3038 3448
3039 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3450 next unless $info->{smooth};
3451
3041 my $idx = cf::face::find $face 3452 my $idx = cf::face::find $face
3042 or next; 3453 or next;
3454
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3458 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3048 } 3460 }
3049 3461
3050 cf::cede_to_tick; 3462 cf::cede_to_tick;
3051 } 3463 }
3052 } 3464 }
3061 3473
3062 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3063 } 3475 }
3064 3476
3065 { 3477 {
3066 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3069 3479
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3481 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data;
3075 3483
3076 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3077 # prepend meta info 3485 cf::face::set_type $idx, $info->{type};
3078
3079 my $meta = $enc->encode ({
3080 name => $name,
3081 %{ $info->{meta} || {} },
3082 });
3083
3084 $data = pack "(w/a*)*", $meta, $info->{data};
3085 } else { 3486 } else {
3086 $data = $info->{data}; 3487 $RESOURCE{$name} = $info; # unused
3087 } 3488 }
3088 3489
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3490 cf::cede_to_tick;
3093 } 3491 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3492 }
3493
3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3495
3114 1 3496 1
3115} 3497}
3116 3498
3117register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3119 3501
3120 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3503 $ns->fx_want ($k, $v);
3122 } 3504 }
3123}; 3505};
3506
3507sub load_resource_file($) {
3508 my $guard = lock_acquire "load_resource_file";
3509
3510 my $status = load_resource_file_ $_[0];
3511 get_slot 0.1, 100;
3512 cf::arch::commit_load;
3513
3514 $status
3515}
3124 3516
3125sub reload_regions { 3517sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework 3518 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?) 3519 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3520 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3534}
3143 3535
3144sub reload_archetypes { 3536sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3537 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3538 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3539}
3153 3540
3154sub reload_treasures { 3541sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3157} 3544}
3158 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3159sub reload_resources { 3569sub reload_resources {
3160 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3161 3571
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3162 reload_regions; 3575 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3576 reload_treasures;
3167 3577
3168 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3169}
3170
3171sub init {
3172 reload_resources;
3173} 3579}
3174 3580
3175sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3585 or return;
3178 3586
3179 local $/; 3587 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3181 3589
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3183 3591
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3186 3594
3187 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3189 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3190 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3191 }; 3599 };
3192 warn $@ if $@; 3600 warn $@ if $@;
3193 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3604}
3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
3194} 3632}
3195 3633
3196sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
3197 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3647 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3649 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3204 }; 3651 };
3205 3652
3653 evthread_start IO::AIO::poll_fileno;
3654
3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3666 reload_resources;
3206 reload_config; 3667 reload_config;
3207 db_init; 3668 db_init;
3669
3670 cf::init_uuid;
3671 cf::init_signals;
3672 cf::init_skills;
3673
3674 cf::init_beforeplay;
3675
3676 atomic;
3677
3208 load_extensions; 3678 load_extensions;
3209 3679
3210 $TICK_WATCHER->start; 3680 utime time, time, $RUNTIMEFILE;
3211 Event::loop; 3681
3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685
3686 (pop @POST_INIT)->(0) while @POST_INIT;
3687 };
3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
3212} 3698}
3213 3699
3214############################################################################# 3700#############################################################################
3215# initialisation and cleanup 3701# initialisation and cleanup
3216 3702
3217# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3218BEGIN { 3704BEGIN {
3705 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3227 },
3228 ); 3709 };
3229 } 3710 }
3230} 3711}
3231 3712
3232sub write_runtime { 3713sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
3234 3715
3235 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3237 3718
3238 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3239 3720
3240 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3241 3722
3242 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3243 or return; 3724 or return;
3244 3725
3245 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3246 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3247 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3257 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
3258 3739
3259 close $fh 3740 close $fh
3260 or return; 3741 or return;
3261 3742
3262 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3263 and return; 3744 and return;
3264 3745
3265 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3266 3747
3267 1 3748 1
3749}
3750
3751our $uuid_lock;
3752our $uuid_skip;
3753
3754sub write_uuid_sync($) {
3755 $uuid_skip ||= $_[0];
3756
3757 return if $uuid_lock;
3758 local $uuid_lock = 1;
3759
3760 my $uuid = "$LOCALDIR/uuid";
3761
3762 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3763 or return;
3764
3765 my $value = uuid_seq uuid_cur;
3766
3767 unless ($value) {
3768 info "cowardly refusing to write zero uuid value!\n";
3769 return;
3770 }
3771
3772 my $value = uuid_str $value + $uuid_skip;
3773 $uuid_skip = 0;
3774
3775 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3776 and return;
3777
3778 # always fsync - this file is important
3779 aio_fsync $fh
3780 and return;
3781
3782 close $fh
3783 or return;
3784
3785 aio_rename "$uuid~", $uuid
3786 and return;
3787
3788 trace "uuid file written ($value).\n";
3789
3790 1
3791
3792}
3793
3794sub write_uuid($$) {
3795 my ($skip, $sync) = @_;
3796
3797 $sync ? write_uuid_sync $skip
3798 : async { write_uuid_sync $skip };
3268} 3799}
3269 3800
3270sub emergency_save() { 3801sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3272 3803
3273 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3274 3810
3275 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3276 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3277 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3278 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3280 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3820 $pl->valid or next;
3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3822 $pl->save;
3284 } 3823 }
3285 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3286 3825
3287 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
3288 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3289 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3290 $map->valid or next; 3831 $map->valid or next;
3291 $map->save; 3832 $map->save;
3292 } 3833 }
3293 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3294 3835
3295 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3841
3842 info "emergency_perl_save: begin write uuid\n";
3843 write_uuid_sync 1;
3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3298 }; 3864 };
3299 3865
3300 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3301} 3867}
3302 3868
3303sub post_cleanup { 3869sub post_cleanup {
3304 my ($make_core) = @_; 3870 my ($make_core) = @_;
3305 3871
3872 IO::AIO::flush;
3873
3306 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3307 if $make_core; 3875 if $make_core;
3876
3877 my $fh = pidfile;
3878 unlink $PIDFILE if <$fh> == $$;
3879}
3880
3881# a safer delete_package, copied from Symbol
3882sub clear_package($) {
3883 my $pkg = shift;
3884
3885 # expand to full symbol table name if needed
3886 unless ($pkg =~ /^main::.*::$/) {
3887 $pkg = "main$pkg" if $pkg =~ /^::/;
3888 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3889 $pkg .= '::' unless $pkg =~ /::$/;
3890 }
3891
3892 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3893 my $stem_symtab = *{$stem}{HASH};
3894
3895 defined $stem_symtab and exists $stem_symtab->{$leaf}
3896 or return;
3897
3898 # clear all symbols
3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3900 for my $name (keys %$leaf_symtab) {
3901 _gv_clear *{"$pkg$name"};
3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3903 }
3308} 3904}
3309 3905
3310sub do_reload_perl() { 3906sub do_reload_perl() {
3311 # can/must only be called in main 3907 # can/must only be called in main
3312 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3313 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3314 return; 3910 return;
3315 } 3911 }
3316 3912
3913 return if $RELOAD++;
3914
3915 my $t1 = AE::time;
3916
3917 while ($RELOAD) {
3317 warn "reloading..."; 3918 info "reloading...";
3318 3919
3319 warn "entering sync_job"; 3920 trace "entering sync_job";
3320 3921
3321 cf::sync_job { 3922 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark
3323 cf::emergency_save; 3923 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark
3325 3924
3326 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV;
3328
3329 # if anything goes wrong in here, we should simply crash as we already saved
3330
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests";
3337 for (;;) {
3338 BDB::flush;
3339 IO::AIO::flush;
3340 Coro::cede;
3341 last unless IO::AIO::nreqs || BDB::nreqs;
3342 warn "iterate...";
3343 }
3344
3345 ++$RELOAD;
3346
3347 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3348 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3349 %EXT_CORO = (); 3927 %EXT_CORO = ();
3350 3928
3351 warn "removing commands"; 3929 trace "removing commands";
3352 %COMMAND = (); 3930 %COMMAND = ();
3353 3931
3354 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3355 %EXTCMD = (); 3933 %EXTCMD = ();
3356 %EXTICMD = (); 3934 %EXTICMD = ();
3357 3935
3358 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3359 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3360 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3361 3939
3362 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3363 eval { 3941 eval {
3364 $cb->($pkg); 3942 $cb->($pkg);
3365 1 3943 1
3366 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3945 }
3946
3947 trace "... clearing $pkg";
3948 clear_package $pkg;
3367 } 3949 }
3368 3950
3369 warn "... nuking $pkg";
3370 Symbol::delete_package $pkg;
3371 }
3372
3373 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3374 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3375 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3376 3954
3377 warn "... unloading $k"; 3955 trace "... unloading $k";
3378 delete $INC{$k}; 3956 delete $INC{$k};
3379 3957
3380 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3381 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3382 3960
3383 if (my $cb = $k->can ("unload_module")) { 3961 if (my $cb = $k->can ("unload_module")) {
3384 $cb->(); 3962 $cb->();
3963 }
3964
3965 clear_package $k;
3385 } 3966 }
3386 3967
3387 Symbol::delete_package $k;
3388 }
3389
3390 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3391 Symbol::delete_package "safe::$_" 3969 clear_package "safe::$_"
3392 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3393 3971
3394 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3395 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3396 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3397 3975
3398 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3399 # and global variables created in xs 3977 # and global variables created in xs
3400 #Symbol::delete_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3401 3979
3402 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3403 3981
3404 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3405 require cf; 3983 require cf;
3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3407 3985
3408 warn "loading config and database again"; 3986 trace "loading config and database again";
3409 cf::reload_config; 3987 cf::reload_config;
3410 3988
3411 warn "loading extensions"; 3989 trace "loading extensions";
3412 cf::load_extensions; 3990 cf::load_extensions;
3413 3991
3992 if ($REATTACH_ON_RELOAD) {
3414 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3415 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3416 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3417 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3418 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3419 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3420 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3421 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3422 4005
3423 1 4006 1
3424 } or do { 4007 } or do {
3425 warn $@; 4008 error $@;
3426 warn "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3427 exit 1; 4010 };
4011
4012 info "reloaded";
4013 --$RELOAD;
3428 }; 4014 }
3429 4015
3430 warn "reloaded"; 4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3431}; 4018};
3432 4019
3433our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3434 4021
3435sub reload_perl() { 4022sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3438 4025
3439 $RELOAD_WATCHER ||= Event->timer ( 4026 $RELOAD_WATCHER ||= cf::async {
3440 reentrant => 0, 4027 Coro::AIO::aio_wait cache_extensions;
3441 after => 0, 4028
3442 data => WF_AUTOCANCEL, 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3443 cb => sub {
3444 do_reload_perl; 4030 do_reload_perl;
3445 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3446 }, 4032 };
3447 ); 4033 };
3448} 4034}
3449 4035
3450register_command "reload" => sub { 4036register_command "reload" => sub {
3451 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3452 4038
3457 reload_perl; 4043 reload_perl;
3458 }; 4044 };
3459 } 4045 }
3460}; 4046};
3461 4047
3462unshift @INC, $LIBDIR; 4048#############################################################################
3463 4049
3464my $bug_warning = 0; 4050my $bug_warning = 0;
3465 4051
3466our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3468 4054
3469sub wait_for_tick { 4055sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3472 4057
3473 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 4060 $signal->wait;
3476} 4061}
3477 4062
3478sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3481 4065
3482 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 4068 $signal->wait;
3485} 4069}
3486 4070
3487$TICK_WATCHER = Event->timer ( 4071sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 4072 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4073 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 4074 unless ++$bug_warning > 10;
3497 return; 4075 return;
3498 } 4076 }
3499 4077
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3503 4079
3504 $RUNTIME += $TICK; 4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3505 $NEXT_TICK += $TICK;
3506 4081
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 4084 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 4086 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3513 };
3514 } 4088 };
4089 }
3515 4090
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 4092 $sig->send;
3518 } 4093 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 4094 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 4095 $sig->send;
3521 } 4096 }
3522 4097
3523 $NOW = Event::time; 4098 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4099 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 4100
3534 _post_tick; 4101 if (0) {
4102 if ($NEXT_TICK) {
4103 my $jitter = $TICK_START - $NEXT_TICK;
4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4105 debug "jitter $JITTER\n";#d#
4106 }
3535 }, 4107 }
3536); 4108}
3537 4109
3538{ 4110{
4111 # configure BDB
4112
3539 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3540 BDB::max_poll_time $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 4115 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 4116
3565 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | BDB::LOG_AUTOREMOVE, 1); 4120 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4121 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4122 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4123 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 4124
3572 cf::sync_job { 4125 cf::sync_job {
3573 eval { 4126 eval {
3583 4136
3584 cf::cleanup "db_env_open(db): $@" if $@; 4137 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 4138 };
3586 } 4139 }
3587 4140
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 4141 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4142 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 4143 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4144 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4145 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 4146 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 4147 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4148 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 4149 };
3618} 4150}
3619 4151
3620{ 4152{
4153 # configure IO::AIO
4154
3621 IO::AIO::min_parallel 8; 4155 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 4156 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 4157 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 4158}
3634 4159
3635my $_log_backtrace; 4160my $_log_backtrace;
3636 4161
3637sub _log_backtrace { 4162sub _log_backtrace {
3640 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3641 4166
3642 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3643 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3644 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3645 async { 4171 async {
3646 $Coro::current->{desc} = "abt $msg"; 4172 $Coro::current->{desc} = "abt $msg";
3647 4173
3648 my @bt = fork_call { 4174 my @bt = fork_call {
3649 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3660 } 4186 }
3661 4187
3662 @funcs 4188 @funcs
3663 }; 4189 };
3664 4190
3665 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3666 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3667 --$_log_backtrace; 4194 --$_log_backtrace;
3668 }; 4195 };
3669 } else { 4196 } else {
3670 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3671 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3672 } 4199 }
3673} 4200}
3674 4201
3675# load additional modules 4202# load additional modules
3676use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3677 4205
3678END { cf::emergency_save } 4206END { cf::emergency_save }
3679 4207
36801 42081
3681 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines