ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

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

Diff Legend

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