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.344 by root, Mon Aug 27 02:43:38 2007 UTC vs.
Revision 1.505 by root, Sun Jan 31 03:46:20 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
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}
… …
1166 1350
1167 cf::override; 1351 cf::override;
1168 }, 1352 },
1169); 1353);
1170 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}
1367
1171sub load_extensions { 1368sub load_extensions {
1172 cf::sync_job { 1369 cf::sync_job {
1173 my %todo; 1370 my %todo;
1174 1371
1175 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1194 1391
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197 1394
1198 $ext{source} = 1395 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1201 . $source 1398 . $source
1202 . "\n};\n1"; 1399 . "\n};\n1";
1203 1400
1204 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1205 } 1402 }
1206 1403
1404 my $pass = 0;
1207 my %done; 1405 my %done;
1208 while (%todo) { 1406 while (%todo) {
1209 my $progress; 1407 my $progress;
1210 1408
1409 ++$pass;
1410
1411 ext:
1211 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1212 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1213 goto skip 1414 next ext
1214 unless exists $done{$_}; 1415 unless exists $done{$_};
1215 } 1416 }
1216 1417
1217 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1218 1419
1219 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1220 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1221 : "$v->{base}: extension inactive.\n";
1222 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1223 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1224 warn $msg; 1427 } else {
1225 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1226 exit 1; 1429 push @EXTS, $v->{pkg};
1227 } 1430 $progress = 1;
1228 1431
1229 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1230 } 1434 }
1231
1232 $done{$k} = delete $todo{$k};
1233 push @EXTS, $v->{pkg};
1234 $progress = 1;
1235 } 1435 }
1236 1436
1237 skip: 1437 unless ($progress) {
1238 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1239 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1240 } 1445 }
1241 }; 1446 };
1242} 1447}
1243 1448
1244############################################################################# 1449#############################################################################
1245 1450
1246=back 1451=back
1247 1452
1248=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1249 1454
1250Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1251 1456
1252=cut 1457=cut
1253 1458
1254package cf::player; 1459package cf::player;
1255 1460
1256use Coro::AIO; 1461use Coro::AIO;
1257 1462
1258=head3 cf::player 1463=head3 cf::player
1259 1464
1260=over 4 1465=over 4
1466
1467=item cf::player::num_playing
1468
1469Returns the official number of playing players, as per the Crossfire metaserver rules.
1470
1471=cut
1472
1473sub num_playing {
1474 scalar grep
1475 $_->ob->map
1476 && !$_->hidden
1477 && !$_->ob->flag (cf::FLAG_WIZ),
1478 cf::player::list
1479}
1261 1480
1262=item cf::player::find $login 1481=item cf::player::find $login
1263 1482
1264Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
1265 1484
… …
1284 1503
1285sub exists($) { 1504sub exists($) {
1286 my ($login) = @_; 1505 my ($login) = @_;
1287 1506
1288 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1289 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1290} 1509}
1291 1510
1292sub find($) { 1511sub find($) {
1293 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1294 my $login = $_[0]; 1513 my $login = $_[0];
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1520 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1521 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1522 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1523 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1524
1306 my $pl = load_pl path $login 1525 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1526 or return;
1527
1528 my $pl = cf::player::load_pl $f
1529 or return;
1530
1531 local $cf::PLAYER_LOADING{$login} = $pl;
1532 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1309 } 1534 }
1310 } 1535 }
1311} 1536}
1312 1537
… …
1321 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1322 1547
1323 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1325 1550
1551 cf::get_slot 0.01;
1552
1326 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1327 Coro::cede; 1554 cf::cede_to_tick;
1328} 1555}
1329 1556
1330sub new($) { 1557sub new($) {
1331 my ($login) = @_; 1558 my ($login) = @_;
1332 1559
… …
1361 my ($pl) = @_; 1588 my ($pl) = @_;
1362 1589
1363 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1364 1591
1365 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1366 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1367 1594
1368 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1369 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1370 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1371 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1372 1601
1373 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1374 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1410 or return []; 1639 or return [];
1411 1640
1412 my @logins; 1641 my @logins;
1413 1642
1414 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1644 my $path = path $login;
1645
1646 # a .pst is a dead give-away for a valid player
1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1652 }
1418 1653
1419 utf8::decode $login; 1654 utf8::decode $login;
1420 push @logins, $login; 1655 push @logins, $login;
1421 } 1656 }
1422 1657
… …
1449 } 1684 }
1450 1685
1451 \@paths 1686 \@paths
1452} 1687}
1453 1688
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1455 1690
1456Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503 1692
1504=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1505 1694
1506Sends an ext reply to the player. 1695Sends an ext reply to the player.
1507 1696
… …
1574our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1575our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1576 1765
1577sub generate_random_map { 1766sub generate_random_map {
1578 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1579 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1580 $self->_create_random_map ( 1772 $self->_create_random_map (
1581 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1582 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1583 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1705 1897
1706# the temporary/swap location 1898# the temporary/swap location
1707sub save_path { 1899sub save_path {
1708 my ($self) = @_; 1900 my ($self) = @_;
1709 1901
1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1711 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1712} 1904}
1713 1905
1714# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1715sub uniq_path { 1907sub uniq_path {
1716 my ($self) = @_; 1908 my ($self) = @_;
1717 1909
1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1719 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1720}
1721
1722# and all this just because we cannot iterate over
1723# all maps in C++...
1724sub change_all_map_light {
1725 my ($change) = @_;
1726
1727 $_->change_map_light ($change)
1728 for grep $_->outdoor, values %cf::MAP;
1729} 1912}
1730 1913
1731sub decay_objects { 1914sub decay_objects {
1732 my ($self) = @_; 1915 my ($self) = @_;
1733 1916
… …
1746 1929
1747sub load_header_from($) { 1930sub load_header_from($) {
1748 my ($self, $path) = @_; 1931 my ($self, $path) = @_;
1749 1932
1750 utf8::encode $path; 1933 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1934 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1935 or return;
1936
1937 $self->_load_header ($f)
1938 or return;
1939
1940 local $MAP_LOADING{$self->{path}} = $self;
1941 $f->resolve_delayed_derefs;
1756 1942
1757 $self->{load_path} = $path; 1943 $self->{load_path} = $path;
1758 1944
1759 1 1945 1
1760} 1946}
… …
1814sub find { 2000sub find {
1815 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1816 2002
1817 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1818 2004
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1820 2007
1821 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path";
1823 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1824 or return; 2010 or return;
1825 2011
1826 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1827 2013
… …
1829 or return; 2015 or return;
1830 2016
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2021 undef $guard1;
1834 $map->reset; 2022 $map->reset;
1835 undef $guard;
1836 return find $path; 2023 return find $path;
1837 } 2024 }
1838 2025
1839 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1840 } 2027 }
1841} 2028}
1842 2029
1843sub pre_load { } 2030sub pre_load { }
1844sub post_load { } 2031#sub post_load { } # XS
1845 2032
1846sub load { 2033sub load {
1847 my ($self) = @_; 2034 my ($self) = @_;
1848 2035
1849 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
1850 2037
1851 my $path = $self->{path}; 2038 my $path = $self->{path};
1852 2039
1853 { 2040 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2041 my $guard = cf::lock_acquire "map_data:$path";
1855 2042
2043 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2044 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2045
1858 $self->in_memory (cf::MAP_LOADING); 2046 $self->in_memory (cf::MAP_LOADING);
1859 2047
1860 $self->alloc; 2048 $self->alloc;
1861 2049
1862 $self->pre_load; 2050 $self->pre_load;
1863 Coro::cede; 2051 cf::cede_to_tick;
1864 2052
2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2055 $self->_load_objects ($f)
1866 or return; 2056 or return;
1867 2057
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1869 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1870 2060
1871 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2062 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2063 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2065 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2066 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs;
2068 }
1876 } 2069 }
1877 } 2070 }
1878 2071
1879 Coro::cede; 2072 $f->resolve_delayed_derefs;
2073
2074 cf::cede_to_tick;
1880 # now do the right thing for maps 2075 # now do the right thing for maps
1881 $self->link_multipart_objects; 2076 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2077 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2078 unless $self->difficulty;
1884 Coro::cede; 2079 cf::cede_to_tick;
1885 2080
1886 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2082 $self->decay_objects;
1888 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
1889 $self->update_buttons; 2084 $self->update_buttons;
1890 Coro::cede; 2085 cf::cede_to_tick;
1891 $self->set_darkness_map;
1892 Coro::cede;
1893 $self->activate; 2086 $self->activate;
1894 } 2087 }
1895 2088
1896 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
1898 2091
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2093 }
1901 2094
1902 $self->post_load; 2095 $self->post_load;
1903} 2096}
1904 2097
… …
1962 my ($path, $origin, $load) = @_; 2155 my ($path, $origin, $load) = @_;
1963 2156
1964 $path = normalise $path, $origin && $origin->{path}; 2157 $path = normalise $path, $origin && $origin->{path};
1965 2158
1966 if (my $map = $cf::MAP{$path}) { 2159 if (my $map = $cf::MAP{$path}) {
1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2161 }
1969 2162
1970 $MAP_PREFETCH{$path} |= $load; 2163 $MAP_PREFETCH{$path} |= $load;
1971 2164
1972 $MAP_PREFETCHER ||= cf::async { 2165 $MAP_PREFETCHER ||= cf::async {
2166 $Coro::current->{desc} = "map prefetcher";
2167
1973 while (%MAP_PREFETCH) { 2168 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2169 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2170 if (my $map = find $k) {
1976 $map->load if $v; 2171 $map->load if $v;
1977 } 2172 }
… …
1987} 2182}
1988 2183
1989sub save { 2184sub save {
1990 my ($self) = @_; 2185 my ($self) = @_;
1991 2186
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2188
1994 $self->{last_save} = $cf::RUNTIME; 2189 $self->{last_save} = $cf::RUNTIME;
1995 2190
1996 return unless $self->dirty; 2191 return unless $self->dirty;
1997 2192
… …
2003 return if $self->{deny_save}; 2198 return if $self->{deny_save};
2004 2199
2005 local $self->{last_access} = $self->last_access;#d# 2200 local $self->{last_access} = $self->last_access;#d#
2006 2201
2007 cf::async { 2202 cf::async {
2203 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2204 $_->contr->save for $self->players;
2009 }; 2205 };
2206
2207 cf::get_slot 0.02;
2010 2208
2011 if ($uniq) { 2209 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2210 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2211 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2014 } else { 2212 } else {
… …
2020 my ($self) = @_; 2218 my ($self) = @_;
2021 2219
2022 # save first because save cedes 2220 # save first because save cedes
2023 $self->save; 2221 $self->save;
2024 2222
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2224
2027 return if $self->players; 2225 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2226 return if $self->in_memory != cf::MAP_ACTIVE;
2029 return if $self->{deny_save}; 2227 return if $self->{deny_save};
2030 2228
2229 $self->in_memory (cf::MAP_SWAPPED);
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2233 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2234}
2034 2235
2035sub reset_at { 2236sub reset_at {
2036 my ($self) = @_; 2237 my ($self) = @_;
2037 2238
… …
2055 2256
2056 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2057 2258
2058 return if $self->players; 2259 return if $self->players;
2059 2260
2060 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2061 2262
2062 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2063 2264
2064 # need to save uniques path 2265 # need to save uniques path
2065 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2069 if $uniq; 2270 if $uniq;
2070 } 2271 }
2071 2272
2072 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
2073 2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2277 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2278
2078 $self->unlink_save; 2279 $self->unlink_save;
2079 $self->destroy; 2280 $self->destroy;
2080} 2281}
2081 2282
2082my $nuke_counter = "aaaa"; 2283my $nuke_counter = "aaaa";
2083 2284
2084sub nuke { 2285sub nuke {
2085 my ($self) = @_; 2286 my ($self) = @_;
2086 2287
2288 {
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2087 delete $cf::MAP{$self->path}; 2291 delete $cf::MAP{$self->path};
2088 2292
2089 $self->unlink_save; 2293 $self->unlink_save;
2090 2294
2091 bless $self, "cf::map"; 2295 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2296 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2297 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2298 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2300
2097 $cf::MAP{$self->path} = $self; 2301 $cf::MAP{$self->path} = $self;
2302 }
2098 2303
2099 $self->reset; # polite request, might not happen 2304 $self->reset; # polite request, might not happen
2100} 2305}
2101 2306
2102=item $maps = cf::map::tmp_maps 2307=item $maps = cf::map::tmp_maps
… …
2144 2349
2145sub unique_maps() { 2350sub unique_maps() {
2146 [ 2351 [
2147 map { 2352 map {
2148 utf8::decode $_; 2353 utf8::decode $_;
2149 /\.map$/ 2354 s/\.map$//; # TODO future compatibility hack
2355 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2356 ? ()
2150 ? normalise $_ 2357 : normalise $_
2151 : ()
2152 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2153 ] 2359 ]
2154} 2360}
2155 2361
2156package cf; 2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2157 2393
2158=back 2394=back
2159 2395
2160=head3 cf::object 2396=head3 cf::object
2161 2397
… …
2165 2401
2166=over 4 2402=over 4
2167 2403
2168=item $ob->inv_recursive 2404=item $ob->inv_recursive
2169 2405
2170Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2171 2408
2172=cut 2409=cut
2173 2410
2174sub inv_recursive_; 2411sub inv_recursive_;
2175sub inv_recursive_ { 2412sub inv_recursive_ {
… …
2178 2415
2179sub inv_recursive { 2416sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2181} 2418}
2182 2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2446}
2447
2183package cf; 2448package cf;
2184 2449
2185=back 2450=back
2186 2451
2187=head3 cf::object::player 2452=head3 cf::object::player
… …
2193Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2194can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2195dialogue with the given NPC character. 2460dialogue with the given NPC character.
2196 2461
2197=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2198 2477
2199# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2200# with dialog boxes. 2479# with dialog boxes.
2201#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2202sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
… …
2214 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216 2495
2217 } else { 2496 } else {
2218 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2219 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2220 } 2499 }
2221 } 2500 }
2222} 2501}
2223 2502
2224=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2249 2528
2250=item $player_object->enter_link 2529=item $player_object->enter_link
2251 2530
2252Freezes the player and moves him/her to a special map (C<{link}>). 2531Freezes the player and moves him/her to a special map (C<{link}>).
2253 2532
2254The player should be reasonably safe there for short amounts of time. You 2533The player should be reasonably safe there for short amounts of time (e.g.
2255I<MUST> call C<leave_link> as soon as possible, though. 2534for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link
2536map.
2256 2537
2257Will never block. 2538Will never block.
2258 2539
2259=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
2260 2541
… …
2312 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2313 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2314 2595
2315 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2316 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2317 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2318 2599
2319 $map->load; 2600 $map->load;
2320 $map->load_neighbours; 2601 $map->load_neighbours;
2321 2602
2322 return unless $self->contr->active; 2603 return unless $self->contr->active;
2323 $self->activate_recursive;
2324 2604
2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2326 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2327} 2610}
2328 2611
2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2330 2613
2331Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
2332her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2333that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2334the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process. 2618be called at the end of this process.
2336 2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2622
2337=cut 2623=cut
2338 2624
2339our $GOTOGEN; 2625our $GOTOGEN;
2340 2626
2341sub cf::object::player::goto { 2627sub cf::object::player::goto {
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2632
2347 $self->enter_link; 2633 $self->enter_link;
2348 2634
2349 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
2350 my $map = eval { 2657 my $map = eval {
2351 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
2352 2659
2353 if ($map) { 2660 if ($map) {
2354 $map = $map->customise_for ($self); 2661 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2662 $map = $check->($map) if $check && $map;
2356 } else { 2663 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2665 }
2359 2666
2360 $map 2667 $map
2361 }; 2668 };
2362 2669
… …
2398} 2705}
2399 2706
2400sub prepare_random_map { 2707sub prepare_random_map {
2401 my ($exit) = @_; 2708 my ($exit) = @_;
2402 2709
2403 my $guard = cf::lock_acquire "exit_prepare:$exit";
2404
2405 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2406 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2407 # that depends on the exit object 2712 # that depends on the exit object
2408 2713
2409 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
… …
2411 if ($exit->map) { 2716 if ($exit->map) {
2412 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2413 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2414 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2415 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2416 } 2723 }
2417 2724
2418 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2419 2726
2420 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2421 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2423 2730
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2426 undef $fh; 2733 undef $fh;
2427 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2428 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2429 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2430 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2431 } 2742 }
2432} 2743}
2433 2744
2434sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2435 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2436 2747
2437 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2438 2749
2439 if ($exit->slaying eq "/!") {
2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
2443 cf::sync_job { prepare_random_map $exit };
2444 }
2445
2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2447 my $hp = $exit->stats->hp;
2448 my $sp = $exit->stats->sp;
2449
2450 $self->enter_link; 2750 $self->enter_link;
2451 2751
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2456 (async { 2752 (async {
2457 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2458 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2459 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2460 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2461 1; 2776 1
2462 }) { 2777 }) {
2463 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2464 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2465 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2466 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2467 2782
2468 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
… …
2485sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
2486 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
2487 2802
2488 utf8::encode $text; 2803 utf8::encode $text;
2489 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2805}
2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2490} 2830}
2491 2831
2492=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2493 2833
2494Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2836the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2837the message unless the client supports the msg packet.
2498 2838
2499=cut 2839=cut
2500 2840
2841# non-persistent channels (usually the info channel)
2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2849 "c/identify" => {
2850 id => "infobox",
2851 title => "Identify",
2852 reply => undef,
2853 tooltip => "Items recently identified",
2854 },
2855 "c/examine" => {
2856 id => "infobox",
2857 title => "Examine",
2858 reply => undef,
2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2866 },
2867 "c/book" => {
2868 id => "infobox",
2869 title => "Book",
2870 reply => undef,
2871 tooltip => "The contents of a note or book",
2872 },
2873 "c/lookat" => {
2874 id => "infobox",
2875 title => "Look",
2876 reply => undef,
2877 tooltip => "What you saw there",
2878 },
2879 "c/who" => {
2880 id => "infobox",
2881 title => "Players",
2882 reply => undef,
2883 tooltip => "Shows players who are currently online",
2884 },
2885 "c/body" => {
2886 id => "infobox",
2887 title => "Body Parts",
2888 reply => undef,
2889 tooltip => "Shows which body parts you posess and are available",
2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2897 "c/skills" => {
2898 id => "infobox",
2899 title => "Skills",
2900 reply => undef,
2901 tooltip => "Shows your experience per skill and item power",
2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2926 },
2927 "c/uptime" => {
2928 id => "infobox",
2929 title => "Uptime",
2930 reply => undef,
2931 tooltip => "How long the server has been running since last restart",
2932 },
2933 "c/mapinfo" => {
2934 id => "infobox",
2935 title => "Map Info",
2936 reply => undef,
2937 tooltip => "Information related to the maps",
2938 },
2939 "c/party" => {
2940 id => "party",
2941 title => "Party",
2942 reply => "gsay ",
2943 tooltip => "Messages and chat related to your party",
2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2953);
2954
2501sub cf::client::send_msg { 2955sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2957
2504 $msg = $self->pl->expand_cfpod ($msg); 2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2505 2960
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2962
2963 # check predefined channels, for the benefit of C
2964 if ($CHANNEL{$channel}) {
2965 $channel = $CHANNEL{$channel};
2966
2967 $self->ext_msg (channel_info => $channel);
2968 $channel = $channel->{id};
2969
2508 if (ref $channel) { 2970 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2971 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2972 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2973 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2974 $self->ext_msg (channel_info => $channel);
2513 } 2975 }
… …
2515 $channel = $channel->{id}; 2977 $channel = $channel->{id};
2516 } 2978 }
2517 2979
2518 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2519 2981
2520 if ($self->can_msg) {
2521 # default colour, mask it out 2982 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF; 2984 if $color & cf::NDI_DEF;
2524 2985
2525 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2986 my $pkt = "msg "
2987 . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2527 } else { 2989 );
2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538 2990
2539 $color &= cf::NDI_COLOR_MASK; 2991 $self->send_big_packet ($pkt);
2540
2541 utf8::encode $msg;
2542
2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2546 } else {
2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2548 $self->send_packet ("drawinfo $color $msg")
2549 }
2550 }
2551 }
2552} 2992}
2553 2993
2554=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2555 2995
2556Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2559 2999
2560sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2562 3002
2563 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2565 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2566 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2568 } 3008 }
2569} 3009}
2570 3010
2571=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2572 3012
… …
2576 3016
2577sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2578 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2579 3019
2580 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2582 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2583 #TODO: version 1, remove 3023 #TODO: version 1, remove
2584 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2586 } 3026 }
2587} 3027}
2588 3028
2589=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2590 3030
… …
2717our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
2718 3158
2719$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
2720 3160
2721$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
2722 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
2723 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
2724 sort time 3164 sort time
2725)); 3165));
2726 3166
2727# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
2729=pod 3169=pod
2730 3170
2731The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
2732 3172
2733 cf::object 3173 cf::object
2734 contr pay_amount pay_player map x y force_find force_add 3174 contr pay_amount pay_player map x y force_find force_add destroy
2735 insert remove name archname title slaying race decrease_ob_nr 3175 insert remove name archname title slaying race decrease split
3176 value
2736 3177
2737 cf::object::player 3178 cf::object::player
2738 player 3179 player
2739 3180
2740 cf::player 3181 cf::player
… …
2745 3186
2746=cut 3187=cut
2747 3188
2748for ( 3189for (
2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2750 insert remove inv name archname title slaying race 3191 insert remove inv nrof name archname title slaying race
2751 decrease_ob_nr)], 3192 decrease split destroy change_exp value msg lore send_msg)],
2752 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
2753 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
2754 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
2755) { 3196) {
2756 no strict 'refs'; 3197 no strict 'refs';
2757 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
2758 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2776 3217
2777 my $qcode = $code; 3218 my $qcode = $code;
2778 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2779 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
2780 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
2781 local $_; 3225 local $_;
2782 local @safe::cf::_safe_eval_args = values %vars;
2783 3226
2784 my $eval = 3227 my $eval =
2785 "do {\n" 3228 "do {\n"
2786 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2787 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
2788 . $code 3231 . $code
2789 . "\n}" 3232 . "\n}"
2790 ; 3233 ;
2791 3234
3235 if ($CFG{safe_eval}) {
2792 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
2793 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2794 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
2795 3244
2796 if ($@) { 3245 if ($@) {
2797 warn "$@"; 3246 warn "$@";
2798 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
2799 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
2818=cut 3267=cut
2819 3268
2820sub register_script_function { 3269sub register_script_function {
2821 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
2822 3271
2823 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
2824 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
2825} 3274}
2826 3275
2827=back 3276=back
2828 3277
2829=cut 3278=cut
… …
2831############################################################################# 3280#############################################################################
2832# the server's init and main functions 3281# the server's init and main functions
2833 3282
2834sub load_facedata($) { 3283sub load_facedata($) {
2835 my ($path) = @_; 3284 my ($path) = @_;
3285
3286 # HACK to clear player env face cache, we need some signal framework
3287 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = ();
2836 3289
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3290 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838 3291
2839 warn "loading facedata from $path\n"; 3292 warn "loading facedata from $path\n";
2840 3293
… …
2846 3299
2847 $facedata->{version} == 2 3300 $facedata->{version} == 2
2848 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
2849 3302
2850 # patch in the exptable 3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2851 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
2852 type => FT_RSRC, 3306 type => FT_RSRC,
2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
2854 }; 3309 };
2855 cf::cede_to_tick; 3310 cf::cede_to_tick;
2856 3311
2857 { 3312 {
2858 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
2859 3314
2860 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
2861 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317
2862 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
2863 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2866 3322
2867 cf::cede_to_tick; 3323 cf::cede_to_tick;
2868 } 3324 }
2869 3325
2870 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
2871 next unless $info->{smooth}; 3327 next unless $info->{smooth};
3328
2872 my $idx = cf::face::find $face 3329 my $idx = cf::face::find $face
2873 or next; 3330 or next;
3331
2874 if (my $smooth = cf::face::find $info->{smooth}) { 3332 if (my $smooth = cf::face::find $info->{smooth}) {
2875 cf::face::set_smooth $idx, $smooth; 3333 cf::face::set_smooth $idx, $smooth;
2876 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2877 } else { 3335 } else {
2878 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3336 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2892 3350
2893 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
2894 } 3352 }
2895 3353
2896 { 3354 {
2897 # TODO: for gcfclient pleasure, we should give resources
2898 # that gcfclient doesn't grok a >10000 face index.
2899 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
2900 3356
2901 my $soundconf = delete $res->{"res/sound.conf"};
2902
2903 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3358 if (defined $info->{type}) {
2904 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2905 my $data;
2906 3360
2907 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2908 # prepend meta info 3362 cf::face::set_type $idx, $info->{type};
2909
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 $data = pack "(w/a*)*", $meta, $info->{data};
2916 } else { 3363 } else {
2917 $data = $info->{data}; 3364 $RESOURCE{$name} = $info;
2918 } 3365 }
2919 3366
2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2921 cf::face::set_type $idx, $info->{type};
2922
2923 cf::cede_to_tick; 3367 cf::cede_to_tick;
2924 } 3368 }
2925
2926 if ($soundconf) {
2927 $soundconf = $enc->decode (delete $soundconf->{data});
2928
2929 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2930 my $sound = $soundconf->{compat}[$_]
2931 or next;
2932
2933 my $face = cf::face::find "sound/$sound->[1]";
2934 cf::sound::set $sound->[0] => $face;
2935 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2936 }
2937
2938 while (my ($k, $v) = each %{$soundconf->{event}}) {
2939 my $face = cf::face::find "sound/$v";
2940 cf::sound::set $k => $face;
2941 }
2942 }
2943 } 3369 }
3370
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2944 3372
2945 1 3373 1
2946} 3374}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
2947 3395
2948register_exticmd fx_want => sub { 3396register_exticmd fx_want => sub {
2949 my ($ns, $want) = @_; 3397 my ($ns, $want) = @_;
2950 3398
2951 while (my ($k, $v) = each %$want) { 3399 while (my ($k, $v) = each %$want) {
2952 $ns->fx_want ($k, $v); 3400 $ns->fx_want ($k, $v);
2953 } 3401 }
2954}; 3402};
2955 3403
3404sub load_resource_file($) {
3405 my $guard = lock_acquire "load_resource_file";
3406
3407 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100;
3409 cf::arch::commit_load;
3410
3411 $status
3412}
3413
2956sub reload_regions { 3414sub reload_regions {
3415 # HACK to clear player env face cache, we need some signal framework
3416 # for this (global event?)
3417 %ext::player_env::MUSIC_FACE_CACHE = ();
3418
2957 load_resource_file "$MAPDIR/regions" 3419 load_resource_file "$MAPDIR/regions"
2958 or die "unable to load regions file\n"; 3420 or die "unable to load regions file\n";
2959 3421
2960 for (cf::region::list) { 3422 for (cf::region::list) {
2961 $_->{match} = qr/$_->{match}/ 3423 $_->{match} = qr/$_->{match}/
… …
2969} 3431}
2970 3432
2971sub reload_archetypes { 3433sub reload_archetypes {
2972 load_resource_file "$DATADIR/archetypes" 3434 load_resource_file "$DATADIR/archetypes"
2973 or die "unable to load archetypes\n"; 3435 or die "unable to load archetypes\n";
2974 #d# NEED to laod twice to resolve forward references
2975 # this really needs to be done in an extra post-pass
2976 # (which needs to be synchronous, so solve it differently)
2977 load_resource_file "$DATADIR/archetypes"
2978 or die "unable to load archetypes\n";
2979} 3436}
2980 3437
2981sub reload_treasures { 3438sub reload_treasures {
2982 load_resource_file "$DATADIR/treasures" 3439 load_resource_file "$DATADIR/treasures"
2983 or die "unable to load treasurelists\n"; 3440 or die "unable to load treasurelists\n";
2984} 3441}
2985 3442
2986sub reload_resources { 3443sub reload_resources {
2987 warn "reloading resource files...\n"; 3444 warn "reloading resource files...\n";
2988 3445
3446 reload_facedata;
3447 reload_archetypes;
2989 reload_regions; 3448 reload_regions;
2990 reload_facedata;
2991 #reload_archetypes;#d#
2992 reload_archetypes;
2993 reload_treasures; 3449 reload_treasures;
2994 3450
2995 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
2996} 3452}
2997 3453
2998sub init { 3454sub reload_config {
2999 reload_resources; 3455 warn "reloading config file...\n";
3000}
3001 3456
3002sub cfg_load {
3003 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3004 or return; 3458 or return;
3005 3459
3006 local $/; 3460 local $/;
3007 *CFG = YAML::Syck::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3008 3462
3009 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3010 3464
3011 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3012 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3016 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3017 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3018 }; 3472 };
3019 warn $@ if $@; 3473 warn $@ if $@;
3020 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3477}
3478
3479sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!";
3482 flock $fh, &Fcntl::LOCK_EX
3483 or die "$PIDFILE: flock: $!";
3484 $fh
3485}
3486
3487# make sure only one server instance is running at any one time
3488sub atomic {
3489 my $fh = pidfile;
3490
3491 my $pid = <$fh>;
3492 kill 9, $pid if $pid > 0;
3493
3494 seek $fh, 0, 0;
3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
3021} 3505}
3022 3506
3023sub main { 3507sub main {
3508 cf::init_globals; # initialise logging
3509
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521
3024 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
3025 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
3026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3027 (async { 3525 (async {
3028 Event::one_event; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3527 EV::loop EV::LOOP_ONESHOT;
3029 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
3030 }; 3529 };
3031 3530
3032 cfg_load; 3531 evthread_start IO::AIO::poll_fileno;
3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3538 reload_config;
3033 db_init; 3539 db_init;
3540
3541 cf::init_uuid;
3542 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills;
3545
3546 cf::init_beforeplay;
3547
3548 atomic;
3549
3034 load_extensions; 3550 load_extensions;
3035 3551
3036 $TICK_WATCHER->start; 3552 utime time, time, $RUNTIMEFILE;
3037 Event::loop; 3553
3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557
3558 (pop @POST_INIT)->(0) while @POST_INIT;
3559 };
3560
3561 main_loop;
3038} 3562}
3039 3563
3040############################################################################# 3564#############################################################################
3041# initialisation and cleanup 3565# initialisation and cleanup
3042 3566
3043# install some emergency cleanup handlers 3567# install some emergency cleanup handlers
3044BEGIN { 3568BEGIN {
3569 our %SIGWATCHER = ();
3045 for my $signal (qw(INT HUP TERM)) { 3570 for my $signal (qw(INT HUP TERM)) {
3046 Event->signal ( 3571 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3047 reentrant => 0,
3048 data => WF_AUTOCANCEL,
3049 signal => $signal,
3050 prio => 0,
3051 cb => sub {
3052 cf::cleanup "SIG$signal"; 3572 cf::cleanup "SIG$signal";
3053 },
3054 ); 3573 };
3055 } 3574 }
3056} 3575}
3057 3576
3058sub write_runtime { 3577sub write_runtime_sync {
3059 my $runtime = "$LOCALDIR/runtime";
3060
3061 # first touch the runtime file to show we are still running: 3578 # first touch the runtime file to show we are still running:
3062 # the fsync below can take a very very long time. 3579 # the fsync below can take a very very long time.
3063 3580
3064 IO::AIO::aio_utime $runtime, undef, undef; 3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3065 3582
3066 my $guard = cf::lock_acquire "write_runtime"; 3583 my $guard = cf::lock_acquire "write_runtime";
3067 3584
3068 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3585 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3069 or return; 3586 or return;
3070 3587
3071 my $value = $cf::RUNTIME + 90 + 10; 3588 my $value = $cf::RUNTIME + 90 + 10;
3072 # 10 is the runtime save interval, for a monotonic clock 3589 # 10 is the runtime save interval, for a monotonic clock
3073 # 60 allows for the watchdog to kill the server. 3590 # 60 allows for the watchdog to kill the server.
… …
3083 aio_utime $fh, undef, undef; 3600 aio_utime $fh, undef, undef;
3084 3601
3085 close $fh 3602 close $fh
3086 or return; 3603 or return;
3087 3604
3088 aio_rename "$runtime~", $runtime 3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3089 and return; 3606 and return;
3090 3607
3091 warn "runtime file written.\n"; 3608 warn "runtime file written.\n";
3092 3609
3093 1 3610 1
3611}
3612
3613our $uuid_lock;
3614our $uuid_skip;
3615
3616sub write_uuid_sync($) {
3617 $uuid_skip ||= $_[0];
3618
3619 return if $uuid_lock;
3620 local $uuid_lock = 1;
3621
3622 my $uuid = "$LOCALDIR/uuid";
3623
3624 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3625 or return;
3626
3627 my $value = uuid_seq uuid_cur;
3628
3629 unless ($value) {
3630 warn "cowardly refusing to write zero uuid value!\n";
3631 return;
3632 }
3633
3634 my $value = uuid_str $value + $uuid_skip;
3635 $uuid_skip = 0;
3636
3637 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3638 and return;
3639
3640 # always fsync - this file is important
3641 aio_fsync $fh
3642 and return;
3643
3644 close $fh
3645 or return;
3646
3647 aio_rename "$uuid~", $uuid
3648 and return;
3649
3650 warn "uuid file written ($value).\n";
3651
3652 1
3653
3654}
3655
3656sub write_uuid($$) {
3657 my ($skip, $sync) = @_;
3658
3659 $sync ? write_uuid_sync $skip
3660 : async { write_uuid_sync $skip };
3094} 3661}
3095 3662
3096sub emergency_save() { 3663sub emergency_save() {
3097 my $freeze_guard = cf::freeze_mainloop; 3664 my $freeze_guard = cf::freeze_mainloop;
3098 3665
3099 warn "enter emergency perl save\n"; 3666 warn "emergency_perl_save: enter\n";
3100 3667
3101 cf::sync_job { 3668 cf::sync_job {
3669 # this is a trade-off: we want to be very quick here, so
3670 # save all maps without fsync, and later call a global sync
3671 # (which in turn might be very very slow)
3672 local $USE_FSYNC = 0;
3673
3102 # use a peculiar iteration method to avoid tripping on perl 3674 # use a peculiar iteration method to avoid tripping on perl
3103 # refcount bugs in for. also avoids problems with players 3675 # refcount bugs in for. also avoids problems with players
3104 # and maps saved/destroyed asynchronously. 3676 # and maps saved/destroyed asynchronously.
3105 warn "begin emergency player save\n"; 3677 warn "emergency_perl_save: begin player save\n";
3106 for my $login (keys %cf::PLAYER) { 3678 for my $login (keys %cf::PLAYER) {
3107 my $pl = $cf::PLAYER{$login} or next; 3679 my $pl = $cf::PLAYER{$login} or next;
3108 $pl->valid or next; 3680 $pl->valid or next;
3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3109 $pl->save; 3682 $pl->save;
3110 } 3683 }
3111 warn "end emergency player save\n"; 3684 warn "emergency_perl_save: end player save\n";
3112 3685
3113 warn "begin emergency map save\n"; 3686 warn "emergency_perl_save: begin map save\n";
3114 for my $path (keys %cf::MAP) { 3687 for my $path (keys %cf::MAP) {
3115 my $map = $cf::MAP{$path} or next; 3688 my $map = $cf::MAP{$path} or next;
3116 $map->valid or next; 3689 $map->valid or next;
3117 $map->save; 3690 $map->save;
3118 } 3691 }
3119 warn "end emergency map save\n"; 3692 warn "emergency_perl_save: end map save\n";
3120 3693
3121 warn "begin emergency database checkpoint\n"; 3694 warn "emergency_perl_save: begin database checkpoint\n";
3122 BDB::db_env_txn_checkpoint $DB_ENV; 3695 BDB::db_env_txn_checkpoint $DB_ENV;
3123 warn "end emergency database checkpoint\n"; 3696 warn "emergency_perl_save: end database checkpoint\n";
3697
3698 warn "emergency_perl_save: begin write uuid\n";
3699 write_uuid_sync 1;
3700 warn "emergency_perl_save: end write uuid\n";
3124 }; 3701 };
3125 3702
3703 warn "emergency_perl_save: starting sync()\n";
3704 IO::AIO::aio_sync sub {
3705 warn "emergency_perl_save: finished sync()\n";
3706 };
3707
3126 warn "leave emergency perl save\n"; 3708 warn "emergency_perl_save: leave\n";
3127} 3709}
3128 3710
3129sub post_cleanup { 3711sub post_cleanup {
3130 my ($make_core) = @_; 3712 my ($make_core) = @_;
3131 3713
3132 warn Carp::longmess "post_cleanup backtrace" 3714 warn Carp::longmess "post_cleanup backtrace"
3133 if $make_core; 3715 if $make_core;
3716
3717 my $fh = pidfile;
3718 unlink $PIDFILE if <$fh> == $$;
3719}
3720
3721# a safer delete_package, copied from Symbol
3722sub clear_package($) {
3723 my $pkg = shift;
3724
3725 # expand to full symbol table name if needed
3726 unless ($pkg =~ /^main::.*::$/) {
3727 $pkg = "main$pkg" if $pkg =~ /^::/;
3728 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3729 $pkg .= '::' unless $pkg =~ /::$/;
3730 }
3731
3732 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3733 my $stem_symtab = *{$stem}{HASH};
3734
3735 defined $stem_symtab and exists $stem_symtab->{$leaf}
3736 or return;
3737
3738 # clear all symbols
3739 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740 for my $name (keys %$leaf_symtab) {
3741 _gv_clear *{"$pkg$name"};
3742# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743 }
3744 warn "cleared package $pkg\n";#d#
3134} 3745}
3135 3746
3136sub do_reload_perl() { 3747sub do_reload_perl() {
3137 # can/must only be called in main 3748 # can/must only be called in main
3138 if ($Coro::current != $Coro::main) { 3749 if ($Coro::current != $Coro::main) {
3139 warn "can only reload from main coroutine"; 3750 warn "can only reload from main coroutine";
3140 return; 3751 return;
3141 } 3752 }
3142 3753
3754 return if $RELOAD++;
3755
3756 my $t1 = EV::time;
3757
3758 while ($RELOAD) {
3143 warn "reloading..."; 3759 warn "reloading...";
3144 3760
3145 warn "entering sync_job"; 3761 warn "entering sync_job";
3146 3762
3147 cf::sync_job { 3763 cf::sync_job {
3148 cf::write_runtime; # external watchdog should not bark 3764 cf::write_runtime_sync; # external watchdog should not bark
3149 cf::emergency_save; 3765 cf::emergency_save;
3150 cf::write_runtime; # external watchdog should not bark 3766 cf::write_runtime_sync; # external watchdog should not bark
3151 3767
3152 warn "syncing database to disk"; 3768 warn "syncing database to disk";
3153 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3154 3770
3155 # if anything goes wrong in here, we should simply crash as we already saved 3771 # if anything goes wrong in here, we should simply crash as we already saved
3156 3772
3157 warn "cancelling all WF_AUTOCANCEL watchers";
3158 for (Event::all_watchers) {
3159 $_->cancel if $_->data & WF_AUTOCANCEL;
3160 }
3161
3162 warn "flushing outstanding aio requests"; 3773 warn "flushing outstanding aio requests";
3163 for (;;) {
3164 BDB::flush;
3165 IO::AIO::flush;
3166 Coro::cede;
3167 last unless IO::AIO::nreqs || BDB::nreqs; 3774 while (IO::AIO::nreqs || BDB::nreqs) {
3168 warn "iterate..."; 3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3169 }
3170
3171 ++$RELOAD;
3172
3173 warn "cancelling all extension coros";
3174 $_->cancel for values %EXT_CORO;
3175 %EXT_CORO = ();
3176
3177 warn "removing commands";
3178 %COMMAND = ();
3179
3180 warn "removing ext/exti commands";
3181 %EXTCMD = ();
3182 %EXTICMD = ();
3183
3184 warn "unloading/nuking all extensions";
3185 for my $pkg (@EXTS) {
3186 warn "... unloading $pkg";
3187
3188 if (my $cb = $pkg->can ("unload")) {
3189 eval {
3190 $cb->($pkg);
3191 1
3192 } or warn "$pkg unloaded, but with errors: $@";
3193 } 3776 }
3194 3777
3195 warn "... nuking $pkg"; 3778 warn "cancelling all extension coros";
3196 Symbol::delete_package $pkg; 3779 $_->cancel for values %EXT_CORO;
3197 } 3780 %EXT_CORO = ();
3198 3781
3199 warn "unloading all perl modules loaded from $LIBDIR"; 3782 warn "removing commands";
3200 while (my ($k, $v) = each %INC) { 3783 %COMMAND = ();
3201 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3202 3784
3785 warn "removing ext/exti commands";
3786 %EXTCMD = ();
3787 %EXTICMD = ();
3788
3789 warn "unloading/nuking all extensions";
3790 for my $pkg (@EXTS) {
3203 warn "... unloading $k"; 3791 warn "... unloading $pkg";
3204 delete $INC{$k};
3205 3792
3206 $k =~ s/\.pm$//;
3207 $k =~ s/\//::/g;
3208
3209 if (my $cb = $k->can ("unload_module")) { 3793 if (my $cb = $pkg->can ("unload")) {
3794 eval {
3210 $cb->(); 3795 $cb->($pkg);
3796 1
3797 } or warn "$pkg unloaded, but with errors: $@";
3798 }
3799
3800 warn "... clearing $pkg";
3801 clear_package $pkg;
3211 } 3802 }
3212 3803
3213 Symbol::delete_package $k; 3804 warn "unloading all perl modules loaded from $LIBDIR";
3805 while (my ($k, $v) = each %INC) {
3806 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807
3808 warn "... unloading $k";
3809 delete $INC{$k};
3810
3811 $k =~ s/\.pm$//;
3812 $k =~ s/\//::/g;
3813
3814 if (my $cb = $k->can ("unload_module")) {
3815 $cb->();
3816 }
3817
3818 clear_package $k;
3214 } 3819 }
3215 3820
3216 warn "getting rid of safe::, as good as possible"; 3821 warn "getting rid of safe::, as good as possible";
3217 Symbol::delete_package "safe::$_" 3822 clear_package "safe::$_"
3218 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3823 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3219 3824
3220 warn "unloading cf.pm \"a bit\""; 3825 warn "unloading cf.pm \"a bit\"";
3221 delete $INC{"cf.pm"}; 3826 delete $INC{"cf.pm"};
3222 delete $INC{"cf/pod.pm"}; 3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3223 3828
3224 # don't, removes xs symbols, too, 3829 # don't, removes xs symbols, too,
3225 # and global variables created in xs 3830 # and global variables created in xs
3226 #Symbol::delete_package __PACKAGE__; 3831 #clear_package __PACKAGE__;
3227 3832
3228 warn "unload completed, starting to reload now"; 3833 warn "unload completed, starting to reload now";
3229 3834
3230 warn "reloading cf.pm"; 3835 warn "reloading cf.pm";
3231 require cf; 3836 require cf;
3232 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3837 cf::_connect_to_perl_1;
3233 3838
3234 warn "loading config and database again"; 3839 warn "loading config and database again";
3235 cf::cfg_load; 3840 cf::reload_config;
3236 3841
3237 warn "loading extensions"; 3842 warn "loading extensions";
3238 cf::load_extensions; 3843 cf::load_extensions;
3239 3844
3845 if ($REATTACH_ON_RELOAD) {
3240 warn "reattaching attachments to objects/players"; 3846 warn "reattaching attachments to objects/players";
3241 _global_reattach; # objects, sockets 3847 _global_reattach; # objects, sockets
3242 warn "reattaching attachments to maps"; 3848 warn "reattaching attachments to maps";
3243 reattach $_ for values %MAP; 3849 reattach $_ for values %MAP;
3244 warn "reattaching attachments to players"; 3850 warn "reattaching attachments to players";
3245 reattach $_ for values %PLAYER; 3851 reattach $_ for values %PLAYER;
3852 }
3246 3853
3854 warn "running post_init jobs";
3855 (pop @POST_INIT)->(1) while @POST_INIT;
3856
3247 warn "leaving sync_job"; 3857 warn "leaving sync_job";
3248 3858
3249 1 3859 1
3250 } or do { 3860 } or do {
3251 warn $@; 3861 warn $@;
3252 warn "error while reloading, exiting."; 3862 cf::cleanup "error while reloading, exiting.";
3253 exit 1;
3254 }; 3863 };
3255 3864
3256 warn "reloaded"; 3865 warn "reloaded";
3866 --$RELOAD;
3867 }
3868
3869 $t1 = EV::time - $t1;
3870 warn "reload completed in ${t1}s\n";
3257}; 3871};
3258 3872
3259our $RELOAD_WATCHER; # used only during reload 3873our $RELOAD_WATCHER; # used only during reload
3260 3874
3261sub reload_perl() { 3875sub reload_perl() {
3262 # doing reload synchronously and two reloads happen back-to-back, 3876 # doing reload synchronously and two reloads happen back-to-back,
3263 # coro crashes during coro_state_free->destroy here. 3877 # coro crashes during coro_state_free->destroy here.
3264 3878
3265 $RELOAD_WATCHER ||= Event->timer ( 3879 $RELOAD_WATCHER ||= cf::async {
3266 reentrant => 0, 3880 Coro::AIO::aio_wait cache_extensions;
3267 after => 0, 3881
3268 data => WF_AUTOCANCEL, 3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3269 cb => sub {
3270 do_reload_perl; 3883 do_reload_perl;
3271 undef $RELOAD_WATCHER; 3884 undef $RELOAD_WATCHER;
3272 }, 3885 };
3273 ); 3886 };
3274} 3887}
3275 3888
3276register_command "reload" => sub { 3889register_command "reload" => sub {
3277 my ($who, $arg) = @_; 3890 my ($who, $arg) = @_;
3278 3891
3279 if ($who->flag (FLAG_WIZ)) { 3892 if ($who->flag (FLAG_WIZ)) {
3280 $who->message ("reloading server."); 3893 $who->message ("reloading server.");
3894 async {
3895 $Coro::current->{desc} = "perl_reload";
3281 async { reload_perl }; 3896 reload_perl;
3897 };
3282 } 3898 }
3283}; 3899};
3284 3900
3285unshift @INC, $LIBDIR; 3901unshift @INC, $LIBDIR;
3286 3902
… …
3288 3904
3289our @WAIT_FOR_TICK; 3905our @WAIT_FOR_TICK;
3290our @WAIT_FOR_TICK_BEGIN; 3906our @WAIT_FOR_TICK_BEGIN;
3291 3907
3292sub wait_for_tick { 3908sub wait_for_tick {
3293 return unless $TICK_WATCHER->is_active;
3294 return if $Coro::current == $Coro::main; 3909 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3295 3910
3296 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK, $signal; 3912 push @WAIT_FOR_TICK, $signal;
3298 $signal->wait; 3913 $signal->wait;
3299} 3914}
3300 3915
3301sub wait_for_tick_begin { 3916sub wait_for_tick_begin {
3302 return unless $TICK_WATCHER->is_active;
3303 return if $Coro::current == $Coro::main; 3917 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3304 3918
3305 my $signal = new Coro::Signal; 3919 my $signal = new Coro::Signal;
3306 push @WAIT_FOR_TICK_BEGIN, $signal; 3920 push @WAIT_FOR_TICK_BEGIN, $signal;
3307 $signal->wait; 3921 $signal->wait;
3308} 3922}
3309 3923
3310 my $min = 1e6;#d# 3924sub tick {
3311 my $avg = 10;
3312$TICK_WATCHER = Event->timer (
3313 reentrant => 0,
3314 parked => 1,
3315 prio => 0,
3316 at => $NEXT_TICK || $TICK,
3317 data => WF_AUTOCANCEL,
3318 cb => sub {
3319 if ($Coro::current != $Coro::main) { 3925 if ($Coro::current != $Coro::main) {
3320 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3926 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3321 unless ++$bug_warning > 10; 3927 unless ++$bug_warning > 10;
3322 return; 3928 return;
3323 } 3929 }
3324 3930
3325 $NOW = $tick_start = Event::time;
3326
3327 cf::server_tick; # one server iteration 3931 cf::server_tick; # one server iteration
3328 3932
3329 0 && sync_job {#d# 3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3330 for(1..10) {
3331 my $t = Event::time;
3332 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3333 or die;
3334 3934
3335 $map->width (50); 3935 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 $map->height (50); 3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3337 $map->alloc; 3937 Coro::async_pool {
3338 $map->_load_objects ("/tmp/x.map", 1); 3938 $Coro::current->{desc} = "runtime saver";
3339 my $t = Event::time - $t; 3939 write_runtime_sync
3340 3940 or warn "ERROR: unable to write runtime file: $!";
3341 #next unless $t < 0.0013;#d#
3342 if ($t < $min) {
3343 $min = $t;
3344 }
3345 $avg = $avg * 0.99 + $t * 0.01;
3346 }
3347 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3348 exit 0;
3349 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3350 }; 3941 };
3942 }
3351 3943
3352 $RUNTIME += $TICK;
3353 $NEXT_TICK += $TICK;
3354
3355 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3356 $NEXT_RUNTIME_WRITE = $NOW + 10;
3357 Coro::async_pool {
3358 write_runtime
3359 or warn "ERROR: unable to write runtime file: $!";
3360 };
3361 }
3362
3363# my $AFTER = Event::time;
3364# warn $AFTER - $NOW;#d#
3365
3366 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3367 $sig->send; 3945 $sig->send;
3368 } 3946 }
3369 while (my $sig = shift @WAIT_FOR_TICK) { 3947 while (my $sig = shift @WAIT_FOR_TICK) {
3370 $sig->send; 3948 $sig->send;
3371 } 3949 }
3372 3950
3373 $NOW = Event::time; 3951 $LOAD = ($NOW - $TICK_START) / $TICK;
3374
3375 # if we are delayed by four ticks or more, skip them all
3376 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3377
3378 $TICK_WATCHER->at ($NEXT_TICK);
3379 $TICK_WATCHER->start;
3380
3381 $LOAD = ($NOW - $tick_start) / $TICK;
3382 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3952 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3383 3953
3384 _post_tick; 3954 if (0) {
3385 3955 if ($NEXT_TICK) {
3386 3956 my $jitter = $TICK_START - $NEXT_TICK;
3957 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958 warn "jitter $JITTER\n";#d#
3959 }
3387 }, 3960 }
3388); 3961}
3389 3962
3390{ 3963{
3391 BDB::max_poll_time $TICK * 0.1; 3964 # configure BDB
3392 $BDB_POLL_WATCHER = Event->io ( 3965
3393 reentrant => 0,
3394 fd => BDB::poll_fileno,
3395 poll => 'r',
3396 prio => 0,
3397 data => WF_AUTOCANCEL,
3398 cb => \&BDB::poll_cb,
3399 );
3400 BDB::min_parallel 8; 3966 BDB::min_parallel 16;
3401 3967 BDB::max_poll_reqs $TICK * 0.1;
3402 BDB::set_sync_prepare { 3968 $AnyEvent::BDB::WATCHER->priority (1);
3403 my $status;
3404 my $current = $Coro::current;
3405 (
3406 sub {
3407 $status = $!;
3408 $current->ready; undef $current;
3409 },
3410 sub {
3411 Coro::schedule while defined $current;
3412 $! = $status;
3413 },
3414 )
3415 };
3416 3969
3417 unless ($DB_ENV) { 3970 unless ($DB_ENV) {
3418 $DB_ENV = BDB::db_env_create; 3971 $DB_ENV = BDB::db_env_create;
3972 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3973 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3974 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3975 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3976 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3419 3977
3420 cf::sync_job { 3978 cf::sync_job {
3421 eval { 3979 eval {
3422 BDB::db_env_open 3980 BDB::db_env_open
3423 $DB_ENV, 3981 $DB_ENV,
… …
3425 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3983 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3426 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3984 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3427 0666; 3985 0666;
3428 3986
3429 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3987 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3430
3431 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3432 $DB_ENV->set_lk_detect;
3433 }; 3988 };
3434 3989
3435 cf::cleanup "db_env_open(db): $@" if $@; 3990 cf::cleanup "db_env_open(db): $@" if $@;
3436 }; 3991 };
3437 } 3992 }
3993
3994 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3995 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3996 };
3997 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3998 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3999 };
4000 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4001 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4002 };
3438} 4003}
3439 4004
3440{ 4005{
4006 # configure IO::AIO
4007
3441 IO::AIO::min_parallel 8; 4008 IO::AIO::min_parallel 8;
3442
3443 undef $Coro::AIO::WATCHER;
3444 IO::AIO::max_poll_time $TICK * 0.1; 4009 IO::AIO::max_poll_time $TICK * 0.1;
3445 $AIO_POLL_WATCHER = Event->io ( 4010 undef $AnyEvent::AIO::WATCHER;
3446 reentrant => 0,
3447 data => WF_AUTOCANCEL,
3448 fd => IO::AIO::poll_fileno,
3449 poll => 'r',
3450 prio => 6,
3451 cb => \&IO::AIO::poll_cb,
3452 );
3453} 4011}
3454 4012
3455my $_log_backtrace; 4013my $_log_backtrace;
3456 4014
3457sub _log_backtrace { 4015sub _log_backtrace {
… …
3460 $msg =~ s/\n//; 4018 $msg =~ s/\n//;
3461 4019
3462 # limit the # of concurrent backtraces 4020 # limit the # of concurrent backtraces
3463 if ($_log_backtrace < 2) { 4021 if ($_log_backtrace < 2) {
3464 ++$_log_backtrace; 4022 ++$_log_backtrace;
4023 my $perl_bt = Carp::longmess $msg;
3465 async { 4024 async {
4025 $Coro::current->{desc} = "abt $msg";
4026
3466 my @bt = fork_call { 4027 my @bt = fork_call {
3467 @addr = map { sprintf "%x", $_ } @addr; 4028 @addr = map { sprintf "%x", $_ } @addr;
3468 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4029 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3469 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4030 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3470 or die "addr2line: $!"; 4031 or die "addr2line: $!";
… …
3478 } 4039 }
3479 4040
3480 @funcs 4041 @funcs
3481 }; 4042 };
3482 4043
3483 LOG llevInfo, "[ABT] $msg\n"; 4044 LOG llevInfo, "[ABT] $perl_bt\n";
4045 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3484 LOG llevInfo, "[ABT] $_\n" for @bt; 4046 LOG llevInfo, "[ABT] $_\n" for @bt;
3485 --$_log_backtrace; 4047 --$_log_backtrace;
3486 }; 4048 };
3487 } else { 4049 } else {
3488 LOG llevInfo, "[ABT] $msg\n"; 4050 LOG llevInfo, "[ABT] $msg\n";
3489 LOG llevInfo, "[ABT] [suppressed]\n"; 4051 LOG llevInfo, "[ABT] [suppressed]\n";
3490 } 4052 }
3491} 4053}
3492 4054
3493# load additional modules 4055# load additional modules
3494use cf::pod; 4056require "cf/$_.pm" for @EXTRA_MODULES;
4057cf::_connect_to_perl_2;
3495 4058
3496END { cf::emergency_save } 4059END { cf::emergency_save }
3497 4060
34981 40611
3499 4062

Diff Legend

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