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.369 by root, Thu Sep 13 08:35:25 2007 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 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 timer.
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
594=item $coin = coin_from_name $name
595
596=cut
597
598our %coin_alias = (
599 "silver" => "silvercoin",
600 "silvercoin" => "silvercoin",
601 "silvercoins" => "silvercoin",
602 "gold" => "goldcoin",
603 "goldcoin" => "goldcoin",
604 "goldcoins" => "goldcoin",
605 "platinum" => "platinacoin",
606 "platinumcoin" => "platinacoin",
607 "platinumcoins" => "platinacoin",
608 "platina" => "platinacoin",
609 "platinacoin" => "platinacoin",
610 "platinacoins" => "platinacoin",
611 "royalty" => "royalty",
612 "royalties" => "royalty",
613);
614
615sub coin_from_name($) {
616 $coin_alias{$_[0]}
617 ? cf::arch::find $coin_alias{$_[0]}
618 : undef
503} 619}
504 620
505=item $value = cf::db_get $family => $key 621=item $value = cf::db_get $family => $key
506 622
507Returns a single value from the environment database. 623Returns a single value from the environment database.
646 762
647############################################################################# 763#############################################################################
648 764
649=head2 ATTACHABLE OBJECTS 765=head2 ATTACHABLE OBJECTS
650 766
651Many objects in crossfire are so-called attachable objects. That means you can 767Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 768attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 769to it. All such attachable objects support the following methods.
654 770
655In the following description, CLASS can be any of C<global>, C<object> 771In 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 772C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 773Deliantra).
658 774
659=over 4 775=over 4
660 776
661=item $attachable->attach ($attachment, key => $value...) 777=item $attachable->attach ($attachment, key => $value...)
662 778
706=item cf::CLASS::attachment $name, ... 822=item cf::CLASS::attachment $name, ...
707 823
708Register an attachment by C<$name> through which attachable objects of the 824Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 825given CLASS can refer to this attachment.
710 826
711Some classes such as crossfire maps and objects can specify attachments 827Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 828that are attached at load/instantiate time, thus the need for a name.
713 829
714These calls expect any number of the following handler/hook descriptions: 830These calls expect any number of the following handler/hook descriptions:
715 831
716=over 4 832=over 4
944 } 1060 }
945 1061
946 0 1062 0
947} 1063}
948 1064
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1065=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1066
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1067=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1068
953Generate an object-specific event with the given arguments. 1069Generate an object-specific event with the given arguments.
954 1070
960 1076
961=cut 1077=cut
962 1078
963############################################################################# 1079#############################################################################
964# object support 1080# object support
965#
966 1081
1082sub _object_equal($$);
1083sub _object_equal($$) {
1084 my ($a, $b) = @_;
1085
1086 return 0 unless (ref $a) eq (ref $b);
1087
1088 if ("HASH" eq ref $a) {
1089 my @ka = keys %$a;
1090 my @kb = keys %$b;
1091
1092 return 0 if @ka != @kb;
1093
1094 for (0 .. $#ka) {
1095 return 0 unless $ka[$_] eq $kb[$_];
1096 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1097 }
1098
1099 } elsif ("ARRAY" eq ref $a) {
1100
1101 return 0 if @$a != @$b;
1102
1103 for (0 .. $#$a) {
1104 return 0 unless _object_equal $a->[$_], $b->[$_];
1105 }
1106
1107 } elsif ($a ne $b) {
1108 return 0;
1109 }
1110
1111 1
1112}
1113
1114our $SLOW_MERGES;#d#
967sub _can_merge { 1115sub _can_merge {
968 my ($ob1, $ob2) = @_; 1116 my ($ob1, $ob2) = @_;
969 1117
970 local $Storable::canonical = 1; 1118 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1119
974 $fob1 eq $fob2 1120 # we do the slow way here
1121 return _object_equal $ob1, $ob2
975} 1122}
976 1123
977sub reattach { 1124sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1125 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1126 my ($obj) = @_;
980 1127
1128 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1129 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1130
983 my $registry = $obj->registry; 1131 my $registry = $obj->registry;
984 1132
985 @$registry = (); 1133 @$registry = ();
986 1134
1001cf::attachable->attach ( 1149cf::attachable->attach (
1002 prio => -1000000, 1150 prio => -1000000,
1003 on_instantiate => sub { 1151 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1152 my ($obj, $data) = @_;
1005 1153
1006 $data = from_json $data; 1154 $data = decode_json $data;
1007 1155
1008 for (@$data) { 1156 for (@$data) {
1009 my ($name, $args) = @$_; 1157 my ($name, $args) = @$_;
1010 1158
1011 $obj->attach ($name, %{$args || {} }); 1159 $obj->attach ($name, %{$args || {} });
1024 }, 1172 },
1025); 1173);
1026 1174
1027sub object_freezer_save { 1175sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1176 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1177
1032 sync_job { 1178 sync_job {
1033 if (length $$rdata) { 1179 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1180 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1181 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1037 1183
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1042 close $fh; 1191 aio_close $fh;
1043 1192
1044 if (@$objs) { 1193 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1195 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1049 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 }
1050 close $fh; 1202 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1204 }
1053 } else { 1205 } else {
1054 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
1055 } 1207 }
1056 1208
1057 aio_rename "$filename~", $filename; 1209 aio_rename "$filename~", $filename;
1210
1211 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1213 } else {
1059 warn "FATAL: $filename~: $!\n"; 1214 warn "unable to save objects: $filename~: $!\n";
1060 } 1215 }
1061 } else { 1216 } else {
1062 aio_unlink $filename; 1217 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1218 aio_unlink "$filename.pst";
1064 } 1219 }
1065 }; 1220 };
1066
1067 undef $guard;
1068} 1221}
1069 1222
1070sub object_freezer_as_string { 1223sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1224 my ($rdata, $objs) = @_;
1072 1225
1077 1230
1078sub object_thawer_load { 1231sub object_thawer_load {
1079 my ($filename) = @_; 1232 my ($filename) = @_;
1080 1233
1081 my ($data, $av); 1234 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1235
1085 (aio_load $filename, $data) >= 0 1236 (aio_load $filename, $data) >= 0
1086 or return; 1237 or return;
1087 1238
1088 unless (aio_stat "$filename.pst") { 1239 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1240 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1241 or return;
1091 1242
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1243 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs};
1094 } 1245 }
1095 1246
1096 utf8::decode (my $decname = $filename); 1247 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1248 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1249 $decname, length $data, scalar @{$av || []};
1159 my ($name, $cb) = @_; 1310 my ($name, $cb) = @_;
1160 1311
1161 $EXTICMD{$name} = $cb; 1312 $EXTICMD{$name} = $cb;
1162} 1313}
1163 1314
1315use File::Glob ();
1316
1164cf::player->attach ( 1317cf::player->attach (
1165 on_command => sub { 1318 on_unknown_command => sub {
1166 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1167 1320
1168 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1169 or return; 1322 or return;
1170 1323
1200 1353
1201 cf::override; 1354 cf::override;
1202 }, 1355 },
1203); 1356);
1204 1357
1358# "readahead" all extensions
1359sub cache_extensions {
1360 my $grp = IO::AIO::aio_group;
1361
1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1363 for (grep /\.ext$/, @{$_[0]}) {
1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1365 }
1366 };
1367
1368 $grp
1369}
1370
1205sub load_extensions { 1371sub load_extensions {
1206 cf::sync_job { 1372 cf::sync_job {
1207 my %todo; 1373 my %todo;
1208 1374
1209 for my $path (<$LIBDIR/*.ext>) { 1375 for my $path (<$LIBDIR/*.ext>) {
1228 1394
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1397
1232 $ext{source} = 1398 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1400 . "#line 1 \"$path\"\n{\n"
1235 . $source 1401 . $source
1236 . "\n};\n1"; 1402 . "\n};\n1";
1237 1403
1238 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1239 } 1405 }
1240 1406
1407 my $pass = 0;
1241 my %done; 1408 my %done;
1242 while (%todo) { 1409 while (%todo) {
1243 my $progress; 1410 my $progress;
1244 1411
1412 ++$pass;
1413
1414 ext:
1245 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1417 next ext
1248 unless exists $done{$_}; 1418 unless exists $done{$_};
1249 } 1419 }
1250 1420
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1422
1253 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1427
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1429 if exists $v->{meta}{mandatory};
1258 warn $msg; 1430 } else {
1259 warn "mandatory extension failed to load, exiting.\n"; 1431 $done{$k} = delete $todo{$k};
1260 exit 1; 1432 push @EXTS, $v->{pkg};
1261 } 1433 $progress = 1;
1262 1434
1263 warn $msg; 1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1264 } 1437 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1438 }
1270 1439
1271 skip: 1440 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1274 } 1448 }
1275 }; 1449 };
1276} 1450}
1277 1451
1278############################################################################# 1452#############################################################################
1279 1453
1280=back 1454=back
1281 1455
1282=head2 CORE EXTENSIONS 1456=head2 CORE EXTENSIONS
1283 1457
1284Functions and methods that extend core crossfire objects. 1458Functions and methods that extend core deliantra objects.
1285 1459
1286=cut 1460=cut
1287 1461
1288package cf::player; 1462package cf::player;
1289 1463
1332 1506
1333sub exists($) { 1507sub exists($) {
1334 my ($login) = @_; 1508 my ($login) = @_;
1335 1509
1336 $cf::PLAYER{$login} 1510 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1511 or !aio_stat path $login
1338} 1512}
1339 1513
1340sub find($) { 1514sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1515 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1516 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1526 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1527
1354 my $f = new_from_file cf::object::thawer path $login 1528 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1529 or return;
1356 1530
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1531 my $pl = cf::player::load_pl $f
1359 or return; 1532 or return;
1533
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1534 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1535 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1363 } 1537 }
1364 } 1538 }
1365} 1539}
1366 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1367sub save($) { 1554sub save($) {
1368 my ($pl) = @_; 1555 my ($pl) = @_;
1369 1556
1370 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1371 1558
1374 1561
1375 return if $pl->{deny_save}; 1562 return if $pl->{deny_save};
1376 1563
1377 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1566
1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1571
1380 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1573 cf::cede_to_tick;
1382} 1574}
1383 1575
1415 my ($pl) = @_; 1607 my ($pl) = @_;
1416 1608
1417 my $name = $pl->ob->name; 1609 my $name = $pl->ob->name;
1418 1610
1419 $pl->{deny_save} = 1; 1611 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1613
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1615 $pl->deactivate;
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1618 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1619 $pl->ns->destroy if $pl->ns;
1426 1620
1427 my $path = playerdir $pl; 1621 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1622 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1661
1468 for my $login (@$dirs) { 1662 for my $login (@$dirs) {
1469 my $path = path $login; 1663 my $path = path $login;
1470 1664
1471 # a .pst is a dead give-away for a valid player 1665 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1666 # if no pst file found, open and chekc for blocked users
1667 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1668 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1669 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1670 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1671 }
1477 1672
1508 } 1703 }
1509 1704
1510 \@paths 1705 \@paths
1511} 1706}
1512 1707
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1708=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1709
1515Expand crossfire pod fragments into protocol xml. 1710Expand 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 1711
1564=item $player->ext_reply ($msgid, @msg) 1712=item $player->ext_reply ($msgid, @msg)
1565 1713
1566Sends an ext reply to the player. 1714Sends an ext reply to the player.
1567 1715
1634our $MAX_RESET = 3600; 1782our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1783our $DEFAULT_RESET = 3000;
1636 1784
1637sub generate_random_map { 1785sub generate_random_map {
1638 my ($self, $rmp) = @_; 1786 my ($self, $rmp) = @_;
1787
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789
1639 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1791 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1916
1766# the temporary/swap location 1917# the temporary/swap location
1767sub save_path { 1918sub save_path {
1768 my ($self) = @_; 1919 my ($self) = @_;
1769 1920
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1921 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1922 "$TMPDIR/$path.map"
1772} 1923}
1773 1924
1774# the unique path, undef == no special unique path 1925# the unique path, undef == no special unique path
1775sub uniq_path { 1926sub uniq_path {
1776 my ($self) = @_; 1927 my ($self) = @_;
1777 1928
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1929 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1930 "$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} 1931}
1790 1932
1791sub decay_objects { 1933sub decay_objects {
1792 my ($self) = @_; 1934 my ($self) = @_;
1793 1935
1877sub find { 2019sub find {
1878 my ($path, $origin) = @_; 2020 my ($path, $origin) = @_;
1879 2021
1880 $path = normalise $path, $origin && $origin->path; 2022 $path = normalise $path, $origin && $origin->path;
1881 2023
1882 cf::lock_wait "map_data:$path";#d#remove 2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2025 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2026
1885 $cf::MAP{$path} || do { 2027 $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 2028 my $map = new_from_path cf::map $path
1890 or return; 2029 or return;
1891 2030
1892 $map->{last_save} = $cf::RUNTIME; 2031 $map->{last_save} = $cf::RUNTIME;
1893 2032
1895 or return; 2034 or return;
1896 2035
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2036 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2037 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2038 #$cf::WAIT_FOR_TICK->wait;
2039 undef $guard2;
1900 undef $guard1; 2040 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2041 $map->reset;
1903 return find $path; 2042 return find $path;
1904 } 2043 }
1905 2044
1906 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
1907 } 2046 }
1908} 2047}
1909 2048
1910sub pre_load { } 2049sub pre_load { }
1911sub post_load { } 2050#sub post_load { } # XS
1912 2051
1913sub load { 2052sub load {
1914 my ($self) = @_; 2053 my ($self) = @_;
1915 2054
1916 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2072 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2073 $f->skip_block;
1935 $self->_load_objects ($f) 2074 $self->_load_objects ($f)
1936 or return; 2075 or return;
1937 2076
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2077 $self->post_load_original
1939 if delete $self->{load_original}; 2078 if delete $self->{load_original};
1940 2079
1941 if (my $uniq = $self->uniq_path) { 2080 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2081 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2082 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2100 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2101 $self->decay_objects;
1963 $self->fix_auto_apply; 2102 $self->fix_auto_apply;
1964 $self->update_buttons; 2103 $self->update_buttons;
1965 cf::cede_to_tick; 2104 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2105 $self->activate;
1969 } 2106 }
1970 2107
1971 $self->{last_save} = $cf::RUNTIME; 2108 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2109 $self->last_access ($cf::RUNTIME);
1973 2110
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2111 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2112 }
1976 2113
1977 $self->post_load; 2114 $self->post_load;
1978} 2115}
1979 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
1980sub customise_for { 2120sub customise_for {
1981 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
1982 2122
1983 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2124 if $self->per_player;
2037 my ($path, $origin, $load) = @_; 2177 my ($path, $origin, $load) = @_;
2038 2178
2039 $path = normalise $path, $origin && $origin->{path}; 2179 $path = normalise $path, $origin && $origin->{path};
2040 2180
2041 if (my $map = $cf::MAP{$path}) { 2181 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2183 }
2044 2184
2045 $MAP_PREFETCH{$path} |= $load; 2185 $MAP_PREFETCH{$path} |= $load;
2046 2186
2047 $MAP_PREFETCHER ||= cf::async { 2187 $MAP_PREFETCHER ||= cf::async {
2188 $Coro::current->{desc} = "map prefetcher";
2189
2048 while (%MAP_PREFETCH) { 2190 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2191 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2192 if (my $map = find $k) {
2051 $map->load if $v; 2193 $map->load if $v;
2052 } 2194 }
2078 return if $self->{deny_save}; 2220 return if $self->{deny_save};
2079 2221
2080 local $self->{last_access} = $self->last_access;#d# 2222 local $self->{last_access} = $self->last_access;#d#
2081 2223
2082 cf::async { 2224 cf::async {
2225 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2226 $_->contr->save for $self->players;
2084 }; 2227 };
2228
2229 cf::get_slot 0.02;
2085 2230
2086 if ($uniq) { 2231 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2233 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2234 } else {
2098 $self->save; 2243 $self->save;
2099 2244
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2246
2102 return if $self->players; 2247 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2248 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2249 return if $self->{deny_save};
2105 2250
2106 $self->in_memory (cf::MAP_SWAPPED); 2251 $self->in_memory (cf::MAP_SWAPPED);
2107 2252
2108 $self->deactivate; 2253 $self->deactivate;
2133 2278
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2280
2136 return if $self->players; 2281 return if $self->players;
2137 2282
2138 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2139 2284
2140 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2141 2286
2142 # need to save uniques path 2287 # need to save uniques path
2143 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
2226 2371
2227sub unique_maps() { 2372sub unique_maps() {
2228 [ 2373 [
2229 map { 2374 map {
2230 utf8::decode $_; 2375 utf8::decode $_;
2231 /\.map$/ 2376 s/\.map$//; # TODO future compatibility hack
2377 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2378 ? ()
2232 ? normalise $_ 2379 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2381 ]
2236} 2382}
2237 2383
2238package cf; 2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2239 2415
2240=back 2416=back
2241 2417
2242=head3 cf::object 2418=head3 cf::object
2243 2419
2247 2423
2248=over 4 2424=over 4
2249 2425
2250=item $ob->inv_recursive 2426=item $ob->inv_recursive
2251 2427
2252Returns the inventory of the object _and_ their inventories, recursively. 2428Returns the inventory of the object I<and> their inventories, recursively,
2429but I<not> the object itself.
2253 2430
2254=cut 2431=cut
2255 2432
2256sub inv_recursive_; 2433sub inv_recursive_;
2257sub inv_recursive_ { 2434sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2439 inv_recursive_ inv $_[0]
2263} 2440}
2264 2441
2265=item $ref = $ob->ref 2442=item $ref = $ob->ref
2266 2443
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2444Creates and returns a persistent reference to an object that can be stored as a string.
2268 2445
2269=item $ob = cf::object::deref ($refstring) 2446=item $ob = cf::object::deref ($refstring)
2270 2447
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2448returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2449even if the object actually exists. May block.
2274=cut 2451=cut
2275 2452
2276sub deref { 2453sub deref {
2277 my ($ref) = @_; 2454 my ($ref) = @_;
2278 2455
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2456 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2457 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2458 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2459 or return;
2286 $pl->ob->uuid eq $uuid 2460 $pl->ob->uuid eq $uuid
2287 or return; 2461 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2481can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2482dialogue with the given NPC character.
2309 2483
2310=cut 2484=cut
2311 2485
2486our $SAY_CHANNEL = {
2487 id => "say",
2488 title => "Map",
2489 reply => "say ",
2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2491};
2492
2493our $CHAT_CHANNEL = {
2494 id => "chat",
2495 title => "Chat",
2496 reply => "chat ",
2497 tooltip => "Player chat and shouts, global to the server.",
2498};
2499
2312# rough implementation of a future "reply" method that works 2500# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2501# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2502#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2503sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2504 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2515 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2516 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2517
2330 } else { 2518 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2519 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2520 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2521 }
2334 } 2522 }
2335} 2523}
2336 2524
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2525=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2550
2363=item $player_object->enter_link 2551=item $player_object->enter_link
2364 2552
2365Freezes the player and moves him/her to a special map (C<{link}>). 2553Freezes the player and moves him/her to a special map (C<{link}>).
2366 2554
2367The player should be reasonably safe there for short amounts of time. You 2555The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2556for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link
2558map.
2369 2559
2370Will never block. 2560Will never block.
2371 2561
2372=item $player_object->leave_link ($map, $x, $y) 2562=item $player_object->leave_link ($map, $x, $y)
2373 2563
2425 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2427 2617
2428 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2431 2621
2432 $map->load; 2622 $map->load;
2433 $map->load_neighbours; 2623 $map->load_neighbours;
2434 2624
2435 return unless $self->contr->active; 2625 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2626
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2440} 2632}
2441 2633
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2635
2444Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2637her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2638that 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 2639the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2640be called at the end of this process.
2449 2641
2642Note that $check will be called with a potentially non-loaded map, so if
2643it needs a loaded map it has to call C<< ->load >>.
2644
2450=cut 2645=cut
2451 2646
2452our $GOTOGEN; 2647our $GOTOGEN;
2453 2648
2454sub cf::object::player::goto { 2649sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2654
2460 $self->enter_link; 2655 $self->enter_link;
2461 2656
2462 (async { 2657 (async {
2658 $Coro::current->{desc} = "player::goto $path $x $y";
2659
2463 # *tag paths override both path and x|y 2660 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2661 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2662 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2663 my $ob = $obs[rand @obs];
2467 2664
2530} 2727}
2531 2728
2532sub prepare_random_map { 2729sub prepare_random_map {
2533 my ($exit) = @_; 2730 my ($exit) = @_;
2534 2731
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2732 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2733 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2734 # that depends on the exit object
2540 2735
2541 my $rmp = parse_random_map_params $exit->msg; 2736 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2738 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2739 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2740 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2741 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2742 $rmp->{origin_y} = $exit->y;
2743
2744 $exit->map->touch;
2548 } 2745 }
2549 2746
2550 $rmp->{random_seed} ||= $exit->random_seed; 2747 $rmp->{random_seed} ||= $exit->random_seed;
2551 2748
2552 my $data = cf::to_json $rmp; 2749 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2750 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2751 my $meta = "$RANDOMDIR/$md5.meta";
2555 2752
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2753 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2754 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2755 undef $fh;
2559 aio_rename "$meta~", $meta; 2756 aio_rename "$meta~", $meta;
2560 2757
2758 my $slaying = "?random/$md5";
2759
2760 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2761 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2762 $exit->msg (undef);
2763 }
2563 } 2764 }
2564} 2765}
2565 2766
2566sub cf::object::player::enter_exit { 2767sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2768 my ($self, $exit) = @_;
2568 2769
2569 return unless $self->type == cf::PLAYER; 2770 return unless $self->type == cf::PLAYER;
2570 2771
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2772 $self->enter_link;
2583 2773
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2774 (async {
2589 $self->deactivate_recursive; # just to be sure 2775 $Coro::current->{desc} = "enter_exit";
2776
2590 unless (eval { 2777 unless (eval {
2778 $self->deactivate_recursive; # just to be sure
2779
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2789 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp;
2791
2591 $self->goto ($slaying, $hp, $sp); 2792 $self->goto ($map, $x, $y);
2592 2793
2794 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y)
2796 if $exit->flag (cf::FLAG_DAMNED);
2797
2593 1; 2798 1
2594 }) { 2799 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2800 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2801 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2802 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2803 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2804
2600 warn "ERROR in enter_exit: $@"; 2805 warn "ERROR in enter_exit: $@";
2617sub cf::client::send_drawinfo { 2822sub cf::client::send_drawinfo {
2618 my ($self, $text, $flags) = @_; 2823 my ($self, $text, $flags) = @_;
2619 2824
2620 utf8::encode $text; 2825 utf8::encode $text;
2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827}
2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2622} 2852}
2623 2853
2624=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2625 2855
2626Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2858the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2859the message unless the client supports the msg packet.
2630 2860
2631=cut 2861=cut
2632 2862
2863# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2634 "c/identify" => { 2871 "c/identify" => {
2635 id => "identify", 2872 id => "infobox",
2636 title => "Identify", 2873 title => "Identify",
2637 reply => undef, 2874 reply => undef,
2638 tooltip => "Items recently identified", 2875 tooltip => "Items recently identified",
2639 }, 2876 },
2640 "c/examine" => { 2877 "c/examine" => {
2641 id => "examine", 2878 id => "infobox",
2642 title => "Examine", 2879 title => "Examine",
2643 reply => undef, 2880 reply => undef,
2644 tooltip => "Signs and other items you examined", 2881 tooltip => "Signs and other items you examined",
2645 }, 2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2888 },
2889 "c/book" => {
2890 id => "infobox",
2891 title => "Book",
2892 reply => undef,
2893 tooltip => "The contents of a note or book",
2894 },
2895 "c/lookat" => {
2896 id => "infobox",
2897 title => "Look",
2898 reply => undef,
2899 tooltip => "What you saw there",
2900 },
2901 "c/who" => {
2902 id => "infobox",
2903 title => "Players",
2904 reply => undef,
2905 tooltip => "Shows players who are currently online",
2906 },
2907 "c/body" => {
2908 id => "infobox",
2909 title => "Body Parts",
2910 reply => undef,
2911 tooltip => "Shows which body parts you posess and are available",
2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2919 "c/skills" => {
2920 id => "infobox",
2921 title => "Skills",
2922 reply => undef,
2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2948 },
2949 "c/uptime" => {
2950 id => "infobox",
2951 title => "Uptime",
2952 reply => undef,
2953 tooltip => "How long the server has been running since last restart",
2954 },
2955 "c/mapinfo" => {
2956 id => "infobox",
2957 title => "Map Info",
2958 reply => undef,
2959 tooltip => "Information related to the maps",
2960 },
2961 "c/party" => {
2962 id => "party",
2963 title => "Party",
2964 reply => "gsay ",
2965 tooltip => "Messages and chat related to your party",
2966 },
2967 "c/death" => {
2968 id => "death",
2969 title => "Death",
2970 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death",
2972 },
2973 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL,
2646); 2975);
2647 2976
2648sub cf::client::send_msg { 2977sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2978 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2979
2651 $msg = $self->pl->expand_cfpod ($msg); 2980 $msg = $self->pl->expand_cfpod ($msg)
2981 unless $color & cf::NDI_VERBATIM;
2652 2982
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2983 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2984
2655 # check predefined channels, for the benefit of C 2985 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2986 if ($CHANNEL{$channel}) {
2987 $channel = $CHANNEL{$channel};
2657 2988
2989 $self->ext_msg (channel_info => $channel);
2990 $channel = $channel->{id};
2991
2658 if (ref $channel) { 2992 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2993 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2994 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2995 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2996 $self->ext_msg (channel_info => $channel);
2663 if $self->can_msg;
2664 } 2997 }
2665 2998
2666 $channel = $channel->{id}; 2999 $channel = $channel->{id};
2667 } 3000 }
2668 3001
2669 return unless @extra || length $msg; 3002 return unless @extra || length $msg;
2670 3003
2671 if ($self->can_msg) {
2672 # default colour, mask it out 3004 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3005 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF; 3006 if $color & cf::NDI_DEF;
2675 3007
2676 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3008 my $pkt = "msg "
3009 . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678 } else { 3011 );
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689 3012
2690 $color &= cf::NDI_COLOR_MASK; 3013 $self->send_big_packet ($pkt);
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703} 3014}
2704 3015
2705=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2706 3017
2707Sends an ext event to the client. 3018Sends an ext event to the client.
2710 3021
2711sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2712 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2713 3024
2714 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2717 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 } 3030 }
2720} 3031}
2721 3032
2722=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2723 3034
2727 3038
2728sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2730 3041
2731 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove 3045 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 } 3048 }
2738} 3049}
2739 3050
2740=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2741 3052
2842 3153
2843 $coro 3154 $coro
2844} 3155}
2845 3156
2846cf::client->attach ( 3157cf::client->attach (
2847 on_destroy => sub { 3158 on_client_destroy => sub {
2848 my ($ns) = @_; 3159 my ($ns) = @_;
2849 3160
2850 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2851 }, 3162 },
2852); 3163);
2868our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
2869 3180
2870$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
2871 3182
2872$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
2873 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
2874 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
2875 sort time 3186 sort time
2876)); 3187));
2877 3188
2878# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
2880=pod 3191=pod
2881 3192
2882The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
2883 3194
2884 cf::object 3195 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3196 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3197 insert remove name archname title slaying race decrease split
3198 value
2887 3199
2888 cf::object::player 3200 cf::object::player
2889 player 3201 player
2890 3202
2891 cf::player 3203 cf::player
2896 3208
2897=cut 3209=cut
2898 3210
2899for ( 3211for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3214 decrease split destroy change_exp value msg lore send_msg)],
2903 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
2905 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
2906) { 3218) {
2907 no strict 'refs'; 3219 no strict 'refs';
2908 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
2909 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2927 3239
2928 my $qcode = $code; 3240 my $qcode = $code;
2929 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2930 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
2931 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
2932 local $_; 3247 local $_;
2933 local @safe::cf::_safe_eval_args = values %vars;
2934 3248
2935 my $eval = 3249 my $eval =
2936 "do {\n" 3250 "do {\n"
2937 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2938 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
2939 . $code 3253 . $code
2940 . "\n}" 3254 . "\n}"
2941 ; 3255 ;
2942 3256
3257 if ($CFG{safe_eval}) {
2943 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
2944 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2945 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
2946 3266
2947 if ($@) { 3267 if ($@) {
2948 warn "$@"; 3268 warn "$@";
2949 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
2950 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
2969=cut 3289=cut
2970 3290
2971sub register_script_function { 3291sub register_script_function {
2972 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
2973 3293
2974 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
2975 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
2976} 3296}
2977 3297
2978=back 3298=back
2979 3299
2980=cut 3300=cut
3001 3321
3002 $facedata->{version} == 2 3322 $facedata->{version} == 2
3003 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3004 3324
3005 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3006 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3007 type => FT_RSRC, 3328 type => FT_RSRC,
3008 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3009 }; 3331 };
3010 cf::cede_to_tick; 3332 cf::cede_to_tick;
3011 3333
3012 { 3334 {
3013 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
3014 3336
3015 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3339
3017 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3021 3344
3022 cf::cede_to_tick; 3345 cf::cede_to_tick;
3023 } 3346 }
3024 3347
3025 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3349 next unless $info->{smooth};
3350
3027 my $idx = cf::face::find $face 3351 my $idx = cf::face::find $face
3028 or next; 3352 or next;
3353
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3354 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3355 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3357 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3358 warn "smooth face '$info->{smooth}' not found for face '$face'";
3047 3372
3048 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
3049 } 3374 }
3050 3375
3051 { 3376 {
3052 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
3055 3378
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3380 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
3061 3382
3062 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3063 # prepend meta info 3384 cf::face::set_type $idx, $info->{type};
3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else { 3385 } else {
3072 $data = $info->{data}; 3386 $RESOURCE{$name} = $info;
3073 } 3387 }
3074 3388
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3389 cf::cede_to_tick;
3079 } 3390 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3391 }
3392
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3394
3100 1 3395 1
3101} 3396}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3102 3417
3103register_exticmd fx_want => sub { 3418register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3419 my ($ns, $want) = @_;
3105 3420
3106 while (my ($k, $v) = each %$want) { 3421 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3422 $ns->fx_want ($k, $v);
3108 } 3423 }
3109}; 3424};
3425
3426sub load_resource_file($) {
3427 my $guard = lock_acquire "load_resource_file";
3428
3429 my $status = load_resource_file_ $_[0];
3430 get_slot 0.1, 100;
3431 cf::arch::commit_load;
3432
3433 $status
3434}
3110 3435
3111sub reload_regions { 3436sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3437 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3438 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3439 %ext::player_env::MUSIC_FACE_CACHE = ();
3128} 3453}
3129 3454
3130sub reload_archetypes { 3455sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3456 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3457 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3458}
3139 3459
3140sub reload_treasures { 3460sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3461 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3462 or die "unable to load treasurelists\n";
3143} 3463}
3144 3464
3145sub reload_resources { 3465sub reload_resources {
3146 warn "reloading resource files...\n"; 3466 warn "reloading resource files...\n";
3147 3467
3468 reload_facedata;
3469 reload_archetypes;
3148 reload_regions; 3470 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3471 reload_treasures;
3153 3472
3154 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3155} 3474}
3156 3475
3157sub init {
3158 reload_resources;
3159}
3160
3161sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3480 or return;
3164 3481
3165 local $/; 3482 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3167 3484
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3486
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3175 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3176 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3177 }; 3494 };
3178 warn $@ if $@; 3495 warn $@ if $@;
3179 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3499}
3500
3501sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!";
3504 flock $fh, &Fcntl::LOCK_EX
3505 or die "$PIDFILE: flock: $!";
3506 $fh
3507}
3508
3509# make sure only one server instance is running at any one time
3510sub atomic {
3511 my $fh = pidfile;
3512
3513 my $pid = <$fh>;
3514 kill 9, $pid if $pid > 0;
3515
3516 seek $fh, 0, 0;
3517 print $fh $$;
3518}
3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3180} 3527}
3181 3528
3182sub main { 3529sub main {
3530 cf::init_globals; # initialise logging
3531
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543
3183 # we must not ever block the main coroutine 3544 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3545 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3546 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3547 (async {
3187 Event::one_event; 3548 $Coro::current->{desc} = "IDLE BUG HANDLER";
3549 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3550 })->prio (Coro::PRIO_MAX);
3189 }; 3551 };
3190 3552
3553 evthread_start IO::AIO::poll_fileno;
3554
3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3559 reload_resources;
3191 reload_config; 3560 reload_config;
3192 db_init; 3561 db_init;
3562
3563 cf::init_uuid;
3564 cf::init_signals;
3565 cf::init_skills;
3566
3567 cf::init_beforeplay;
3568
3569 atomic;
3570
3193 load_extensions; 3571 load_extensions;
3194 3572
3195 $TICK_WATCHER->start; 3573 utime time, time, $RUNTIMEFILE;
3196 Event::loop; 3574
3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578
3579 (pop @POST_INIT)->(0) while @POST_INIT;
3580 };
3581
3582 main_loop;
3197} 3583}
3198 3584
3199############################################################################# 3585#############################################################################
3200# initialisation and cleanup 3586# initialisation and cleanup
3201 3587
3202# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3203BEGIN { 3589BEGIN {
3590 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3212 },
3213 ); 3594 };
3214 } 3595 }
3215} 3596}
3216 3597
3217sub write_runtime { 3598sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime"; 3599 my $t0 = AE::time;
3219 3600
3220 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3222 3603
3223 IO::AIO::aio_utime $runtime, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224 3605
3225 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3226 3607
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3228 or return; 3609 or return;
3229 3610
3230 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
3242 aio_utime $fh, undef, undef; 3623 aio_utime $fh, undef, undef;
3243 3624
3244 close $fh 3625 close $fh
3245 or return; 3626 or return;
3246 3627
3247 aio_rename "$runtime~", $runtime 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248 and return; 3629 and return;
3249 3630
3250 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3251 3632
3252 1 3633 1
3634}
3635
3636our $uuid_lock;
3637our $uuid_skip;
3638
3639sub write_uuid_sync($) {
3640 $uuid_skip ||= $_[0];
3641
3642 return if $uuid_lock;
3643 local $uuid_lock = 1;
3644
3645 my $uuid = "$LOCALDIR/uuid";
3646
3647 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3648 or return;
3649
3650 my $value = uuid_seq uuid_cur;
3651
3652 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n";
3654 return;
3655 }
3656
3657 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0;
3659
3660 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3661 and return;
3662
3663 # always fsync - this file is important
3664 aio_fsync $fh
3665 and return;
3666
3667 close $fh
3668 or return;
3669
3670 aio_rename "$uuid~", $uuid
3671 and return;
3672
3673 warn "uuid file written ($value).\n";
3674
3675 1
3676
3677}
3678
3679sub write_uuid($$) {
3680 my ($skip, $sync) = @_;
3681
3682 $sync ? write_uuid_sync $skip
3683 : async { write_uuid_sync $skip };
3253} 3684}
3254 3685
3255sub emergency_save() { 3686sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3687 my $freeze_guard = cf::freeze_mainloop;
3257 3688
3258 warn "enter emergency perl save\n"; 3689 warn "emergency_perl_save: enter\n";
3259 3690
3260 cf::sync_job { 3691 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696
3261 # use a peculiar iteration method to avoid tripping on perl 3697 # use a peculiar iteration method to avoid tripping on perl
3262 # refcount bugs in for. also avoids problems with players 3698 # refcount bugs in for. also avoids problems with players
3263 # and maps saved/destroyed asynchronously. 3699 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3700 warn "emergency_perl_save: begin player save\n";
3265 for my $login (keys %cf::PLAYER) { 3701 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3702 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3703 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3705 $pl->save;
3269 } 3706 }
3270 warn "end emergency player save\n"; 3707 warn "emergency_perl_save: end player save\n";
3271 3708
3272 warn "begin emergency map save\n"; 3709 warn "emergency_perl_save: begin map save\n";
3273 for my $path (keys %cf::MAP) { 3710 for my $path (keys %cf::MAP) {
3274 my $map = $cf::MAP{$path} or next; 3711 my $map = $cf::MAP{$path} or next;
3275 $map->valid or next; 3712 $map->valid or next;
3276 $map->save; 3713 $map->save;
3277 } 3714 }
3278 warn "end emergency map save\n"; 3715 warn "emergency_perl_save: end map save\n";
3279 3716
3280 warn "begin emergency database checkpoint\n"; 3717 warn "emergency_perl_save: begin database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3718 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3719 warn "emergency_perl_save: end database checkpoint\n";
3720
3721 warn "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n";
3283 }; 3724 };
3284 3725
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3285 warn "leave emergency perl save\n"; 3731 warn "emergency_perl_save: leave\n";
3286} 3732}
3287 3733
3288sub post_cleanup { 3734sub post_cleanup {
3289 my ($make_core) = @_; 3735 my ($make_core) = @_;
3290 3736
3291 warn Carp::longmess "post_cleanup backtrace" 3737 warn Carp::longmess "post_cleanup backtrace"
3292 if $make_core; 3738 if $make_core;
3739
3740 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$;
3742}
3743
3744# a safer delete_package, copied from Symbol
3745sub clear_package($) {
3746 my $pkg = shift;
3747
3748 # expand to full symbol table name if needed
3749 unless ($pkg =~ /^main::.*::$/) {
3750 $pkg = "main$pkg" if $pkg =~ /^::/;
3751 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3752 $pkg .= '::' unless $pkg =~ /::$/;
3753 }
3754
3755 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3756 my $stem_symtab = *{$stem}{HASH};
3757
3758 defined $stem_symtab and exists $stem_symtab->{$leaf}
3759 or return;
3760
3761 # clear all symbols
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 }
3767 warn "cleared package $pkg\n";#d#
3293} 3768}
3294 3769
3295sub do_reload_perl() { 3770sub do_reload_perl() {
3296 # can/must only be called in main 3771 # can/must only be called in main
3297 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3298 warn "can only reload from main coroutine"; 3773 warn "can only reload from main coroutine";
3299 return; 3774 return;
3300 } 3775 }
3301 3776
3777 return if $RELOAD++;
3778
3779 my $t1 = AE::time;
3780
3781 while ($RELOAD) {
3302 warn "reloading..."; 3782 warn "reloading...";
3303 3783
3304 warn "entering sync_job"; 3784 warn "entering sync_job";
3305 3785
3306 cf::sync_job { 3786 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark 3787 cf::write_runtime_sync; # external watchdog should not bark
3308 cf::emergency_save; 3788 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark 3789 cf::write_runtime_sync; # external watchdog should not bark
3310 3790
3311 warn "syncing database to disk"; 3791 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3792 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3793
3314 # if anything goes wrong in here, we should simply crash as we already saved 3794 # if anything goes wrong in here, we should simply crash as we already saved
3315 3795
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3796 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3797 while (IO::AIO::nreqs || BDB::nreqs) {
3327 warn "iterate..."; 3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3328 }
3329
3330 ++$RELOAD;
3331
3332 warn "cancelling all extension coros";
3333 $_->cancel for values %EXT_CORO;
3334 %EXT_CORO = ();
3335
3336 warn "removing commands";
3337 %COMMAND = ();
3338
3339 warn "removing ext/exti commands";
3340 %EXTCMD = ();
3341 %EXTICMD = ();
3342
3343 warn "unloading/nuking all extensions";
3344 for my $pkg (@EXTS) {
3345 warn "... unloading $pkg";
3346
3347 if (my $cb = $pkg->can ("unload")) {
3348 eval {
3349 $cb->($pkg);
3350 1
3351 } or warn "$pkg unloaded, but with errors: $@";
3352 } 3799 }
3353 3800
3354 warn "... nuking $pkg"; 3801 warn "cancelling all extension coros";
3355 Symbol::delete_package $pkg; 3802 $_->cancel for values %EXT_CORO;
3356 } 3803 %EXT_CORO = ();
3357 3804
3358 warn "unloading all perl modules loaded from $LIBDIR"; 3805 warn "removing commands";
3359 while (my ($k, $v) = each %INC) { 3806 %COMMAND = ();
3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361 3807
3808 warn "removing ext/exti commands";
3809 %EXTCMD = ();
3810 %EXTICMD = ();
3811
3812 warn "unloading/nuking all extensions";
3813 for my $pkg (@EXTS) {
3362 warn "... unloading $k"; 3814 warn "... unloading $pkg";
3363 delete $INC{$k};
3364 3815
3365 $k =~ s/\.pm$//;
3366 $k =~ s/\//::/g;
3367
3368 if (my $cb = $k->can ("unload_module")) { 3816 if (my $cb = $pkg->can ("unload")) {
3817 eval {
3369 $cb->(); 3818 $cb->($pkg);
3819 1
3820 } or warn "$pkg unloaded, but with errors: $@";
3821 }
3822
3823 warn "... clearing $pkg";
3824 clear_package $pkg;
3370 } 3825 }
3371 3826
3372 Symbol::delete_package $k; 3827 warn "unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830
3831 warn "... unloading $k";
3832 delete $INC{$k};
3833
3834 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g;
3836
3837 if (my $cb = $k->can ("unload_module")) {
3838 $cb->();
3839 }
3840
3841 clear_package $k;
3373 } 3842 }
3374 3843
3375 warn "getting rid of safe::, as good as possible"; 3844 warn "getting rid of safe::, as good as possible";
3376 Symbol::delete_package "safe::$_" 3845 clear_package "safe::$_"
3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378 3847
3379 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3380 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382 3851
3383 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3384 # and global variables created in xs 3853 # and global variables created in xs
3385 #Symbol::delete_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3386 3855
3387 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3388 3857
3389 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3390 require cf; 3859 require cf;
3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3392 3861
3393 warn "loading config and database again"; 3862 warn "loading config and database again";
3394 cf::reload_config; 3863 cf::reload_config;
3395 3864
3396 warn "loading extensions"; 3865 warn "loading extensions";
3397 cf::load_extensions; 3866 cf::load_extensions;
3398 3867
3868 if ($REATTACH_ON_RELOAD) {
3399 warn "reattaching attachments to objects/players"; 3869 warn "reattaching attachments to objects/players";
3400 _global_reattach; # objects, sockets 3870 _global_reattach; # objects, sockets
3401 warn "reattaching attachments to maps"; 3871 warn "reattaching attachments to maps";
3402 reattach $_ for values %MAP; 3872 reattach $_ for values %MAP;
3403 warn "reattaching attachments to players"; 3873 warn "reattaching attachments to players";
3404 reattach $_ for values %PLAYER; 3874 reattach $_ for values %PLAYER;
3875 }
3405 3876
3877 warn "running post_init jobs";
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879
3406 warn "leaving sync_job"; 3880 warn "leaving sync_job";
3407 3881
3408 1 3882 1
3409 } or do { 3883 } or do {
3410 warn $@; 3884 warn $@;
3411 warn "error while reloading, exiting."; 3885 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3886 };
3414 3887
3415 warn "reloaded"; 3888 warn "reloaded";
3889 --$RELOAD;
3890 }
3891
3892 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n";
3416}; 3894};
3417 3895
3418our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3419 3897
3420sub reload_perl() { 3898sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3899 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3423 3901
3424 $RELOAD_WATCHER ||= Event->timer ( 3902 $RELOAD_WATCHER ||= cf::async {
3425 reentrant => 0, 3903 Coro::AIO::aio_wait cache_extensions;
3426 after => 0, 3904
3427 data => WF_AUTOCANCEL, 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3428 cb => sub {
3429 do_reload_perl; 3906 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3431 }, 3908 };
3432 ); 3909 };
3433} 3910}
3434 3911
3435register_command "reload" => sub { 3912register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3913 my ($who, $arg) = @_;
3437 3914
3438 if ($who->flag (FLAG_WIZ)) { 3915 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3916 $who->message ("reloading server.");
3917 async {
3918 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3919 reload_perl;
3920 };
3441 } 3921 }
3442}; 3922};
3443 3923
3444unshift @INC, $LIBDIR; 3924unshift @INC, $LIBDIR;
3445 3925
3447 3927
3448our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3450 3930
3451sub wait_for_tick { 3931sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3454 3933
3455 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3936 $signal->wait;
3458} 3937}
3459 3938
3460sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3463 3941
3464 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3944 $signal->wait;
3467} 3945}
3468 3946
3469our $stat_fh; 3947sub tick {
3470sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3471
3472$TICK_WATCHER = Event->timer (
3473 reentrant => 0,
3474 parked => 1,
3475 prio => 0,
3476 at => $NEXT_TICK || $TICK,
3477 data => WF_AUTOCANCEL,
3478 cb => sub {
3479 if ($Coro::current != $Coro::main) { 3948 if ($Coro::current != $Coro::main) {
3480 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3949 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3481 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3482 return; 3951 return;
3483 } 3952 }
3484 3953
3485 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3486
3487 $NOW = $tick_start = Event::time;
3488
3489 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3490 3955
3491 $RUNTIME += $TICK; 3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3492 $NEXT_TICK += $TICK;
3493 3957
3494 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3495 $NEXT_RUNTIME_WRITE = $NOW + 10; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3496 Coro::async_pool { 3960 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver";
3497 write_runtime 3962 write_runtime_sync
3498 or warn "ERROR: unable to write runtime file: $!"; 3963 or warn "ERROR: unable to write runtime file: $!";
3499 };
3500 } 3964 };
3965 }
3501 3966
3502# my $AFTER = Event::time;
3503# warn $AFTER - $NOW;#d#
3504
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3968 $sig->send;
3507 } 3969 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3970 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3971 $sig->send;
3510 } 3972 }
3511 3973
3512 $NOW = Event::time; 3974 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3975 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3976
3523 _post_tick; 3977 if (0) {
3524 3978 if ($NEXT_TICK) {
3525 # gather some statistics#d# 3979 my $jitter = $TICK_START - $NEXT_TICK;
3526 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3527 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3981 warn "jitter $JITTER\n";#d#
3982 }
3528 }, 3983 }
3529); 3984}
3530 3985
3531{ 3986{
3987 # configure BDB
3988
3532 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3533 BDB::max_poll_time $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3534 $BDB_POLL_WATCHER = Event->io ( 3991 $AnyEvent::BDB::WATCHER->priority (1);
3535 reentrant => 0,
3536 fd => BDB::poll_fileno,
3537 poll => 'r',
3538 prio => 0,
3539 data => WF_AUTOCANCEL,
3540 cb => \&BDB::poll_cb,
3541 );
3542
3543 BDB::set_sync_prepare {
3544 my $status;
3545 my $current = $Coro::current;
3546 (
3547 sub {
3548 $status = $!;
3549 $current->ready; undef $current;
3550 },
3551 sub {
3552 Coro::schedule while defined $current;
3553 $! = $status;
3554 },
3555 )
3556 };
3557 3992
3558 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3559 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3996 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3997 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3998 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3999 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 4000
3561 cf::sync_job { 4001 cf::sync_job {
3562 eval { 4002 eval {
3563 BDB::db_env_open 4003 BDB::db_env_open
3564 $DB_ENV, 4004 $DB_ENV,
3566 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4006 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3567 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4007 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3568 0666; 4008 0666;
3569 4009
3570 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4010 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3571
3572 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3573 | BDB::LOG_AUTOREMOVE, 1);
3574 $DB_ENV->set_lk_detect;
3575 }; 4011 };
3576 4012
3577 cf::cleanup "db_env_open(db): $@" if $@; 4013 cf::cleanup "db_env_open(db): $@" if $@;
3578 }; 4014 };
3579 } 4015 }
3580 4016
3581 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4017 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3582 after => 11, 4018 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3583 interval => 60, 4019 };
3584 hard => 1, 4020 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3585 prio => 0,
3586 data => WF_AUTOCANCEL,
3587 cb => sub {
3588 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4021 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3589 },
3590 ); 4022 };
3591 $BDB_TRICKLE_WATCHER = Event->timer ( 4023 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3592 after => 5,
3593 interval => 10,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4024 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3599 },
3600 ); 4025 };
3601} 4026}
3602 4027
3603{ 4028{
4029 # configure IO::AIO
4030
3604 IO::AIO::min_parallel 8; 4031 IO::AIO::min_parallel 8;
3605
3606 undef $Coro::AIO::WATCHER;
3607 IO::AIO::max_poll_time $TICK * 0.1; 4032 IO::AIO::max_poll_time $TICK * 0.1;
3608 $AIO_POLL_WATCHER = Event->io ( 4033 undef $AnyEvent::AIO::WATCHER;
3609 reentrant => 0,
3610 data => WF_AUTOCANCEL,
3611 fd => IO::AIO::poll_fileno,
3612 poll => 'r',
3613 prio => 6,
3614 cb => \&IO::AIO::poll_cb,
3615 );
3616} 4034}
3617 4035
3618my $_log_backtrace; 4036my $_log_backtrace;
3619 4037
3620sub _log_backtrace { 4038sub _log_backtrace {
3623 $msg =~ s/\n//; 4041 $msg =~ s/\n//;
3624 4042
3625 # limit the # of concurrent backtraces 4043 # limit the # of concurrent backtraces
3626 if ($_log_backtrace < 2) { 4044 if ($_log_backtrace < 2) {
3627 ++$_log_backtrace; 4045 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg;
3628 async { 4047 async {
4048 $Coro::current->{desc} = "abt $msg";
4049
3629 my @bt = fork_call { 4050 my @bt = fork_call {
3630 @addr = map { sprintf "%x", $_ } @addr; 4051 @addr = map { sprintf "%x", $_ } @addr;
3631 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4052 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3632 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4053 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3633 or die "addr2line: $!"; 4054 or die "addr2line: $!";
3641 } 4062 }
3642 4063
3643 @funcs 4064 @funcs
3644 }; 4065 };
3645 4066
3646 LOG llevInfo, "[ABT] $msg\n"; 4067 LOG llevInfo, "[ABT] $perl_bt\n";
4068 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3647 LOG llevInfo, "[ABT] $_\n" for @bt; 4069 LOG llevInfo, "[ABT] $_\n" for @bt;
3648 --$_log_backtrace; 4070 --$_log_backtrace;
3649 }; 4071 };
3650 } else { 4072 } else {
3651 LOG llevInfo, "[ABT] $msg\n"; 4073 LOG llevInfo, "[ABT] $msg\n";
3652 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3653 } 4075 }
3654} 4076}
3655 4077
3656# load additional modules 4078# load additional modules
3657use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3658 4081
3659END { cf::emergency_save } 4082END { cf::emergency_save }
3660 4083
36611 40841
3662 4085

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines