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.364 by root, Tue Sep 11 08:41:11 2007 UTC vs.
Revision 1.502 by root, Sat Jan 23 20:24:50 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 121our $DB_ENV;
88 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
89our %CFG; 125our %CFG;
90 126
91our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 128our $RUNTIME;
129our $NOW;
93 130
94our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
97 134
98# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 137
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
104 147
105binmode STDOUT; 148binmode STDOUT;
106binmode STDERR; 149binmode STDERR;
107 150
108# read virtual server time, if available 151# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
113} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
114 159
115mkdir $_ 160mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 162
118our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
119 164
120sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121 177
122############################################################################# 178#############################################################################
123 179
124=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
125 181
… …
161 217
162The raw value load value from the last tick. 218The raw value load value from the last tick.
163 219
164=item %cf::CFG 220=item %cf::CFG
165 221
166Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 223from wherever your confdir points to.
168 224
169=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
170 226
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
172returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
173per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
174 230
175=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
176 232
177This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 235that call.
180 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
181=back 243=back
182 244
183=cut 245=cut
184 246
185BEGIN { 247$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 248 my $msg = join "", @_;
188 249
189 $msg .= "\n" 250 $msg .= "\n"
190 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
191 252
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 254
194 LOG llevError, $msg; 255 LOG llevError, $msg;
195 }; 256};
196} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
197 271
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
208for my $pkg (qw( 282for my $pkg (qw(
209 cf::global cf::attachable 283 cf::global cf::attachable
210 cf::object cf::object::player 284 cf::object cf::object::player
211 cf::client cf::player 285 cf::client cf::player
212 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
213 cf::map cf::party cf::region 288 cf::party cf::region
214)) { 289)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 291}
218 292
219$Event::DIED = sub { 293$EV::DIED = sub {
220 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
221}; 295};
222 296
223############################################################################# 297#############################################################################
224 298
225=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 322 $d
249 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
250} 324}
251 325
252=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
253 327
254Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
255 329
256=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
257 331
258Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
259 333
260=cut 334=cut
261 335
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 337
264sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
266 354
267=item cf::lock_wait $string 355=item cf::lock_wait $string
268 356
269Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
270 358
271=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
272 360
273Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
276returned. 364returned.
277 365
278Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 367deadlocked coro.
… …
285 373
286Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
287 375
288=cut 376=cut
289 377
290our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 379
293sub lock_wait($) { 380sub lock_wait($) {
294 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 382}
307 383
308sub lock_acquire($) { 384sub lock_acquire($) {
309 my ($key) = @_; 385 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 386}
323 387
324sub lock_active($) { 388sub lock_active($) {
325 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 390}
329 391
330sub freeze_mainloop { 392sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
332 394
333 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 396}
335 }; 397
336 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
337 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
338} 411}
339 412
340=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
341 414
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
350 423
351=cut 424=cut
352 425
353our @SLOT_QUEUE; 426our @SLOT_QUEUE;
354our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
355 429
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
358 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
359 436
360 while () { 437 while () {
361 next_job: 438 next_job:
439
362 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
363 if ($avail > 0.01) { 441
364 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
366 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send; 446 $job->[2]->send;
368 Coro::cede; 447 Coro::cede;
369 goto next_job; 448 goto next_job;
370 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371 } 451 }
372 } 452 }
373 453
374 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 457 $signal->wait;
378 } else { 458 } else {
459 $busy = 0;
379 Coro::schedule; 460 Coro::schedule;
380 } 461 }
381 } 462 }
382}; 463};
383 464
384sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
385 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
386 469
387 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
388 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
389 473
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
403 487
404BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
405 489
406=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
407 491
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 492The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 493is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 495acceptable.
412 496
413If it must be done, put the blocking parts into C<sync_job>. This will run 497If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
… …
419 503
420sub sync_job(&) { 504sub sync_job(&) {
421 my ($job) = @_; 505 my ($job) = @_;
422 506
423 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 508 my $time = EV::time;
425 509
426 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
428 512
429 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 514
431 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
432 516
433 my $busy = 1; 517 my $busy = 1;
434 my @res; 518 my @res;
435 519
436 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 522 @res = eval { $job->() };
438 warn $@ if $@; 523 warn $@ if $@;
439 undef $busy; 524 undef $busy;
440 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
441 526
442 while ($busy) { 527 while ($busy) {
443 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
444 } 532 }
533 }
445 534
446 $time = Event::time - $time; 535 my $time = EV::time - $time;
447 536
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
452 538
453 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
454 } else { 540 } else {
455 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
456 542
… …
481=item fork_call { }, $args 567=item fork_call { }, $args
482 568
483Executes the given code block with the given arguments in a seperate 569Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 570process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 571Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 572never block itself or use any form of event handling.
487 573
488=cut 574=cut
489 575
490sub fork_call(&@) { 576sub fork_call(&@) {
491 my ($cb, @args) = @_; 577 my ($cb, @args) = @_;
… …
498 reset_signals; 584 reset_signals;
499 &$cb 585 &$cb
500 }, @args; 586 }, @args;
501 587
502 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
503} 616}
504 617
505=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
506 619
507Returns a single value from the environment database. 620Returns a single value from the environment database.
… …
646 759
647############################################################################# 760#############################################################################
648 761
649=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
650 763
651Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
654 767
655In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 770Deliantra).
658 771
659=over 4 772=over 4
660 773
661=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
662 775
… …
706=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
707 820
708Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
710 823
711Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
713 826
714These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
715 828
716=over 4 829=over 4
… …
944 } 1057 }
945 1058
946 0 1059 0
947} 1060}
948 1061
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1063
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1065
953Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
954 1067
… …
960 1073
961=cut 1074=cut
962 1075
963############################################################################# 1076#############################################################################
964# object support 1077# object support
965#
966 1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
967sub _can_merge { 1112sub _can_merge {
968 my ($ob1, $ob2) = @_; 1113 my ($ob1, $ob2) = @_;
969 1114
970 local $Storable::canonical = 1; 1115 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1116
974 $fob1 eq $fob2 1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
975} 1119}
976 1120
977sub reattach { 1121sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1123 my ($obj) = @_;
980 1124
1125 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1127
983 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
984 1129
985 @$registry = (); 1130 @$registry = ();
986 1131
… …
1001cf::attachable->attach ( 1146cf::attachable->attach (
1002 prio => -1000000, 1147 prio => -1000000,
1003 on_instantiate => sub { 1148 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
1005 1150
1006 $data = from_json $data; 1151 $data = decode_json $data;
1007 1152
1008 for (@$data) { 1153 for (@$data) {
1009 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
1010 1155
1011 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1169 },
1025); 1170);
1026 1171
1027sub object_freezer_save { 1172sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1174
1032 sync_job { 1175 sync_job {
1033 if (length $$rdata) { 1176 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1037 1180
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1042 close $fh; 1188 aio_close $fh;
1043 1189
1044 if (@$objs) { 1190 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1050 close $fh; 1199 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1201 }
1053 } else { 1202 } else {
1054 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1055 } 1204 }
1056 1205
1057 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1210 } else {
1059 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1060 } 1212 }
1061 } else { 1213 } else {
1062 aio_unlink $filename; 1214 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1064 } 1216 }
1065 }; 1217 };
1066
1067 undef $guard;
1068} 1218}
1069 1219
1070sub object_freezer_as_string { 1220sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
1072 1222
… …
1077 1227
1078sub object_thawer_load { 1228sub object_thawer_load {
1079 my ($filename) = @_; 1229 my ($filename) = @_;
1080 1230
1081 my ($data, $av); 1231 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1232
1085 (aio_load $filename, $data) >= 0 1233 (aio_load $filename, $data) >= 0
1086 or return; 1234 or return;
1087 1235
1088 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1238 or return;
1091 1239
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
1094 } 1242 }
1095 1243
1096 utf8::decode (my $decname = $filename); 1244 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1246 $decname, length $data, scalar @{$av || []};
… …
1159 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1160 1308
1161 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1162} 1310}
1163 1311
1312use File::Glob ();
1313
1164cf::player->attach ( 1314cf::player->attach (
1165 on_command => sub { 1315 on_command => sub {
1166 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1167 1317
1168 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1200 1350
1201 cf::override; 1351 cf::override;
1202 }, 1352 },
1203); 1353);
1204 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1205sub load_extensions { 1368sub load_extensions {
1206 cf::sync_job { 1369 cf::sync_job {
1207 my %todo; 1370 my %todo;
1208 1371
1209 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1228 1391
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1394
1232 $ext{source} = 1395 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1235 . $source 1398 . $source
1236 . "\n};\n1"; 1399 . "\n};\n1";
1237 1400
1238 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1417 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1418 : "$v->{base}: extension inactive.\n";
1256 1419
1257 if (exists $v->{meta}{mandatory}) { 1420 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1421 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1422 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1423 }
1262 1424
1263 warn $msg; 1425 warn $msg;
1264 } 1426 }
1265 1427
… …
1279 1441
1280=back 1442=back
1281 1443
1282=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1283 1445
1284Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1285 1447
1286=cut 1448=cut
1287 1449
1288package cf::player; 1450package cf::player;
1289 1451
… …
1332 1494
1333sub exists($) { 1495sub exists($) {
1334 my ($login) = @_; 1496 my ($login) = @_;
1335 1497
1336 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1338} 1500}
1339 1501
1340sub find($) { 1502sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1504 my $login = $_[0];
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1514 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1515
1354 my $f = new_from_file cf::object::thawer path $login 1516 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1517 or return;
1356 1518
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1519 my $pl = cf::player::load_pl $f
1359 or return; 1520 or return;
1521
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1522 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1523 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1524 $cf::PLAYER{$login} = $pl
1363 } 1525 }
1364 } 1526 }
… …
1374 1536
1375 return if $pl->{deny_save}; 1537 return if $pl->{deny_save};
1376 1538
1377 aio_mkdir playerdir $pl, 0770; 1539 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1540 $pl->{last_save} = $cf::RUNTIME;
1541
1542 cf::get_slot 0.01;
1379 1543
1380 $pl->save_pl ($path); 1544 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1545 cf::cede_to_tick;
1382} 1546}
1383 1547
… …
1415 my ($pl) = @_; 1579 my ($pl) = @_;
1416 1580
1417 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1418 1582
1419 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1585
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1587 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1590 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1591 $pl->ns->destroy if $pl->ns;
1426 1592
1427 my $path = playerdir $pl; 1593 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1594 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1467 1633
1468 for my $login (@$dirs) { 1634 for my $login (@$dirs) {
1469 my $path = path $login; 1635 my $path = path $login;
1470 1636
1471 # a .pst is a dead give-away for a valid player 1637 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1638 # if no pst file found, open and chekc for blocked users
1639 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1640 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1641 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1642 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1643 }
1477 1644
… …
1508 } 1675 }
1509 1676
1510 \@paths 1677 \@paths
1511} 1678}
1512 1679
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1681
1515Expand crossfire pod fragments into protocol xml. 1682Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1683
1564=item $player->ext_reply ($msgid, @msg) 1684=item $player->ext_reply ($msgid, @msg)
1565 1685
1566Sends an ext reply to the player. 1686Sends an ext reply to the player.
1567 1687
… …
1634our $MAX_RESET = 3600; 1754our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1755our $DEFAULT_RESET = 3000;
1636 1756
1637sub generate_random_map { 1757sub generate_random_map {
1638 my ($self, $rmp) = @_; 1758 my ($self, $rmp) = @_;
1759
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761
1639 # mit "rum" bekleckern, nicht 1762 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1763 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1888
1766# the temporary/swap location 1889# the temporary/swap location
1767sub save_path { 1890sub save_path {
1768 my ($self) = @_; 1891 my ($self) = @_;
1769 1892
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1894 "$TMPDIR/$path.map"
1772} 1895}
1773 1896
1774# the unique path, undef == no special unique path 1897# the unique path, undef == no special unique path
1775sub uniq_path { 1898sub uniq_path {
1776 my ($self) = @_; 1899 my ($self) = @_;
1777 1900
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1903}
1790 1904
1791sub decay_objects { 1905sub decay_objects {
1792 my ($self) = @_; 1906 my ($self) = @_;
1793 1907
… …
1877sub find { 1991sub find {
1878 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1879 1993
1880 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1881 1995
1882 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1998
1885 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
1890 or return; 2001 or return;
1891 2002
1892 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
1893 2004
… …
1895 or return; 2006 or return;
1896 2007
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
1900 undef $guard1; 2012 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2013 $map->reset;
1903 return find $path; 2014 return find $path;
1904 } 2015 }
1905 2016
1906 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
1907 } 2018 }
1908} 2019}
1909 2020
1910sub pre_load { } 2021sub pre_load { }
1911sub post_load { } 2022#sub post_load { } # XS
1912 2023
1913sub load { 2024sub load {
1914 my ($self) = @_; 2025 my ($self) = @_;
1915 2026
1916 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2045 $f->skip_block;
1935 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
1936 or return; 2047 or return;
1937 2048
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
1939 if delete $self->{load_original}; 2050 if delete $self->{load_original};
1940 2051
1941 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2053 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
… …
1961 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2073 $self->decay_objects;
1963 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
1964 $self->update_buttons; 2075 $self->update_buttons;
1965 cf::cede_to_tick; 2076 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2077 $self->activate;
1969 } 2078 }
1970 2079
1971 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
1973 2082
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2083 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2084 }
1976 2085
1977 $self->post_load; 2086 $self->post_load;
1978} 2087}
1979 2088
… …
2037 my ($path, $origin, $load) = @_; 2146 my ($path, $origin, $load) = @_;
2038 2147
2039 $path = normalise $path, $origin && $origin->{path}; 2148 $path = normalise $path, $origin && $origin->{path};
2040 2149
2041 if (my $map = $cf::MAP{$path}) { 2150 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2152 }
2044 2153
2045 $MAP_PREFETCH{$path} |= $load; 2154 $MAP_PREFETCH{$path} |= $load;
2046 2155
2047 $MAP_PREFETCHER ||= cf::async { 2156 $MAP_PREFETCHER ||= cf::async {
2157 $Coro::current->{desc} = "map prefetcher";
2158
2048 while (%MAP_PREFETCH) { 2159 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2160 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2161 if (my $map = find $k) {
2051 $map->load if $v; 2162 $map->load if $v;
2052 } 2163 }
… …
2078 return if $self->{deny_save}; 2189 return if $self->{deny_save};
2079 2190
2080 local $self->{last_access} = $self->last_access;#d# 2191 local $self->{last_access} = $self->last_access;#d#
2081 2192
2082 cf::async { 2193 cf::async {
2194 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2195 $_->contr->save for $self->players;
2084 }; 2196 };
2197
2198 cf::get_slot 0.02;
2085 2199
2086 if ($uniq) { 2200 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2201 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2202 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2203 } else {
… …
2098 $self->save; 2212 $self->save;
2099 2213
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2215
2102 return if $self->players; 2216 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2217 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2218 return if $self->{deny_save};
2105 2219
2106 $self->in_memory (cf::MAP_SWAPPED); 2220 $self->in_memory (cf::MAP_SWAPPED);
2107 2221
2108 $self->deactivate; 2222 $self->deactivate;
… …
2133 2247
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2249
2136 return if $self->players; 2250 return if $self->players;
2137 2251
2138 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2139 2253
2140 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2141 2255
2142 # need to save uniques path 2256 # need to save uniques path
2143 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2226 2340
2227sub unique_maps() { 2341sub unique_maps() {
2228 [ 2342 [
2229 map { 2343 map {
2230 utf8::decode $_; 2344 utf8::decode $_;
2231 /\.map$/ 2345 s/\.map$//; # TODO future compatibility hack
2346 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2347 ? ()
2232 ? normalise $_ 2348 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2350 ]
2236} 2351}
2237 2352
2238package cf; 2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2239 2384
2240=back 2385=back
2241 2386
2242=head3 cf::object 2387=head3 cf::object
2243 2388
… …
2247 2392
2248=over 4 2393=over 4
2249 2394
2250=item $ob->inv_recursive 2395=item $ob->inv_recursive
2251 2396
2252Returns the inventory of the object _and_ their inventories, recursively. 2397Returns the inventory of the object I<and> their inventories, recursively,
2398but I<not> the object itself.
2253 2399
2254=cut 2400=cut
2255 2401
2256sub inv_recursive_; 2402sub inv_recursive_;
2257sub inv_recursive_ { 2403sub inv_recursive_ {
… …
2262 inv_recursive_ inv $_[0] 2408 inv_recursive_ inv $_[0]
2263} 2409}
2264 2410
2265=item $ref = $ob->ref 2411=item $ref = $ob->ref
2266 2412
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2413Creates and returns a persistent reference to an object that can be stored as a string.
2268 2414
2269=item $ob = cf::object::deref ($refstring) 2415=item $ob = cf::object::deref ($refstring)
2270 2416
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2417returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2418even if the object actually exists. May block.
… …
2274=cut 2420=cut
2275 2421
2276sub deref { 2422sub deref {
2277 my ($ref) = @_; 2423 my ($ref) = @_;
2278 2424
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2425 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2426 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2427 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2428 or return;
2286 $pl->ob->uuid eq $uuid 2429 $pl->ob->uuid eq $uuid
2287 or return; 2430 or return;
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2450can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2451dialogue with the given NPC character.
2309 2452
2310=cut 2453=cut
2311 2454
2455our $SAY_CHANNEL = {
2456 id => "say",
2457 title => "Map",
2458 reply => "say ",
2459 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2460};
2461
2462our $CHAT_CHANNEL = {
2463 id => "chat",
2464 title => "Chat",
2465 reply => "chat ",
2466 tooltip => "Player chat and shouts, global to the server.",
2467};
2468
2312# rough implementation of a future "reply" method that works 2469# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2470# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2471#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2472sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2473 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2484 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2485 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2486
2330 } else { 2487 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2488 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2489 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2490 }
2334 } 2491 }
2335} 2492}
2336 2493
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2494=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2362 2519
2363=item $player_object->enter_link 2520=item $player_object->enter_link
2364 2521
2365Freezes the player and moves him/her to a special map (C<{link}>). 2522Freezes the player and moves him/her to a special map (C<{link}>).
2366 2523
2367The player should be reasonably safe there for short amounts of time. You 2524The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2525for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link
2527map.
2369 2528
2370Will never block. 2529Will never block.
2371 2530
2372=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2373 2532
… …
2425 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2427 2586
2428 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2431 2590
2432 $map->load; 2591 $map->load;
2433 $map->load_neighbours; 2592 $map->load_neighbours;
2434 2593
2435 return unless $self->contr->active; 2594 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2595
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2440} 2601}
2441 2602
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2604
2444Moves the player to the given map-path and coordinates by first freezing 2605Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2606her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2607that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2608the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2609be called at the end of this process.
2449 2610
2611Note that $check will be called with a potentially non-loaded map, so if
2612it needs a loaded map it has to call C<< ->load >>.
2613
2450=cut 2614=cut
2451 2615
2452our $GOTOGEN; 2616our $GOTOGEN;
2453 2617
2454sub cf::object::player::goto { 2618sub cf::object::player::goto {
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2623
2460 $self->enter_link; 2624 $self->enter_link;
2461 2625
2462 (async { 2626 (async {
2627 $Coro::current->{desc} = "player::goto $path $x $y";
2628
2629 # *tag paths override both path and x|y
2630 if ($path =~ /^\*(.*)$/) {
2631 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2632 my $ob = $obs[rand @obs];
2633
2634 # see if we actually can go there
2635 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2636 $ob = $obs[rand @obs];
2637 } else {
2638 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2639 }
2640 # else put us there anyways for now #d#
2641
2642 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2643 } else {
2644 ($path, $x, $y) = (undef, undef, undef);
2645 }
2646 }
2647
2463 my $map = eval { 2648 my $map = eval {
2464 my $map = cf::map::find $path; 2649 my $map = defined $path ? cf::map::find $path : undef;
2465 2650
2466 if ($map) { 2651 if ($map) {
2467 $map = $map->customise_for ($self); 2652 $map = $map->customise_for ($self);
2468 $map = $check->($map) if $check && $map; 2653 $map = $check->($map) if $check && $map;
2469 } else { 2654 } else {
2470 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2655 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2656 }
2472 2657
2473 $map 2658 $map
2474 }; 2659 };
2475 2660
… …
2511} 2696}
2512 2697
2513sub prepare_random_map { 2698sub prepare_random_map {
2514 my ($exit) = @_; 2699 my ($exit) = @_;
2515 2700
2516 my $guard = cf::lock_acquire "exit_prepare:$exit";
2517
2518 # all this does is basically replace the /! path by 2701 # all this does is basically replace the /! path by
2519 # a new random map path (?random/...) with a seed 2702 # a new random map path (?random/...) with a seed
2520 # that depends on the exit object 2703 # that depends on the exit object
2521 2704
2522 my $rmp = parse_random_map_params $exit->msg; 2705 my $rmp = parse_random_map_params $exit->msg;
… …
2524 if ($exit->map) { 2707 if ($exit->map) {
2525 $rmp->{region} = $exit->region->name; 2708 $rmp->{region} = $exit->region->name;
2526 $rmp->{origin_map} = $exit->map->path; 2709 $rmp->{origin_map} = $exit->map->path;
2527 $rmp->{origin_x} = $exit->x; 2710 $rmp->{origin_x} = $exit->x;
2528 $rmp->{origin_y} = $exit->y; 2711 $rmp->{origin_y} = $exit->y;
2712
2713 $exit->map->touch;
2529 } 2714 }
2530 2715
2531 $rmp->{random_seed} ||= $exit->random_seed; 2716 $rmp->{random_seed} ||= $exit->random_seed;
2532 2717
2533 my $data = cf::to_json $rmp; 2718 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2534 my $md5 = Digest::MD5::md5_hex $data; 2719 my $md5 = Digest::MD5::md5_hex $data;
2535 my $meta = "$RANDOMDIR/$md5.meta"; 2720 my $meta = "$RANDOMDIR/$md5.meta";
2536 2721
2537 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2722 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2538 aio_write $fh, 0, (length $data), $data, 0; 2723 aio_write $fh, 0, (length $data), $data, 0;
2539 undef $fh; 2724 undef $fh;
2540 aio_rename "$meta~", $meta; 2725 aio_rename "$meta~", $meta;
2541 2726
2727 my $slaying = "?random/$md5";
2728
2729 if ($exit->valid) {
2542 $exit->slaying ("?random/$md5"); 2730 $exit->slaying ("?random/$md5");
2543 $exit->msg (undef); 2731 $exit->msg (undef);
2732 }
2544 } 2733 }
2545} 2734}
2546 2735
2547sub cf::object::player::enter_exit { 2736sub cf::object::player::enter_exit {
2548 my ($self, $exit) = @_; 2737 my ($self, $exit) = @_;
2549 2738
2550 return unless $self->type == cf::PLAYER; 2739 return unless $self->type == cf::PLAYER;
2551 2740
2552 if ($exit->slaying eq "/!") {
2553 #TODO: this should de-fi-ni-te-ly not be a sync-job
2554 # the problem is that $exit might not survive long enough
2555 # so it needs to be done right now, right here
2556 cf::sync_job { prepare_random_map $exit };
2557 }
2558
2559 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2560 my $hp = $exit->stats->hp;
2561 my $sp = $exit->stats->sp;
2562
2563 $self->enter_link; 2741 $self->enter_link;
2564 2742
2565 # if exit is damned, update players death & WoR home-position
2566 $self->contr->savebed ($slaying, $hp, $sp)
2567 if $exit->flag (FLAG_DAMNED);
2568
2569 (async { 2743 (async {
2570 $self->deactivate_recursive; # just to be sure 2744 $Coro::current->{desc} = "enter_exit";
2745
2571 unless (eval { 2746 unless (eval {
2747 $self->deactivate_recursive; # just to be sure
2748
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2758 my $x = $exit->stats->hp;
2759 my $y = $exit->stats->sp;
2760
2572 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($map, $x, $y);
2573 2762
2763 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y)
2765 if $exit->flag (cf::FLAG_DAMNED);
2766
2574 1; 2767 1
2575 }) { 2768 }) {
2576 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2577 . "I'll try to bring you back to the map you were before. " 2770 . "I'll try to bring you back to the map you were before. "
2578 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2579 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2580 2773
2581 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
… …
2598sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2599 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2600 2793
2601 utf8::encode $text; 2794 utf8::encode $text;
2602 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796}
2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2603} 2821}
2604 2822
2605=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2606 2824
2607Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2609the message, with C<log> being the default. If C<$color> is negative, suppress 2827the message, with C<log> being the default. If C<$color> is negative, suppress
2610the message unless the client supports the msg packet. 2828the message unless the client supports the msg packet.
2611 2829
2612=cut 2830=cut
2613 2831
2832# non-persistent channels (usually the info channel)
2614our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2615 "c/identify" => { 2840 "c/identify" => {
2616 id => "identify", 2841 id => "infobox",
2617 title => "Identify", 2842 title => "Identify",
2618 reply => undef, 2843 reply => undef,
2619 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
2620 }, 2845 },
2621 "c/examine" => { 2846 "c/examine" => {
2622 id => "examine", 2847 id => "infobox",
2623 title => "Examine", 2848 title => "Examine",
2624 reply => undef, 2849 reply => undef,
2625 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2626 }, 2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2857 },
2858 "c/book" => {
2859 id => "infobox",
2860 title => "Book",
2861 reply => undef,
2862 tooltip => "The contents of a note or book",
2863 },
2864 "c/lookat" => {
2865 id => "infobox",
2866 title => "Look",
2867 reply => undef,
2868 tooltip => "What you saw there",
2869 },
2870 "c/who" => {
2871 id => "infobox",
2872 title => "Players",
2873 reply => undef,
2874 tooltip => "Shows players who are currently online",
2875 },
2876 "c/body" => {
2877 id => "infobox",
2878 title => "Body Parts",
2879 reply => undef,
2880 tooltip => "Shows which body parts you posess and are available",
2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2888 "c/skills" => {
2889 id => "infobox",
2890 title => "Skills",
2891 reply => undef,
2892 tooltip => "Shows your experience per skill and item power",
2893 },
2894 "c/shopitems" => {
2895 id => "infobox",
2896 title => "Shop Items",
2897 reply => undef,
2898 tooltip => "Shows the items currently for sale in this shop",
2899 },
2900 "c/resistances" => {
2901 id => "infobox",
2902 title => "Resistances",
2903 reply => undef,
2904 tooltip => "Shows your resistances",
2905 },
2906 "c/pets" => {
2907 id => "infobox",
2908 title => "Pets",
2909 reply => undef,
2910 tooltip => "Shows information abotu your pets/a specific pet",
2911 },
2912 "c/perceiveself" => {
2913 id => "infobox",
2914 title => "Perceive Self",
2915 reply => undef,
2916 tooltip => "You gained detailed knowledge about yourself",
2917 },
2918 "c/uptime" => {
2919 id => "infobox",
2920 title => "Uptime",
2921 reply => undef,
2922 tooltip => "How long the server has been running since last restart",
2923 },
2924 "c/mapinfo" => {
2925 id => "infobox",
2926 title => "Map Info",
2927 reply => undef,
2928 tooltip => "Information related to the maps",
2929 },
2930 "c/party" => {
2931 id => "party",
2932 title => "Party",
2933 reply => "gsay ",
2934 tooltip => "Messages and chat related to your party",
2935 },
2936 "c/death" => {
2937 id => "death",
2938 title => "Death",
2939 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death",
2941 },
2942 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL,
2627); 2944);
2628 2945
2629sub cf::client::send_msg { 2946sub cf::client::send_msg {
2630 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2631 2948
2632 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2633 2951
2634 $color &= cf::NDI_CLIENT_MASK; # just in case... 2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635 2953
2636 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2955 if ($CHANNEL{$channel}) {
2956 $channel = $CHANNEL{$channel};
2638 2957
2958 $self->ext_msg (channel_info => $channel);
2959 $channel = $channel->{id};
2960
2639 if (ref $channel) { 2961 } elsif (ref $channel) {
2640 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2641 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2642 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2643 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2644 if $self->can_msg;
2645 } 2966 }
2646 2967
2647 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2648 } 2969 }
2649 2970
2650 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2651 2972
2652 if ($self->can_msg) {
2653 # default colour, mask it out 2973 # default colour, mask it out
2654 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2655 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2656 2976
2657 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2977 my $pkt = "msg "
2978 . $self->{json_coder}->encode (
2658 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2659 } else { 2980 );
2660 if ($color >= 0) {
2661 # replace some tags by gcfclient-compatible ones
2662 for ($msg) {
2663 1 while
2664 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2665 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2666 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2667 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2668 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2669 }
2670 2981
2671 $color &= cf::NDI_COLOR_MASK; 2982 $self->send_big_packet ($pkt);
2672
2673 utf8::encode $msg;
2674
2675 if (0 && $msg =~ /\[/) {
2676 # COMMAND/INFO
2677 $self->send_packet ("drawextinfo $color 10 8 $msg")
2678 } else {
2679 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2680 $self->send_packet ("drawinfo $color $msg")
2681 }
2682 }
2683 }
2684} 2983}
2685 2984
2686=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2687 2986
2688Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2691 2990
2692sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2693 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2694 2993
2695 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2696 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2697 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2698 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2699 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2700 } 2999 }
2701} 3000}
2702 3001
2703=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2704 3003
… …
2708 3007
2709sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2710 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2711 3010
2712 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2713 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2714 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2715 #TODO: version 1, remove 3014 #TODO: version 1, remove
2716 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2717 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2718 } 3017 }
2719} 3018}
2720 3019
2721=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2722 3021
… …
2849our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
2850 3149
2851$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
2852 3151
2853$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
2854 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
2855 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
2856 sort time 3155 sort time
2857)); 3156));
2858 3157
2859# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
2861=pod 3160=pod
2862 3161
2863The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
2864 3163
2865 cf::object 3164 cf::object
2866 contr pay_amount pay_player map x y force_find force_add 3165 contr pay_amount pay_player map x y force_find force_add destroy
2867 insert remove name archname title slaying race decrease_ob_nr 3166 insert remove name archname title slaying race decrease split
3167 value
2868 3168
2869 cf::object::player 3169 cf::object::player
2870 player 3170 player
2871 3171
2872 cf::player 3172 cf::player
… …
2877 3177
2878=cut 3178=cut
2879 3179
2880for ( 3180for (
2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882 insert remove inv name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
2883 decrease_ob_nr)], 3183 decrease split destroy change_exp value msg lore send_msg)],
2884 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
2885 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
2886 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
2887) { 3187) {
2888 no strict 'refs'; 3188 no strict 'refs';
2889 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
2890 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2908 3208
2909 my $qcode = $code; 3209 my $qcode = $code;
2910 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2911 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
2912 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
2913 local $_; 3216 local $_;
2914 local @safe::cf::_safe_eval_args = values %vars;
2915 3217
2916 my $eval = 3218 my $eval =
2917 "do {\n" 3219 "do {\n"
2918 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2919 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
2920 . $code 3222 . $code
2921 . "\n}" 3223 . "\n}"
2922 ; 3224 ;
2923 3225
3226 if ($CFG{safe_eval}) {
2924 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
2925 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2926 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
2927 3235
2928 if ($@) { 3236 if ($@) {
2929 warn "$@"; 3237 warn "$@";
2930 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
2931 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
2950=cut 3258=cut
2951 3259
2952sub register_script_function { 3260sub register_script_function {
2953 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
2954 3262
2955 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
2956 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
2957} 3265}
2958 3266
2959=back 3267=back
2960 3268
2961=cut 3269=cut
… …
2982 3290
2983 $facedata->{version} == 2 3291 $facedata->{version} == 2
2984 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
2985 3293
2986 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2987 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
2988 type => FT_RSRC, 3297 type => FT_RSRC,
2989 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
2990 }; 3300 };
2991 cf::cede_to_tick; 3301 cf::cede_to_tick;
2992 3302
2993 { 3303 {
2994 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
2995 3305
2996 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
2997 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3308
2998 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
2999 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3000 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3001 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3002 3313
3003 cf::cede_to_tick; 3314 cf::cede_to_tick;
3004 } 3315 }
3005 3316
3006 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
3007 next unless $info->{smooth}; 3318 next unless $info->{smooth};
3319
3008 my $idx = cf::face::find $face 3320 my $idx = cf::face::find $face
3009 or next; 3321 or next;
3322
3010 if (my $smooth = cf::face::find $info->{smooth}) { 3323 if (my $smooth = cf::face::find $info->{smooth}) {
3011 cf::face::set_smooth $idx, $smooth; 3324 cf::face::set_smooth $idx, $smooth;
3012 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3013 } else { 3326 } else {
3014 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3327 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3028 3341
3029 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3030 } 3343 }
3031 3344
3032 { 3345 {
3033 # TODO: for gcfclient pleasure, we should give resources
3034 # that gcfclient doesn't grok a >10000 face index.
3035 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3036 3347
3037 my $soundconf = delete $res->{"res/sound.conf"};
3038
3039 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3349 if (defined $info->{type}) {
3040 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3041 my $data;
3042 3351
3043 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3044 # prepend meta info 3353 cf::face::set_type $idx, $info->{type};
3045
3046 my $meta = $enc->encode ({
3047 name => $name,
3048 %{ $info->{meta} || {} },
3049 });
3050
3051 $data = pack "(w/a*)*", $meta, $info->{data};
3052 } else { 3354 } else {
3053 $data = $info->{data}; 3355 $RESOURCE{$name} = $info;
3054 } 3356 }
3055 3357
3056 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3057 cf::face::set_type $idx, $info->{type};
3058
3059 cf::cede_to_tick; 3358 cf::cede_to_tick;
3060 } 3359 }
3061
3062 if ($soundconf) {
3063 $soundconf = $enc->decode (delete $soundconf->{data});
3064
3065 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3066 my $sound = $soundconf->{compat}[$_]
3067 or next;
3068
3069 my $face = cf::face::find "sound/$sound->[1]";
3070 cf::sound::set $sound->[0] => $face;
3071 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3072 }
3073
3074 while (my ($k, $v) = each %{$soundconf->{event}}) {
3075 my $face = cf::face::find "sound/$v";
3076 cf::sound::set $k => $face;
3077 }
3078 }
3079 } 3360 }
3361
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3080 3363
3081 1 3364 1
3082} 3365}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3083 3386
3084register_exticmd fx_want => sub { 3387register_exticmd fx_want => sub {
3085 my ($ns, $want) = @_; 3388 my ($ns, $want) = @_;
3086 3389
3087 while (my ($k, $v) = each %$want) { 3390 while (my ($k, $v) = each %$want) {
3088 $ns->fx_want ($k, $v); 3391 $ns->fx_want ($k, $v);
3089 } 3392 }
3090}; 3393};
3394
3395sub load_resource_file($) {
3396 my $guard = lock_acquire "load_resource_file";
3397
3398 my $status = load_resource_file_ $_[0];
3399 get_slot 0.1, 100;
3400 cf::arch::commit_load;
3401
3402 $status
3403}
3091 3404
3092sub reload_regions { 3405sub reload_regions {
3093 # HACK to clear player env face cache, we need some signal framework 3406 # HACK to clear player env face cache, we need some signal framework
3094 # for this (global event?) 3407 # for this (global event?)
3095 %ext::player_env::MUSIC_FACE_CACHE = (); 3408 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3109} 3422}
3110 3423
3111sub reload_archetypes { 3424sub reload_archetypes {
3112 load_resource_file "$DATADIR/archetypes" 3425 load_resource_file "$DATADIR/archetypes"
3113 or die "unable to load archetypes\n"; 3426 or die "unable to load archetypes\n";
3114 #d# NEED to laod twice to resolve forward references
3115 # this really needs to be done in an extra post-pass
3116 # (which needs to be synchronous, so solve it differently)
3117 load_resource_file "$DATADIR/archetypes"
3118 or die "unable to load archetypes\n";
3119} 3427}
3120 3428
3121sub reload_treasures { 3429sub reload_treasures {
3122 load_resource_file "$DATADIR/treasures" 3430 load_resource_file "$DATADIR/treasures"
3123 or die "unable to load treasurelists\n"; 3431 or die "unable to load treasurelists\n";
3124} 3432}
3125 3433
3126sub reload_resources { 3434sub reload_resources {
3127 warn "reloading resource files...\n"; 3435 warn "reloading resource files...\n";
3128 3436
3437 reload_facedata;
3438 reload_archetypes;
3129 reload_regions; 3439 reload_regions;
3130 reload_facedata;
3131 #reload_archetypes;#d#
3132 reload_archetypes;
3133 reload_treasures; 3440 reload_treasures;
3134 3441
3135 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3136} 3443}
3137 3444
3138sub init {
3139 reload_resources;
3140}
3141
3142sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3143 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3144 or return; 3449 or return;
3145 3450
3146 local $/; 3451 local $/;
3147 *CFG = YAML::Syck::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3148 3453
3149 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3150 3455
3151 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3152 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3156 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3157 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3158 }; 3463 };
3159 warn $@ if $@; 3464 warn $@ if $@;
3160 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3468}
3469
3470sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!";
3473 flock $fh, &Fcntl::LOCK_EX
3474 or die "$PIDFILE: flock: $!";
3475 $fh
3476}
3477
3478# make sure only one server instance is running at any one time
3479sub atomic {
3480 my $fh = pidfile;
3481
3482 my $pid = <$fh>;
3483 kill 9, $pid if $pid > 0;
3484
3485 seek $fh, 0, 0;
3486 print $fh $$;
3487}
3488
3489sub main_loop {
3490 warn "EV::loop starting\n";
3491 if (1) {
3492 EV::loop;
3493 }
3494 warn "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP;
3161} 3496}
3162 3497
3163sub main { 3498sub main {
3499 cf::init_globals; # initialise logging
3500
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512
3164 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3165 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3166 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3167 (async { 3516 (async {
3168 Event::one_event; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3518 EV::loop EV::LOOP_ONESHOT;
3169 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3170 }; 3520 };
3171 3521
3522 evthread_start IO::AIO::poll_fileno;
3523
3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3528 reload_resources;
3172 reload_config; 3529 reload_config;
3173 db_init; 3530 db_init;
3531
3532 cf::init_uuid;
3533 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills;
3536
3537 cf::init_beforeplay;
3538
3539 atomic;
3540
3174 load_extensions; 3541 load_extensions;
3175 3542
3176 $TICK_WATCHER->start; 3543 utime time, time, $RUNTIMEFILE;
3177 Event::loop; 3544
3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548
3549 (pop @POST_INIT)->(0) while @POST_INIT;
3550 };
3551
3552 main_loop;
3178} 3553}
3179 3554
3180############################################################################# 3555#############################################################################
3181# initialisation and cleanup 3556# initialisation and cleanup
3182 3557
3183# install some emergency cleanup handlers 3558# install some emergency cleanup handlers
3184BEGIN { 3559BEGIN {
3560 our %SIGWATCHER = ();
3185 for my $signal (qw(INT HUP TERM)) { 3561 for my $signal (qw(INT HUP TERM)) {
3186 Event->signal ( 3562 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 signal => $signal,
3190 prio => 0,
3191 cb => sub {
3192 cf::cleanup "SIG$signal"; 3563 cf::cleanup "SIG$signal";
3193 },
3194 ); 3564 };
3195 } 3565 }
3196} 3566}
3197 3567
3198sub write_runtime { 3568sub write_runtime_sync {
3199 my $runtime = "$LOCALDIR/runtime";
3200
3201 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
3202 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
3203 3571
3204 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3205 3573
3206 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
3207 3575
3208 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3209 or return; 3577 or return;
3210 3578
3211 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
3212 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
3213 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
… …
3223 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
3224 3592
3225 close $fh 3593 close $fh
3226 or return; 3594 or return;
3227 3595
3228 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3229 and return; 3597 and return;
3230 3598
3231 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
3232 3600
3233 1 3601 1
3602}
3603
3604our $uuid_lock;
3605our $uuid_skip;
3606
3607sub write_uuid_sync($) {
3608 $uuid_skip ||= $_[0];
3609
3610 return if $uuid_lock;
3611 local $uuid_lock = 1;
3612
3613 my $uuid = "$LOCALDIR/uuid";
3614
3615 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3616 or return;
3617
3618 my $value = uuid_seq uuid_cur;
3619
3620 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n";
3622 return;
3623 }
3624
3625 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0;
3627
3628 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3629 and return;
3630
3631 # always fsync - this file is important
3632 aio_fsync $fh
3633 and return;
3634
3635 close $fh
3636 or return;
3637
3638 aio_rename "$uuid~", $uuid
3639 and return;
3640
3641 warn "uuid file written ($value).\n";
3642
3643 1
3644
3645}
3646
3647sub write_uuid($$) {
3648 my ($skip, $sync) = @_;
3649
3650 $sync ? write_uuid_sync $skip
3651 : async { write_uuid_sync $skip };
3234} 3652}
3235 3653
3236sub emergency_save() { 3654sub emergency_save() {
3237 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3238 3656
3239 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3240 3658
3241 cf::sync_job { 3659 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664
3242 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3243 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3244 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3245 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3246 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3247 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3248 $pl->valid or next; 3671 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3249 $pl->save; 3673 $pl->save;
3250 } 3674 }
3251 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3252 3676
3253 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3254 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3255 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3256 $map->valid or next; 3680 $map->valid or next;
3257 $map->save; 3681 $map->save;
3258 } 3682 }
3259 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3260 3684
3261 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3262 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3263 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3688
3689 warn "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1;
3691 warn "emergency_perl_save: end write uuid\n";
3264 }; 3692 };
3265 3693
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3266 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3267} 3700}
3268 3701
3269sub post_cleanup { 3702sub post_cleanup {
3270 my ($make_core) = @_; 3703 my ($make_core) = @_;
3271 3704
3272 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
3273 if $make_core; 3706 if $make_core;
3707
3708 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$;
3710}
3711
3712# a safer delete_package, copied from Symbol
3713sub clear_package($) {
3714 my $pkg = shift;
3715
3716 # expand to full symbol table name if needed
3717 unless ($pkg =~ /^main::.*::$/) {
3718 $pkg = "main$pkg" if $pkg =~ /^::/;
3719 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3720 $pkg .= '::' unless $pkg =~ /::$/;
3721 }
3722
3723 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3724 my $stem_symtab = *{$stem}{HASH};
3725
3726 defined $stem_symtab and exists $stem_symtab->{$leaf}
3727 or return;
3728
3729 # clear all symbols
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 }
3735 warn "cleared package $pkg\n";#d#
3274} 3736}
3275 3737
3276sub do_reload_perl() { 3738sub do_reload_perl() {
3277 # can/must only be called in main 3739 # can/must only be called in main
3278 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3279 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3280 return; 3742 return;
3281 } 3743 }
3282 3744
3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3748
3749 while ($RELOAD) {
3283 warn "reloading..."; 3750 warn "reloading...";
3284 3751
3285 warn "entering sync_job"; 3752 warn "entering sync_job";
3286 3753
3287 cf::sync_job { 3754 cf::sync_job {
3288 cf::write_runtime; # external watchdog should not bark 3755 cf::write_runtime_sync; # external watchdog should not bark
3289 cf::emergency_save; 3756 cf::emergency_save;
3290 cf::write_runtime; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3291 3758
3292 warn "syncing database to disk"; 3759 warn "syncing database to disk";
3293 BDB::db_env_txn_checkpoint $DB_ENV; 3760 BDB::db_env_txn_checkpoint $DB_ENV;
3294 3761
3295 # if anything goes wrong in here, we should simply crash as we already saved 3762 # if anything goes wrong in here, we should simply crash as we already saved
3296 3763
3297 warn "cancelling all WF_AUTOCANCEL watchers";
3298 for (Event::all_watchers) {
3299 $_->cancel if $_->data & WF_AUTOCANCEL;
3300 }
3301
3302 warn "flushing outstanding aio requests"; 3764 warn "flushing outstanding aio requests";
3303 for (;;) {
3304 BDB::flush;
3305 IO::AIO::flush;
3306 Coro::cede;
3307 last unless IO::AIO::nreqs || BDB::nreqs; 3765 while (IO::AIO::nreqs || BDB::nreqs) {
3308 warn "iterate..."; 3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3309 }
3310
3311 ++$RELOAD;
3312
3313 warn "cancelling all extension coros";
3314 $_->cancel for values %EXT_CORO;
3315 %EXT_CORO = ();
3316
3317 warn "removing commands";
3318 %COMMAND = ();
3319
3320 warn "removing ext/exti commands";
3321 %EXTCMD = ();
3322 %EXTICMD = ();
3323
3324 warn "unloading/nuking all extensions";
3325 for my $pkg (@EXTS) {
3326 warn "... unloading $pkg";
3327
3328 if (my $cb = $pkg->can ("unload")) {
3329 eval {
3330 $cb->($pkg);
3331 1
3332 } or warn "$pkg unloaded, but with errors: $@";
3333 } 3767 }
3334 3768
3335 warn "... nuking $pkg"; 3769 warn "cancelling all extension coros";
3336 Symbol::delete_package $pkg; 3770 $_->cancel for values %EXT_CORO;
3337 } 3771 %EXT_CORO = ();
3338 3772
3339 warn "unloading all perl modules loaded from $LIBDIR"; 3773 warn "removing commands";
3340 while (my ($k, $v) = each %INC) { 3774 %COMMAND = ();
3341 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3342 3775
3776 warn "removing ext/exti commands";
3777 %EXTCMD = ();
3778 %EXTICMD = ();
3779
3780 warn "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) {
3343 warn "... unloading $k"; 3782 warn "... unloading $pkg";
3344 delete $INC{$k};
3345 3783
3346 $k =~ s/\.pm$//;
3347 $k =~ s/\//::/g;
3348
3349 if (my $cb = $k->can ("unload_module")) { 3784 if (my $cb = $pkg->can ("unload")) {
3785 eval {
3350 $cb->(); 3786 $cb->($pkg);
3787 1
3788 } or warn "$pkg unloaded, but with errors: $@";
3789 }
3790
3791 warn "... clearing $pkg";
3792 clear_package $pkg;
3351 } 3793 }
3352 3794
3353 Symbol::delete_package $k; 3795 warn "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798
3799 warn "... unloading $k";
3800 delete $INC{$k};
3801
3802 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g;
3804
3805 if (my $cb = $k->can ("unload_module")) {
3806 $cb->();
3807 }
3808
3809 clear_package $k;
3354 } 3810 }
3355 3811
3356 warn "getting rid of safe::, as good as possible"; 3812 warn "getting rid of safe::, as good as possible";
3357 Symbol::delete_package "safe::$_" 3813 clear_package "safe::$_"
3358 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3359 3815
3360 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3361 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3362 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3363 3819
3364 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3365 # and global variables created in xs 3821 # and global variables created in xs
3366 #Symbol::delete_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3367 3823
3368 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3369 3825
3370 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3371 require cf; 3827 require cf;
3372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3373 3829
3374 warn "loading config and database again"; 3830 warn "loading config and database again";
3375 cf::reload_config; 3831 cf::reload_config;
3376 3832
3377 warn "loading extensions"; 3833 warn "loading extensions";
3378 cf::load_extensions; 3834 cf::load_extensions;
3379 3835
3836 if ($REATTACH_ON_RELOAD) {
3380 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3381 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3382 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3383 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3384 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3385 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3386 3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847
3387 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3388 3849
3389 1 3850 1
3390 } or do { 3851 } or do {
3391 warn $@; 3852 warn $@;
3392 warn "error while reloading, exiting."; 3853 cf::cleanup "error while reloading, exiting.";
3393 exit 1;
3394 }; 3854 };
3395 3855
3396 warn "reloaded"; 3856 warn "reloaded";
3857 --$RELOAD;
3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3397}; 3862};
3398 3863
3399our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3400 3865
3401sub reload_perl() { 3866sub reload_perl() {
3402 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3403 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3404 3869
3405 $RELOAD_WATCHER ||= Event->timer ( 3870 $RELOAD_WATCHER ||= cf::async {
3406 reentrant => 0, 3871 Coro::AIO::aio_wait cache_extensions;
3407 after => 0, 3872
3408 data => WF_AUTOCANCEL, 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3409 cb => sub {
3410 do_reload_perl; 3874 do_reload_perl;
3411 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3412 }, 3876 };
3413 ); 3877 };
3414} 3878}
3415 3879
3416register_command "reload" => sub { 3880register_command "reload" => sub {
3417 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
3418 3882
3419 if ($who->flag (FLAG_WIZ)) { 3883 if ($who->flag (FLAG_WIZ)) {
3420 $who->message ("reloading server."); 3884 $who->message ("reloading server.");
3885 async {
3886 $Coro::current->{desc} = "perl_reload";
3421 async { reload_perl }; 3887 reload_perl;
3888 };
3422 } 3889 }
3423}; 3890};
3424 3891
3425unshift @INC, $LIBDIR; 3892unshift @INC, $LIBDIR;
3426 3893
… …
3428 3895
3429our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3430our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3431 3898
3432sub wait_for_tick { 3899sub wait_for_tick {
3433 return unless $TICK_WATCHER->is_active;
3434 return if $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3435 3901
3436 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3437 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3438 $signal->wait; 3904 $signal->wait;
3439} 3905}
3440 3906
3441sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3442 return unless $TICK_WATCHER->is_active;
3443 return if $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3444 3909
3445 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3446 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3447 $signal->wait; 3912 $signal->wait;
3448} 3913}
3449 3914
3450our $stat_fh; 3915sub tick {
3451sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3452
3453$TICK_WATCHER = Event->timer (
3454 reentrant => 0,
3455 parked => 1,
3456 prio => 0,
3457 at => $NEXT_TICK || $TICK,
3458 data => WF_AUTOCANCEL,
3459 cb => sub {
3460 if ($Coro::current != $Coro::main) { 3916 if ($Coro::current != $Coro::main) {
3461 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3917 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3462 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3463 return; 3919 return;
3464 } 3920 }
3465 3921
3466 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3467
3468 $NOW = $tick_start = Event::time;
3469
3470 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3471 3923
3472 $RUNTIME += $TICK; 3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3473 $NEXT_TICK += $TICK;
3474 3925
3475 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3476 $NEXT_RUNTIME_WRITE = $NOW + 10; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3477 Coro::async_pool { 3928 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver";
3478 write_runtime 3930 write_runtime_sync
3479 or warn "ERROR: unable to write runtime file: $!"; 3931 or warn "ERROR: unable to write runtime file: $!";
3480 };
3481 } 3932 };
3933 }
3482 3934
3483# my $AFTER = Event::time;
3484# warn $AFTER - $NOW;#d#
3485
3486 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3487 $sig->send; 3936 $sig->send;
3488 } 3937 }
3489 while (my $sig = shift @WAIT_FOR_TICK) { 3938 while (my $sig = shift @WAIT_FOR_TICK) {
3490 $sig->send; 3939 $sig->send;
3491 } 3940 }
3492 3941
3493 $NOW = Event::time; 3942 $LOAD = ($NOW - $TICK_START) / $TICK;
3494
3495 # if we are delayed by four ticks or more, skip them all
3496 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3497
3498 $TICK_WATCHER->at ($NEXT_TICK);
3499 $TICK_WATCHER->start;
3500
3501 $LOAD = ($NOW - $tick_start) / $TICK;
3502 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3943 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3503 3944
3504 _post_tick; 3945 if (0) {
3505 3946 if ($NEXT_TICK) {
3506 # gather some statistics#d# 3947 my $jitter = $TICK_START - $NEXT_TICK;
3507 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3508 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3949 warn "jitter $JITTER\n";#d#
3950 }
3509 }, 3951 }
3510); 3952}
3511 3953
3512{ 3954{
3955 # configure BDB
3956
3513 BDB::min_parallel 8; 3957 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3959 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3960
3539 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3541 3968
3542 cf::sync_job { 3969 cf::sync_job {
3543 eval { 3970 eval {
3544 BDB::db_env_open 3971 BDB::db_env_open
3545 $DB_ENV, 3972 $DB_ENV,
… …
3547 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3974 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3548 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3975 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3549 0666; 3976 0666;
3550 3977
3551 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3978 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3552
3553 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3554 | BDB::LOG_AUTOREMOVE, 1);
3555 $DB_ENV->set_lk_detect;
3556 }; 3979 };
3557 3980
3558 cf::cleanup "db_env_open(db): $@" if $@; 3981 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3982 };
3560 } 3983 }
3561 3984
3562 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3985 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 11, 3986 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3564 interval => 60, 3987 };
3565 hard => 1, 3988 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3989 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3570 },
3571 ); 3990 };
3572 $BDB_TRICKLE_WATCHER = Event->timer ( 3991 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3573 after => 5,
3574 interval => 10,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3992 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3580 },
3581 ); 3993 };
3582} 3994}
3583 3995
3584{ 3996{
3997 # configure IO::AIO
3998
3585 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3586
3587 undef $Coro::AIO::WATCHER;
3588 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3589 $AIO_POLL_WATCHER = Event->io ( 4001 undef $AnyEvent::AIO::WATCHER;
3590 reentrant => 0,
3591 data => WF_AUTOCANCEL,
3592 fd => IO::AIO::poll_fileno,
3593 poll => 'r',
3594 prio => 6,
3595 cb => \&IO::AIO::poll_cb,
3596 );
3597} 4002}
3598 4003
3599my $_log_backtrace; 4004my $_log_backtrace;
3600 4005
3601sub _log_backtrace { 4006sub _log_backtrace {
… …
3604 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3605 4010
3606 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3607 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3608 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3609 async { 4015 async {
4016 $Coro::current->{desc} = "abt $msg";
4017
3610 my @bt = fork_call { 4018 my @bt = fork_call {
3611 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
3612 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4020 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3613 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4021 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3614 or die "addr2line: $!"; 4022 or die "addr2line: $!";
… …
3622 } 4030 }
3623 4031
3624 @funcs 4032 @funcs
3625 }; 4033 };
3626 4034
3627 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3628 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3629 --$_log_backtrace; 4038 --$_log_backtrace;
3630 }; 4039 };
3631 } else { 4040 } else {
3632 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3633 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3634 } 4043 }
3635} 4044}
3636 4045
3637# load additional modules 4046# load additional modules
3638use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3639 4049
3640END { cf::emergency_save } 4050END { cf::emergency_save }
3641 4051
36421 40521
3643 4053

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines