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

Diff Legend

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