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.366 by root, Tue Sep 11 16:05:35 2007 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 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>:
… …
353our @SLOT_QUEUE; 426our @SLOT_QUEUE;
354our $SLOT_QUEUE; 427our $SLOT_QUEUE;
355 428
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
358 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
359 434
360 while () { 435 while () {
361 next_job: 436 next_job:
362 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
… …
370 } 445 }
371 } 446 }
372 } 447 }
373 448
374 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 452 $signal->wait;
378 } else { 453 } else {
379 Coro::schedule; 454 Coro::schedule;
380 } 455 }
381 } 456 }
382}; 457};
383 458
384sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
385 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
386 463
387 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
389 466
… …
403 480
404BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
405 482
406=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
407 484
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 486is 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 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 488acceptable.
412 489
413If it must be done, put the blocking parts into C<sync_job>. This will run 490If 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 491the given BLOCK in another coroutine while waiting for the result. The
… …
419 496
420sub sync_job(&) { 497sub sync_job(&) {
421 my ($job) = @_; 498 my ($job) = @_;
422 499
423 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 501 my $time = EV::time;
425 502
426 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
428 505
429 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 507
431 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
432 509
433 my $busy = 1; 510 my $busy = 1;
434 my @res; 511 my @res;
435 512
436 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 515 @res = eval { $job->() };
438 warn $@ if $@; 516 warn $@ if $@;
439 undef $busy; 517 undef $busy;
440 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
441 519
442 while ($busy) { 520 while ($busy) {
443 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
444 } 525 }
526 }
445 527
446 $time = Event::time - $time; 528 my $time = EV::time - $time;
447 529
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 530 $TICK_START += $time; # do not account sync jobs to server load
452 531
453 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
454 } else { 533 } else {
455 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
456 535
… …
481=item fork_call { }, $args 560=item fork_call { }, $args
482 561
483Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
487 566
488=cut 567=cut
489 568
490sub fork_call(&@) { 569sub fork_call(&@) {
491 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
… …
498 reset_signals; 577 reset_signals;
499 &$cb 578 &$cb
500 }, @args; 579 }, @args;
501 580
502 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
503} 609}
504 610
505=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
506 612
507Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
646 752
647############################################################################# 753#############################################################################
648 754
649=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
650 756
651Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
654 760
655In the following description, CLASS can be any of C<global>, C<object> 761In 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 762C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 763Deliantra).
658 764
659=over 4 765=over 4
660 766
661=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
662 768
… …
706=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
707 813
708Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
710 816
711Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
713 819
714These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
715 821
716=over 4 822=over 4
… …
944 } 1050 }
945 1051
946 0 1052 0
947} 1053}
948 1054
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1056
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1058
953Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
954 1060
… …
960 1066
961=cut 1067=cut
962 1068
963############################################################################# 1069#############################################################################
964# object support 1070# object support
965#
966 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
967sub _can_merge { 1105sub _can_merge {
968 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
969 1107
970 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1109
974 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
975} 1112}
976 1113
977sub reattach { 1114sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1116 my ($obj) = @_;
980 1117
1118 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1120
983 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
984 1122
985 @$registry = (); 1123 @$registry = ();
986 1124
… …
1001cf::attachable->attach ( 1139cf::attachable->attach (
1002 prio => -1000000, 1140 prio => -1000000,
1003 on_instantiate => sub { 1141 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1005 1143
1006 $data = from_json $data; 1144 $data = decode_json $data;
1007 1145
1008 for (@$data) { 1146 for (@$data) {
1009 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1010 1148
1011 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1162 },
1025); 1163);
1026 1164
1027sub object_freezer_save { 1165sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1167
1032 sync_job { 1168 sync_job {
1033 if (length $$rdata) { 1169 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1037 1173
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1042 close $fh; 1181 aio_close $fh;
1043 1182
1044 if (@$objs) { 1183 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1050 close $fh; 1192 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1194 }
1053 } else { 1195 } else {
1054 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1055 } 1197 }
1056 1198
1057 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1203 } else {
1059 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1060 } 1205 }
1061 } else { 1206 } else {
1062 aio_unlink $filename; 1207 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1064 } 1209 }
1065 }; 1210 };
1066
1067 undef $guard;
1068} 1211}
1069 1212
1070sub object_freezer_as_string { 1213sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1072 1215
… …
1077 1220
1078sub object_thawer_load { 1221sub object_thawer_load {
1079 my ($filename) = @_; 1222 my ($filename) = @_;
1080 1223
1081 my ($data, $av); 1224 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1225
1085 (aio_load $filename, $data) >= 0 1226 (aio_load $filename, $data) >= 0
1086 or return; 1227 or return;
1087 1228
1088 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1231 or return;
1091 1232
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1094 } 1235 }
1095 1236
1096 utf8::decode (my $decname = $filename); 1237 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
… …
1159 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1160 1301
1161 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1162} 1303}
1163 1304
1305use File::Glob ();
1306
1164cf::player->attach ( 1307cf::player->attach (
1165 on_command => sub { 1308 on_command => sub {
1166 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1167 1310
1168 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1200 1343
1201 cf::override; 1344 cf::override;
1202 }, 1345 },
1203); 1346);
1204 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1205sub load_extensions { 1361sub load_extensions {
1206 cf::sync_job { 1362 cf::sync_job {
1207 my %todo; 1363 my %todo;
1208 1364
1209 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
… …
1228 1384
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1387
1232 $ext{source} = 1388 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1235 . $source 1391 . $source
1236 . "\n};\n1"; 1392 . "\n};\n1";
1237 1393
1238 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1256 1412
1257 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1414 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1416 }
1262 1417
1263 warn $msg; 1418 warn $msg;
1264 } 1419 }
1265 1420
… …
1279 1434
1280=back 1435=back
1281 1436
1282=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1283 1438
1284Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1285 1440
1286=cut 1441=cut
1287 1442
1288package cf::player; 1443package cf::player;
1289 1444
… …
1332 1487
1333sub exists($) { 1488sub exists($) {
1334 my ($login) = @_; 1489 my ($login) = @_;
1335 1490
1336 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1338} 1493}
1339 1494
1340sub find($) { 1495sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1497 my $login = $_[0];
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1508
1354 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1510 or return;
1356 1511
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1359 or return; 1513 or return;
1514
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1363 } 1518 }
1364 } 1519 }
… …
1374 1529
1375 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1376 1531
1377 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1379 1536
1380 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1538 cf::cede_to_tick;
1382} 1539}
1383 1540
… …
1415 my ($pl) = @_; 1572 my ($pl) = @_;
1416 1573
1417 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1418 1575
1419 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1578
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1426 1585
1427 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1467 1626
1468 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1469 my $path = path $login; 1628 my $path = path $login;
1470 1629
1471 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1636 }
1477 1637
… …
1508 } 1668 }
1509 1669
1510 \@paths 1670 \@paths
1511} 1671}
1512 1672
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1674
1515Expand crossfire pod fragments into protocol xml. 1675Expand 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 1676
1564=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1565 1678
1566Sends an ext reply to the player. 1679Sends an ext reply to the player.
1567 1680
… …
1634our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1636 1749
1637sub generate_random_map { 1750sub generate_random_map {
1638 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1639 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1756 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1881
1766# the temporary/swap location 1882# the temporary/swap location
1767sub save_path { 1883sub save_path {
1768 my ($self) = @_; 1884 my ($self) = @_;
1769 1885
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1772} 1888}
1773 1889
1774# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1775sub uniq_path { 1891sub uniq_path {
1776 my ($self) = @_; 1892 my ($self) = @_;
1777 1893
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1895 "$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} 1896}
1790 1897
1791sub decay_objects { 1898sub decay_objects {
1792 my ($self) = @_; 1899 my ($self) = @_;
1793 1900
… …
1877sub find { 1984sub find {
1878 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1879 1986
1880 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1881 1988
1882 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1991
1885 $cf::MAP{$path} || do { 1992 $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 1993 my $map = new_from_path cf::map $path
1890 or return; 1994 or return;
1891 1995
1892 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1893 1997
… …
1895 or return; 1999 or return;
1896 2000
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1900 undef $guard1; 2005 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2006 $map->reset;
1903 return find $path; 2007 return find $path;
1904 } 2008 }
1905 2009
1906 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1907 } 2011 }
1908} 2012}
1909 2013
1910sub pre_load { } 2014sub pre_load { }
1911sub post_load { } 2015#sub post_load { } # XS
1912 2016
1913sub load { 2017sub load {
1914 my ($self) = @_; 2018 my ($self) = @_;
1915 2019
1916 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2038 $f->skip_block;
1935 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
1936 or return; 2040 or return;
1937 2041
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1939 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1940 2044
1941 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2046 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
… …
1961 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2066 $self->decay_objects;
1963 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1964 $self->update_buttons; 2068 $self->update_buttons;
1965 cf::cede_to_tick; 2069 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2070 $self->activate;
1969 } 2071 }
1970 2072
1971 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1973 2075
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2077 }
1976 2078
1977 $self->post_load; 2079 $self->post_load;
1978} 2080}
1979 2081
… …
2037 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2038 2140
2039 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2040 2142
2041 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2145 }
2044 2146
2045 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2046 2148
2047 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2048 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2154 if (my $map = find $k) {
2051 $map->load if $v; 2155 $map->load if $v;
2052 } 2156 }
… …
2078 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2079 2183
2080 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2081 2185
2082 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2084 }; 2189 };
2190
2191 cf::get_slot 0.02;
2085 2192
2086 if ($uniq) { 2193 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2196 } else {
… …
2098 $self->save; 2205 $self->save;
2099 2206
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2208
2102 return if $self->players; 2209 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2105 2212
2106 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2107 2214
2108 $self->deactivate; 2215 $self->deactivate;
… …
2133 2240
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2242
2136 return if $self->players; 2243 return if $self->players;
2137 2244
2138 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2139 2246
2140 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2141 2248
2142 # need to save uniques path 2249 # need to save uniques path
2143 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2226 2333
2227sub unique_maps() { 2334sub unique_maps() {
2228 [ 2335 [
2229 map { 2336 map {
2230 utf8::decode $_; 2337 utf8::decode $_;
2231 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2232 ? normalise $_ 2341 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2343 ]
2236} 2344}
2237 2345
2238package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2239 2377
2240=back 2378=back
2241 2379
2242=head3 cf::object 2380=head3 cf::object
2243 2381
… …
2247 2385
2248=over 4 2386=over 4
2249 2387
2250=item $ob->inv_recursive 2388=item $ob->inv_recursive
2251 2389
2252Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2253 2392
2254=cut 2393=cut
2255 2394
2256sub inv_recursive_; 2395sub inv_recursive_;
2257sub inv_recursive_ { 2396sub inv_recursive_ {
… …
2262 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2263} 2402}
2264 2403
2265=item $ref = $ob->ref 2404=item $ref = $ob->ref
2266 2405
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2406Creates and returns a persistent reference to an object that can be stored as a string.
2268 2407
2269=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2270 2409
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2411even if the object actually exists. May block.
… …
2274=cut 2413=cut
2275 2414
2276sub deref { 2415sub deref {
2277 my ($ref) = @_; 2416 my ($ref) = @_;
2278 2417
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2418 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2419 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2420 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2421 or return;
2286 $pl->ob->uuid eq $uuid 2422 $pl->ob->uuid eq $uuid
2287 or return; 2423 or return;
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2444dialogue with the given NPC character.
2309 2445
2310=cut 2446=cut
2311 2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2461
2312# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2463# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2479
2330 } else { 2480 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2483 }
2334 } 2484 }
2335} 2485}
2336 2486
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2362 2512
2363=item $player_object->enter_link 2513=item $player_object->enter_link
2364 2514
2365Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2366 2516
2367The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2369 2521
2370Will never block. 2522Will never block.
2371 2523
2372=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2373 2525
… …
2425 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2427 2579
2428 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2431 2583
2432 $map->load; 2584 $map->load;
2433 $map->load_neighbours; 2585 $map->load_neighbours;
2434 2586
2435 return unless $self->contr->active; 2587 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2588
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2440} 2594}
2441 2595
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2597
2444Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2600that 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 2601the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2602be called at the end of this process.
2449 2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2606
2450=cut 2607=cut
2451 2608
2452our $GOTOGEN; 2609our $GOTOGEN;
2453 2610
2454sub cf::object::player::goto { 2611sub cf::object::player::goto {
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2616
2460 $self->enter_link; 2617 $self->enter_link;
2461 2618
2462 (async { 2619 (async {
2620 $Coro::current->{desc} = "player::goto $path $x $y";
2621
2463 # *tag paths override both path and x|y 2622 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2623 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2624 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2625 my $ob = $obs[rand @obs];
2467 2626
2468 # todo: use ob_blocked to check all tiles of the destination "object" 2627 # see if we actually can go there
2469 # for suitability. 2628 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2629 $ob = $obs[rand @obs];
2630 } else {
2631 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2632 }
2633 # else put us there anyways for now #d#
2470 2634
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2635 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2636 } else {
2637 ($path, $x, $y) = (undef, undef, undef);
2472 } 2638 }
2473 } 2639 }
2474 2640
2475 my $map = eval { 2641 my $map = eval {
2476 my $map = cf::map::find $path; 2642 my $map = defined $path ? cf::map::find $path : undef;
2477 2643
2478 if ($map) { 2644 if ($map) {
2479 $map = $map->customise_for ($self); 2645 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2646 $map = $check->($map) if $check && $map;
2481 } else { 2647 } else {
2482 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2649 }
2484 2650
2485 $map 2651 $map
2486 }; 2652 };
2487 2653
… …
2523} 2689}
2524 2690
2525sub prepare_random_map { 2691sub prepare_random_map {
2526 my ($exit) = @_; 2692 my ($exit) = @_;
2527 2693
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2696 # that depends on the exit object
2533 2697
2534 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
… …
2536 if ($exit->map) { 2700 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2541 } 2707 }
2542 2708
2543 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2544 2710
2545 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2548 2714
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2717 undef $fh;
2552 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2553 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2556 } 2726 }
2557} 2727}
2558 2728
2559sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2561 2731
2562 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2563 2733
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2734 $self->enter_link;
2576 2735
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2736 (async {
2582 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2583 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2584 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2585 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2586 1; 2760 1
2587 }) { 2761 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2766
2593 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
… …
2610sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2611 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2612 2786
2613 utf8::encode $text; 2787 utf8::encode $text;
2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2615} 2814}
2616 2815
2617=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2618 2817
2619Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2821the message unless the client supports the msg packet.
2623 2822
2624=cut 2823=cut
2625 2824
2825# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2627 "c/identify" => { 2833 "c/identify" => {
2628 id => "identify", 2834 id => "infobox",
2629 title => "Identify", 2835 title => "Identify",
2630 reply => undef, 2836 reply => undef,
2631 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2632 }, 2838 },
2633 "c/examine" => { 2839 "c/examine" => {
2634 id => "examine", 2840 id => "infobox",
2635 title => "Examine", 2841 title => "Examine",
2636 reply => undef, 2842 reply => undef,
2637 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2638 }, 2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2850 },
2851 "c/book" => {
2852 id => "infobox",
2853 title => "Book",
2854 reply => undef,
2855 tooltip => "The contents of a note or book",
2856 },
2857 "c/lookat" => {
2858 id => "infobox",
2859 title => "Look",
2860 reply => undef,
2861 tooltip => "What you saw there",
2862 },
2863 "c/who" => {
2864 id => "infobox",
2865 title => "Players",
2866 reply => undef,
2867 tooltip => "Shows players who are currently online",
2868 },
2869 "c/body" => {
2870 id => "infobox",
2871 title => "Body Parts",
2872 reply => undef,
2873 tooltip => "Shows which body parts you posess and are available",
2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2911 "c/uptime" => {
2912 id => "infobox",
2913 title => "Uptime",
2914 reply => undef,
2915 tooltip => "How long the server has been running since last restart",
2916 },
2917 "c/mapinfo" => {
2918 id => "infobox",
2919 title => "Map Info",
2920 reply => undef,
2921 tooltip => "Information related to the maps",
2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2639); 2937);
2640 2938
2641sub cf::client::send_msg { 2939sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2941
2644 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2645 2944
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2946
2648 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2948 if ($CHANNEL{$channel}) {
2949 $channel = $CHANNEL{$channel};
2650 2950
2951 $self->ext_msg (channel_info => $channel);
2952 $channel = $channel->{id};
2953
2651 if (ref $channel) { 2954 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2656 if $self->can_msg;
2657 } 2959 }
2658 2960
2659 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2660 } 2962 }
2661 2963
2662 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2663 2965
2664 if ($self->can_msg) {
2665 # default colour, mask it out 2966 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2668 2969
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2671 } else { 2973 );
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682 2974
2683 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2684
2685 utf8::encode $msg;
2686
2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 }
2696} 2976}
2697 2977
2698=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2699 2979
2700Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2703 2983
2704sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2705 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2706 2986
2707 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2710 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 } 2992 }
2713} 2993}
2714 2994
2715=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2716 2996
… …
2720 3000
2721sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2723 3003
2724 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove 3007 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 } 3010 }
2731} 3011}
2732 3012
2733=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2734 3014
… …
2861our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
2862 3142
2863$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
2864 3144
2865$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
2867 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
2868 sort time 3148 sort time
2869)); 3149));
2870 3150
2871# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
2873=pod 3153=pod
2874 3154
2875The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
2876 3156
2877 cf::object 3157 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3158 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
2880 3161
2881 cf::object::player 3162 cf::object::player
2882 player 3163 player
2883 3164
2884 cf::player 3165 cf::player
… …
2889 3170
2890=cut 3171=cut
2891 3172
2892for ( 3173for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3176 decrease split destroy change_exp value msg lore send_msg)],
2896 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
2898 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
2899) { 3180) {
2900 no strict 'refs'; 3181 no strict 'refs';
2901 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
2902 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2920 3201
2921 my $qcode = $code; 3202 my $qcode = $code;
2922 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2923 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
2924 3205
3206 %vars = (_dummy => 0) unless %vars;
3207
3208 my @res;
2925 local $_; 3209 local $_;
2926 local @safe::cf::_safe_eval_args = values %vars;
2927 3210
2928 my $eval = 3211 my $eval =
2929 "do {\n" 3212 "do {\n"
2930 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2931 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
2932 . $code 3215 . $code
2933 . "\n}" 3216 . "\n}"
2934 ; 3217 ;
2935 3218
3219 if ($CFG{safe_eval}) {
2936 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
2937 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2938 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
2939 3228
2940 if ($@) { 3229 if ($@) {
2941 warn "$@"; 3230 warn "$@";
2942 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
2943 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
2962=cut 3251=cut
2963 3252
2964sub register_script_function { 3253sub register_script_function {
2965 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
2966 3255
2967 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
2968 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
2969} 3258}
2970 3259
2971=back 3260=back
2972 3261
2973=cut 3262=cut
… …
2994 3283
2995 $facedata->{version} == 2 3284 $facedata->{version} == 2
2996 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997 3286
2998 # patch in the exptable 3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2999 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC, 3290 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3002 }; 3293 };
3003 cf::cede_to_tick; 3294 cf::cede_to_tick;
3004 3295
3005 { 3296 {
3006 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
3007 3298
3008 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3301
3010 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3014 3306
3015 cf::cede_to_tick; 3307 cf::cede_to_tick;
3016 } 3308 }
3017 3309
3018 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3311 next unless $info->{smooth};
3312
3020 my $idx = cf::face::find $face 3313 my $idx = cf::face::find $face
3021 or next; 3314 or next;
3315
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3316 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3317 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3319 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3320 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3040 3334
3041 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3042 } 3336 }
3043 3337
3044 { 3338 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3048 3340
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3342 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054 3344
3055 if ($info->{type} & 1) { 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3056 # prepend meta info 3346 cf::face::set_type $idx, $info->{type};
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else { 3347 } else {
3065 $data = $info->{data}; 3348 $RESOURCE{$name} = $info;
3066 } 3349 }
3067 3350
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3351 cf::cede_to_tick;
3072 } 3352 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3353 }
3354
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3356
3093 1 3357 1
3094} 3358}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3095 3379
3096register_exticmd fx_want => sub { 3380register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3381 my ($ns, $want) = @_;
3098 3382
3099 while (my ($k, $v) = each %$want) { 3383 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3384 $ns->fx_want ($k, $v);
3101 } 3385 }
3102}; 3386};
3387
3388sub load_resource_file($) {
3389 my $guard = lock_acquire "load_resource_file";
3390
3391 my $status = load_resource_file_ $_[0];
3392 get_slot 0.1, 100;
3393 cf::arch::commit_load;
3394
3395 $status
3396}
3103 3397
3104sub reload_regions { 3398sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3399 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3400 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3401 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3121} 3415}
3122 3416
3123sub reload_archetypes { 3417sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3418 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3419 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3420}
3132 3421
3133sub reload_treasures { 3422sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3423 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3424 or die "unable to load treasurelists\n";
3136} 3425}
3137 3426
3138sub reload_resources { 3427sub reload_resources {
3139 warn "reloading resource files...\n"; 3428 warn "reloading resource files...\n";
3140 3429
3430 reload_facedata;
3431 reload_archetypes;
3141 reload_regions; 3432 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3433 reload_treasures;
3146 3434
3147 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
3148} 3436}
3149 3437
3150sub init {
3151 reload_resources;
3152}
3153
3154sub reload_config { 3438sub reload_config {
3439 warn "reloading config file...\n";
3440
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3442 or return;
3157 3443
3158 local $/; 3444 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
3160 3446
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3448
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3168 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3169 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
3170 }; 3456 };
3171 warn $@ if $@; 3457 warn $@ if $@;
3172 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3461}
3462
3463sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!";
3466 flock $fh, &Fcntl::LOCK_EX
3467 or die "$PIDFILE: flock: $!";
3468 $fh
3469}
3470
3471# make sure only one server instance is running at any one time
3472sub atomic {
3473 my $fh = pidfile;
3474
3475 my $pid = <$fh>;
3476 kill 9, $pid if $pid > 0;
3477
3478 seek $fh, 0, 0;
3479 print $fh $$;
3480}
3481
3482sub main_loop {
3483 warn "EV::loop starting\n";
3484 if (1) {
3485 EV::loop;
3486 }
3487 warn "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP;
3173} 3489}
3174 3490
3175sub main { 3491sub main {
3492 cf::init_globals; # initialise logging
3493
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505
3176 # we must not ever block the main coroutine 3506 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3507 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3508 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3509 (async {
3180 Event::one_event; 3510 $Coro::current->{desc} = "IDLE BUG HANDLER";
3511 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3512 })->prio (Coro::PRIO_MAX);
3182 }; 3513 };
3183 3514
3515 evthread_start IO::AIO::poll_fileno;
3516
3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3521 reload_resources;
3184 reload_config; 3522 reload_config;
3185 db_init; 3523 db_init;
3524
3525 cf::init_uuid;
3526 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills;
3529
3530 cf::init_beforeplay;
3531
3532 atomic;
3533
3186 load_extensions; 3534 load_extensions;
3187 3535
3188 $TICK_WATCHER->start; 3536 utime time, time, $RUNTIMEFILE;
3189 Event::loop; 3537
3538 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX ();
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541
3542 (pop @POST_INIT)->(0) while @POST_INIT;
3543 };
3544
3545 main_loop;
3190} 3546}
3191 3547
3192############################################################################# 3548#############################################################################
3193# initialisation and cleanup 3549# initialisation and cleanup
3194 3550
3195# install some emergency cleanup handlers 3551# install some emergency cleanup handlers
3196BEGIN { 3552BEGIN {
3553 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3554 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3555 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3556 cf::cleanup "SIG$signal";
3205 },
3206 ); 3557 };
3207 } 3558 }
3208} 3559}
3209 3560
3210sub write_runtime { 3561sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime";
3212
3213 # first touch the runtime file to show we are still running: 3562 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3563 # the fsync below can take a very very long time.
3215 3564
3216 IO::AIO::aio_utime $runtime, undef, undef; 3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3566
3218 my $guard = cf::lock_acquire "write_runtime"; 3567 my $guard = cf::lock_acquire "write_runtime";
3219 3568
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3221 or return; 3570 or return;
3222 3571
3223 my $value = $cf::RUNTIME + 90 + 10; 3572 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3573 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3574 # 60 allows for the watchdog to kill the server.
… …
3235 aio_utime $fh, undef, undef; 3584 aio_utime $fh, undef, undef;
3236 3585
3237 close $fh 3586 close $fh
3238 or return; 3587 or return;
3239 3588
3240 aio_rename "$runtime~", $runtime 3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3590 and return;
3242 3591
3243 warn "runtime file written.\n"; 3592 warn "runtime file written.\n";
3244 3593
3245 1 3594 1
3595}
3596
3597our $uuid_lock;
3598our $uuid_skip;
3599
3600sub write_uuid_sync($) {
3601 $uuid_skip ||= $_[0];
3602
3603 return if $uuid_lock;
3604 local $uuid_lock = 1;
3605
3606 my $uuid = "$LOCALDIR/uuid";
3607
3608 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3609 or return;
3610
3611 my $value = uuid_seq uuid_cur;
3612
3613 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n";
3615 return;
3616 }
3617
3618 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0;
3620
3621 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3622 and return;
3623
3624 # always fsync - this file is important
3625 aio_fsync $fh
3626 and return;
3627
3628 close $fh
3629 or return;
3630
3631 aio_rename "$uuid~", $uuid
3632 and return;
3633
3634 warn "uuid file written ($value).\n";
3635
3636 1
3637
3638}
3639
3640sub write_uuid($$) {
3641 my ($skip, $sync) = @_;
3642
3643 $sync ? write_uuid_sync $skip
3644 : async { write_uuid_sync $skip };
3246} 3645}
3247 3646
3248sub emergency_save() { 3647sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3648 my $freeze_guard = cf::freeze_mainloop;
3250 3649
3251 warn "enter emergency perl save\n"; 3650 warn "emergency_perl_save: enter\n";
3252 3651
3253 cf::sync_job { 3652 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657
3254 # use a peculiar iteration method to avoid tripping on perl 3658 # use a peculiar iteration method to avoid tripping on perl
3255 # refcount bugs in for. also avoids problems with players 3659 # refcount bugs in for. also avoids problems with players
3256 # and maps saved/destroyed asynchronously. 3660 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3661 warn "emergency_perl_save: begin player save\n";
3258 for my $login (keys %cf::PLAYER) { 3662 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3663 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3664 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3666 $pl->save;
3262 } 3667 }
3263 warn "end emergency player save\n"; 3668 warn "emergency_perl_save: end player save\n";
3264 3669
3265 warn "begin emergency map save\n"; 3670 warn "emergency_perl_save: begin map save\n";
3266 for my $path (keys %cf::MAP) { 3671 for my $path (keys %cf::MAP) {
3267 my $map = $cf::MAP{$path} or next; 3672 my $map = $cf::MAP{$path} or next;
3268 $map->valid or next; 3673 $map->valid or next;
3269 $map->save; 3674 $map->save;
3270 } 3675 }
3271 warn "end emergency map save\n"; 3676 warn "emergency_perl_save: end map save\n";
3272 3677
3273 warn "begin emergency database checkpoint\n"; 3678 warn "emergency_perl_save: begin database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3680 warn "emergency_perl_save: end database checkpoint\n";
3681
3682 warn "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1;
3684 warn "emergency_perl_save: end write uuid\n";
3276 }; 3685 };
3277 3686
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3278 warn "leave emergency perl save\n"; 3692 warn "emergency_perl_save: leave\n";
3279} 3693}
3280 3694
3281sub post_cleanup { 3695sub post_cleanup {
3282 my ($make_core) = @_; 3696 my ($make_core) = @_;
3283 3697
3284 warn Carp::longmess "post_cleanup backtrace" 3698 warn Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3699 if $make_core;
3700
3701 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$;
3703}
3704
3705# a safer delete_package, copied from Symbol
3706sub clear_package($) {
3707 my $pkg = shift;
3708
3709 # expand to full symbol table name if needed
3710 unless ($pkg =~ /^main::.*::$/) {
3711 $pkg = "main$pkg" if $pkg =~ /^::/;
3712 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3713 $pkg .= '::' unless $pkg =~ /::$/;
3714 }
3715
3716 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3717 my $stem_symtab = *{$stem}{HASH};
3718
3719 defined $stem_symtab and exists $stem_symtab->{$leaf}
3720 or return;
3721
3722 # clear all symbols
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 }
3728 warn "cleared package $pkg\n";#d#
3286} 3729}
3287 3730
3288sub do_reload_perl() { 3731sub do_reload_perl() {
3289 # can/must only be called in main 3732 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3733 if ($Coro::current != $Coro::main) {
3291 warn "can only reload from main coroutine"; 3734 warn "can only reload from main coroutine";
3292 return; 3735 return;
3293 } 3736 }
3294 3737
3738 return if $RELOAD++;
3739
3740 my $t1 = EV::time;
3741
3742 while ($RELOAD) {
3295 warn "reloading..."; 3743 warn "reloading...";
3296 3744
3297 warn "entering sync_job"; 3745 warn "entering sync_job";
3298 3746
3299 cf::sync_job { 3747 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3748 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3749 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3750 cf::write_runtime_sync; # external watchdog should not bark
3303 3751
3304 warn "syncing database to disk"; 3752 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3754
3307 # if anything goes wrong in here, we should simply crash as we already saved 3755 # if anything goes wrong in here, we should simply crash as we already saved
3308 3756
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3757 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3758 while (IO::AIO::nreqs || BDB::nreqs) {
3320 warn "iterate..."; 3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = ();
3328
3329 warn "removing commands";
3330 %COMMAND = ();
3331
3332 warn "removing ext/exti commands";
3333 %EXTCMD = ();
3334 %EXTICMD = ();
3335
3336 warn "unloading/nuking all extensions";
3337 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg";
3339
3340 if (my $cb = $pkg->can ("unload")) {
3341 eval {
3342 $cb->($pkg);
3343 1
3344 } or warn "$pkg unloaded, but with errors: $@";
3345 } 3760 }
3346 3761
3347 warn "... nuking $pkg"; 3762 warn "cancelling all extension coros";
3348 Symbol::delete_package $pkg; 3763 $_->cancel for values %EXT_CORO;
3349 } 3764 %EXT_CORO = ();
3350 3765
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3766 warn "removing commands";
3352 while (my ($k, $v) = each %INC) { 3767 %COMMAND = ();
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3768
3769 warn "removing ext/exti commands";
3770 %EXTCMD = ();
3771 %EXTICMD = ();
3772
3773 warn "unloading/nuking all extensions";
3774 for my $pkg (@EXTS) {
3355 warn "... unloading $k"; 3775 warn "... unloading $pkg";
3356 delete $INC{$k};
3357 3776
3358 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g;
3360
3361 if (my $cb = $k->can ("unload_module")) { 3777 if (my $cb = $pkg->can ("unload")) {
3778 eval {
3362 $cb->(); 3779 $cb->($pkg);
3780 1
3781 } or warn "$pkg unloaded, but with errors: $@";
3782 }
3783
3784 warn "... clearing $pkg";
3785 clear_package $pkg;
3363 } 3786 }
3364 3787
3365 Symbol::delete_package $k; 3788 warn "unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791
3792 warn "... unloading $k";
3793 delete $INC{$k};
3794
3795 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g;
3797
3798 if (my $cb = $k->can ("unload_module")) {
3799 $cb->();
3800 }
3801
3802 clear_package $k;
3366 } 3803 }
3367 3804
3368 warn "getting rid of safe::, as good as possible"; 3805 warn "getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3806 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3808
3372 warn "unloading cf.pm \"a bit\""; 3809 warn "unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3810 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3375 3812
3376 # don't, removes xs symbols, too, 3813 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3814 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3815 #clear_package __PACKAGE__;
3379 3816
3380 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3381 3818
3382 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3383 require cf; 3820 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3385 3822
3386 warn "loading config and database again"; 3823 warn "loading config and database again";
3387 cf::reload_config; 3824 cf::reload_config;
3388 3825
3389 warn "loading extensions"; 3826 warn "loading extensions";
3390 cf::load_extensions; 3827 cf::load_extensions;
3391 3828
3829 if ($REATTACH_ON_RELOAD) {
3392 warn "reattaching attachments to objects/players"; 3830 warn "reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 3831 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 3832 warn "reattaching attachments to maps";
3395 reattach $_ for values %MAP; 3833 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 3834 warn "reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 3835 reattach $_ for values %PLAYER;
3836 }
3398 3837
3838 warn "running post_init jobs";
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840
3399 warn "leaving sync_job"; 3841 warn "leaving sync_job";
3400 3842
3401 1 3843 1
3402 } or do { 3844 } or do {
3403 warn $@; 3845 warn $@;
3404 warn "error while reloading, exiting."; 3846 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3847 };
3407 3848
3408 warn "reloaded"; 3849 warn "reloaded";
3850 --$RELOAD;
3851 }
3852
3853 $t1 = EV::time - $t1;
3854 warn "reload completed in ${t1}s\n";
3409}; 3855};
3410 3856
3411our $RELOAD_WATCHER; # used only during reload 3857our $RELOAD_WATCHER; # used only during reload
3412 3858
3413sub reload_perl() { 3859sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3860 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3861 # coro crashes during coro_state_free->destroy here.
3416 3862
3417 $RELOAD_WATCHER ||= Event->timer ( 3863 $RELOAD_WATCHER ||= cf::async {
3418 reentrant => 0, 3864 Coro::AIO::aio_wait cache_extensions;
3419 after => 0, 3865
3420 data => WF_AUTOCANCEL, 3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3421 cb => sub {
3422 do_reload_perl; 3867 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3868 undef $RELOAD_WATCHER;
3424 }, 3869 };
3425 ); 3870 };
3426} 3871}
3427 3872
3428register_command "reload" => sub { 3873register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3874 my ($who, $arg) = @_;
3430 3875
3431 if ($who->flag (FLAG_WIZ)) { 3876 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3877 $who->message ("reloading server.");
3878 async {
3879 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3880 reload_perl;
3881 };
3434 } 3882 }
3435}; 3883};
3436 3884
3437unshift @INC, $LIBDIR; 3885unshift @INC, $LIBDIR;
3438 3886
… …
3440 3888
3441our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3443 3891
3444sub wait_for_tick { 3892sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3447 3894
3448 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3897 $signal->wait;
3451} 3898}
3452 3899
3453sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3456 3902
3457 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3905 $signal->wait;
3460} 3906}
3461 3907
3462our $stat_fh; 3908sub tick {
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464
3465$TICK_WATCHER = Event->timer (
3466 reentrant => 0,
3467 parked => 1,
3468 prio => 0,
3469 at => $NEXT_TICK || $TICK,
3470 data => WF_AUTOCANCEL,
3471 cb => sub {
3472 if ($Coro::current != $Coro::main) { 3909 if ($Coro::current != $Coro::main) {
3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3910 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3474 unless ++$bug_warning > 10; 3911 unless ++$bug_warning > 10;
3475 return; 3912 return;
3476 } 3913 }
3477 3914
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3480 $NOW = $tick_start = Event::time;
3481
3482 cf::server_tick; # one server iteration 3915 cf::server_tick; # one server iteration
3483 3916
3484 $RUNTIME += $TICK;
3485 $NEXT_TICK += $TICK;
3486
3487 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3917 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3488 $NEXT_RUNTIME_WRITE = $NOW + 10; 3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3489 Coro::async_pool { 3919 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver";
3490 write_runtime 3921 write_runtime_sync
3491 or warn "ERROR: unable to write runtime file: $!"; 3922 or warn "ERROR: unable to write runtime file: $!";
3492 };
3493 } 3923 };
3924 }
3494 3925
3495# my $AFTER = Event::time;
3496# warn $AFTER - $NOW;#d#
3497
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3927 $sig->send;
3500 } 3928 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3929 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3930 $sig->send;
3503 } 3931 }
3504 3932
3505 $NOW = Event::time; 3933 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3934 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3935
3516 _post_tick; 3936 if (0) {
3517 3937 if ($NEXT_TICK) {
3518 # gather some statistics#d# 3938 my $jitter = $TICK_START - $NEXT_TICK;
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3940 warn "jitter $JITTER\n";#d#
3941 }
3521 }, 3942 }
3522); 3943}
3523 3944
3524{ 3945{
3946 # configure BDB
3947
3525 BDB::min_parallel 8; 3948 BDB::min_parallel 8;
3526 BDB::max_poll_time $TICK * 0.1; 3949 BDB::max_poll_reqs $TICK * 0.1;
3527 $BDB_POLL_WATCHER = Event->io ( 3950 $AnyEvent::BDB::WATCHER->priority (1);
3528 reentrant => 0,
3529 fd => BDB::poll_fileno,
3530 poll => 'r',
3531 prio => 0,
3532 data => WF_AUTOCANCEL,
3533 cb => \&BDB::poll_cb,
3534 );
3535
3536 BDB::set_sync_prepare {
3537 my $status;
3538 my $current = $Coro::current;
3539 (
3540 sub {
3541 $status = $!;
3542 $current->ready; undef $current;
3543 },
3544 sub {
3545 Coro::schedule while defined $current;
3546 $! = $status;
3547 },
3548 )
3549 };
3550 3951
3551 unless ($DB_ENV) { 3952 unless ($DB_ENV) {
3552 $DB_ENV = BDB::db_env_create; 3953 $DB_ENV = BDB::db_env_create;
3954 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3955 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3956 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3957 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3958 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 3959
3554 cf::sync_job { 3960 cf::sync_job {
3555 eval { 3961 eval {
3556 BDB::db_env_open 3962 BDB::db_env_open
3557 $DB_ENV, 3963 $DB_ENV,
… …
3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3965 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3966 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3561 0666; 3967 0666;
3562 3968
3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3969 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3564
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_lk_detect;
3568 }; 3970 };
3569 3971
3570 cf::cleanup "db_env_open(db): $@" if $@; 3972 cf::cleanup "db_env_open(db): $@" if $@;
3571 }; 3973 };
3572 } 3974 }
3573 3975
3574 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3976 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3575 after => 11, 3977 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3576 interval => 60, 3978 };
3577 hard => 1, 3979 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3980 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 ); 3981 };
3584 $BDB_TRICKLE_WATCHER = Event->timer ( 3982 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3983 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 ); 3984 };
3594} 3985}
3595 3986
3596{ 3987{
3988 # configure IO::AIO
3989
3597 IO::AIO::min_parallel 8; 3990 IO::AIO::min_parallel 8;
3598
3599 undef $Coro::AIO::WATCHER;
3600 IO::AIO::max_poll_time $TICK * 0.1; 3991 IO::AIO::max_poll_time $TICK * 0.1;
3601 $AIO_POLL_WATCHER = Event->io ( 3992 undef $AnyEvent::AIO::WATCHER;
3602 reentrant => 0,
3603 data => WF_AUTOCANCEL,
3604 fd => IO::AIO::poll_fileno,
3605 poll => 'r',
3606 prio => 6,
3607 cb => \&IO::AIO::poll_cb,
3608 );
3609} 3993}
3610 3994
3611my $_log_backtrace; 3995my $_log_backtrace;
3612 3996
3613sub _log_backtrace { 3997sub _log_backtrace {
… …
3616 $msg =~ s/\n//; 4000 $msg =~ s/\n//;
3617 4001
3618 # limit the # of concurrent backtraces 4002 # limit the # of concurrent backtraces
3619 if ($_log_backtrace < 2) { 4003 if ($_log_backtrace < 2) {
3620 ++$_log_backtrace; 4004 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg;
3621 async { 4006 async {
4007 $Coro::current->{desc} = "abt $msg";
4008
3622 my @bt = fork_call { 4009 my @bt = fork_call {
3623 @addr = map { sprintf "%x", $_ } @addr; 4010 @addr = map { sprintf "%x", $_ } @addr;
3624 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4011 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3625 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4012 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3626 or die "addr2line: $!"; 4013 or die "addr2line: $!";
… …
3634 } 4021 }
3635 4022
3636 @funcs 4023 @funcs
3637 }; 4024 };
3638 4025
3639 LOG llevInfo, "[ABT] $msg\n"; 4026 LOG llevInfo, "[ABT] $perl_bt\n";
4027 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3640 LOG llevInfo, "[ABT] $_\n" for @bt; 4028 LOG llevInfo, "[ABT] $_\n" for @bt;
3641 --$_log_backtrace; 4029 --$_log_backtrace;
3642 }; 4030 };
3643 } else { 4031 } else {
3644 LOG llevInfo, "[ABT] $msg\n"; 4032 LOG llevInfo, "[ABT] $msg\n";
3645 LOG llevInfo, "[ABT] [suppressed]\n"; 4033 LOG llevInfo, "[ABT] [suppressed]\n";
3646 } 4034 }
3647} 4035}
3648 4036
3649# load additional modules 4037# load additional modules
3650use cf::pod; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3651 4040
3652END { cf::emergency_save } 4041END { cf::emergency_save }
3653 4042
36541 40431
3655 4044

Diff Legend

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