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.365 by root, Tue Sep 11 13:27:56 2007 UTC vs.
Revision 1.514 by root, Mon Apr 12 17:13:36 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines