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

Diff Legend

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