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

Diff Legend

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