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.189 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.506 by root, Wed Feb 3 20:48:22 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Storable; 31use Socket;
32use EV;
9use Opcode; 33use Opcode;
10use Safe; 34use Safe;
11use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
12 38
39use Guard ();
13use Coro 3.4 (); 40use Coro ();
41use Coro::State;
42use Coro::Handle;
43use Coro::EV;
14use Coro::Event; 44use Coro::AnyEvent;
15use Coro::Timer; 45use Coro::Timer;
16use Coro::Signal; 46use Coro::Signal;
17use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
18use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
52use Coro::Storable;
53use Coro::Util ();
19 54
55use JSON::XS 2.01 ();
56use BDB ();
20use Data::Dumper; 57use Data::Dumper;
21use Digest::MD5;
22use Fcntl; 58use Fcntl;
23use IO::AIO 2.32 ();
24use YAML::Syck (); 59use YAML::XS ();
60use IO::AIO ();
25use Time::HiRes; 61use Time::HiRes;
62use Compress::LZF;
63use Digest::MD5 ();
26 64
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 65AnyEvent::detect;
66
67# configure various modules to our taste
68#
69$Storable::canonical = 1; # reduce rsync transfers
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";
76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
28 80
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1;
33
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 82
36our %COMMAND = (); 83our %COMMAND = ();
37our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
38 85
39our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
43 91
92our $RELOAD; # number of reloads so far, non-zero while in reload
44our @EVENT; 93our @EVENT;
45our $LIBDIR = datadir . "/ext"; 94our @REFLECT; # set by XS
95our %REFLECT; # set by us
46 96
47our $TICK = MAX_TIME * 1e-6; 97our $CONFDIR = confdir;
48our $TICK_WATCHER; 98our $DATADIR = datadir;
49our $AIO_POLL_WATCHER; 99our $LIBDIR = "$DATADIR/ext";
50our $WRITE_RUNTIME_WATCHER; 100our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir;
102our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 115our $NEXT_TICK;
52our $NOW; 116our $USE_FSYNC = 1; # use fsync to write maps - default on
117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER;
121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
53 124
54our %CFG; 125our %CFG;
55 126
56our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 128our $RUNTIME;
129our $NOW;
58 130
59our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
60our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
61our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 134
67# 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 ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 137
138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
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 :)
147
70binmode STDOUT; 148binmode STDOUT;
71binmode STDERR; 149binmode STDERR;
72 150
73# read virtual server time, if available 151# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
75 open my $fh, "<", cf::localdir . "/runtime" 153 open my $fh, "<", $RUNTIMEFILE
76 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
77 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
78} 156}
79 157
80mkdir cf::localdir; 158eval "sub TICK() { $TICK } 1" or die;
81mkdir cf::localdir . "/" . cf::playerdir; 159
82mkdir cf::localdir . "/" . cf::tmpdir; 160mkdir $_
83mkdir cf::localdir . "/" . cf::uniquedir; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
84mkdir $RANDOM_MAPS;
85 162
86our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
164
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::"} };
87 177
88############################################################################# 178#############################################################################
89 179
90=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
91 181
… …
98=item $cf::RUNTIME 188=item $cf::RUNTIME
99 189
100The time this server has run, starts at 0 and is increased by $cf::TICK on 190The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 191every server tick.
102 192
103=item $cf::LIBDIR 193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 196
105The perl library directory, where extensions and cf-specific modules can 197Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 198directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and
200database environment.
107 201
108=item $cf::NOW 202=item $cf::NOW
109 203
110The time of the last (current) server tick. 204The time of the last (current) server tick.
111 205
112=item $cf::TICK 206=item $cf::TICK
113 207
114The interval between server ticks, in seconds. 208The interval between server ticks, in seconds.
115 209
210=item $cf::LOADAVG
211
212The current CPU load on the server (alpha-smoothed), as a value between 0
213(none) and 1 (overloaded), indicating how much time is spent on processing
214objects per tick. Healthy values are < 0.5.
215
216=item $cf::LOAD
217
218The raw value load value from the last tick.
219
116=item %cf::CFG 220=item %cf::CFG
117 221
118Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
119from wherever your confdir points to. 223from wherever your confdir points to.
120 224
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 225=item cf::wait_for_tick, cf::wait_for_tick_begin
122 226
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 228returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick. 230
231=item @cf::INVOKE_RESULTS
232
233This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235that call.
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.
127 242
128=back 243=back
129 244
130=cut 245=cut
131 246
132BEGIN { 247$Coro::State::WARNHOOK = sub {
133 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 248 my $msg = join "", @_;
135 utf8::encode $msg;
136 249
137 $msg .= "\n" 250 $msg .= "\n"
138 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
139 252
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254
140 LOG llevError, $msg; 255 LOG llevError, $msg;
141 }; 256};
142} 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};
143 271
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 276@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
277@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 278@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 279
151# we bless all objects into (empty) derived classes to force a method lookup 280# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 281# within the Safe compartment.
153for my $pkg (qw( 282for my $pkg (qw(
154 cf::global cf::attachable 283 cf::global cf::attachable
155 cf::object cf::object::player 284 cf::object cf::object::player
156 cf::client cf::player 285 cf::client cf::player
157 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
158 cf::map cf::party cf::region 288 cf::party cf::region
159)) { 289)) {
160 no strict 'refs';
161 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
162} 291}
163 292
164$Event::DIED = sub { 293$EV::DIED = sub {
165 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
166}; 295};
296
297#############################################################################
167 298
168=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
169 300
170=over 4 301=over 4
171 302
… …
190 $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;
191 $d 322 $d
192 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
193} 324}
194 325
195use JSON::Syck (); # TODO# replace by JSON::PC once working
196
197=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
198 327
199Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
200 329
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
209 331
210Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
211 333
212=cut 334=cut
213 335
214sub to_json($) { 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 337
216 JSON::Syck::Dump $_[0] 338sub encode_json($) { $json_coder->encode ($_[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;
217} 353}
218 354
219=item cf::lock_wait $string 355=item cf::lock_wait $string
220 356
221Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
222 358
223=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
224 360
225Wait 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
226a 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,
227for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
228returned. 364returned.
229 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
230Lock 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
231uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
232 371
233=cut 372=item $locked = cf::lock_active $string
234 373
235our %LOCK; 374Return true if the lock is currently active, i.e. somebody has locked it.
375
376=cut
377
378our $LOCKS = new Coro::SemaphoreSet;
236 379
237sub lock_wait($) { 380sub lock_wait($) {
238 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
239
240 # wait for lock, if any
241 while ($LOCK{$key}) {
242 push @{ $LOCK{$key} }, $Coro::current;
243 Coro::schedule;
244 }
245} 382}
246 383
247sub lock_acquire($) { 384sub lock_acquire($) {
248 my ($key) = @_; 385 $LOCKS->guard ($_[0])
386}
249 387
250 # wait, to be sure we are not locked 388sub lock_active($) {
251 lock_wait $key; 389 $LOCKS->count ($_[0]) < 1
252
253 $LOCK{$key} = [];
254
255 Coro::guard {
256 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} };
258 }
259} 390}
260 391
261sub freeze_mainloop { 392sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
263 394
264 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
265 $TICK_WATCHER->start; 396}
266 $WRITE_RUNTIME_WATCHER->start; 397
398=item cf::periodic $interval, $cb
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
411}
412
413=item cf::get_slot $time[, $priority[, $name]]
414
415Allocate $time seconds of blocking CPU time at priority C<$priority>:
416This call blocks and returns only when you have at least C<$time> seconds
417of cpu time till the next tick. The slot is only valid till the next cede.
418
419The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class.
421
422Useful for short background jobs.
423
424=cut
425
426our @SLOT_QUEUE;
427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
429
430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
434 my $signal = new Coro::Signal;
435 my $busy;
436
437 while () {
438 next_job:
439
440 my $avail = cf::till_tick;
441
442 for (0 .. $#SLOT_QUEUE) {
443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
445 my $job = splice @SLOT_QUEUE, $_, 1, ();
446 $job->[2]->send;
447 Coro::cede;
448 goto next_job;
449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
451 }
452 }
453
454 if (@SLOT_QUEUE) {
455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
456 push @cf::WAIT_FOR_TICK, $signal;
457 $signal->wait;
458 } else {
459 $busy = 0;
460 Coro::schedule;
461 }
267 }; 462 }
268 $WRITE_RUNTIME_WATCHER->stop; 463};
269 $TICK_WATCHER->stop; 464
270 $guard 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
468 my ($time, $pri, $name) = @_;
469
470 $time = clamp $time, 0.01, $TICK * .6;
471
472 my $sig = new Coro::Signal;
473
474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
476 $SLOT_QUEUE->ready;
477 $sig->wait;
271} 478}
272 479
273=item cf::async { BLOCK } 480=item cf::async { BLOCK }
274 481
275Currently the same as Coro::async_pool, meaning you cannot use 482Currently the same as Coro::async_pool, meaning you cannot use
… …
280 487
281BEGIN { *async = \&Coro::async_pool } 488BEGIN { *async = \&Coro::async_pool }
282 489
283=item cf::sync_job { BLOCK } 490=item cf::sync_job { BLOCK }
284 491
285The design of crossfire+ requires that the main coro ($Coro::main) is 492The design of Deliantra requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 493is always able to handle events or runnable, as Deliantra is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 494partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
495acceptable.
288 496
289If it must be done, put the blocking parts into C<sync_job>. This will run 497If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 498the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 499server will be frozen during this time, so the block should either finish
292fast or be very important. 500fast or be very important.
… …
295 503
296sub sync_job(&) { 504sub sync_job(&) {
297 my ($job) = @_; 505 my ($job) = @_;
298 506
299 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
508 my $time = EV::time;
509
300 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
302 512
303 # TODO: use suspend/resume instead 513 LOG llevError, Carp::longmess "sync job";#d#
304 # (but this is cancel-safe) 514
305 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
306 516
307 my $busy = 1; 517 my $busy = 1;
308 my @res; 518 my @res;
309 519
310 (async { 520 (async {
521 $Coro::current->desc ("sync job coro");
311 @res = eval { $job->() }; 522 @res = eval { $job->() };
312 warn $@ if $@; 523 warn $@ if $@;
313 undef $busy; 524 undef $busy;
314 })->prio (Coro::PRIO_MAX); 525 })->prio (Coro::PRIO_MAX);
315 526
316 while ($busy) { 527 while ($busy) {
317 Coro::cede or Event::one_event; 528 if (Coro::nready) {
529 Coro::cede_notself;
530 } else {
531 EV::loop EV::LOOP_ONESHOT;
318 } 532 }
533 }
534
535 my $time = EV::time - $time;
536
537 $TICK_START += $time; # do not account sync jobs to server load
319 538
320 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
321 } else { 540 } else {
322 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
323 542
… …
343 $EXT_CORO{$coro+0} = $coro; 562 $EXT_CORO{$coro+0} = $coro;
344 563
345 $coro 564 $coro
346} 565}
347 566
348sub write_runtime { 567=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 568
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 569Executes the given code block with the given arguments in a seperate
352 or return; 570process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling.
353 573
354 my $value = $cf::RUNTIME + 90 + 10; 574=cut
355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357 575
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 576sub fork_call(&@) {
359 and return; 577 my ($cb, @args) = @_;
360 578
361 aio_fsync $fh 579 # we seemingly have to make a local copy of the whole thing,
362 and return; 580 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious)
363 582
364 close $fh 583 my @res = Coro::Util::fork_eval {
365 or return; 584 reset_signals;
585 &$cb
586 }, @args;
366 587
367 aio_rename "$runtime~", $runtime 588 wantarray ? @res : $res[-1]
368 and return; 589}
369 590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
616}
617
618=item $value = cf::db_get $family => $key
619
620Returns a single value from the environment database.
621
622=item cf::db_put $family => $key => $value
623
624Stores the given C<$value> in the family. It can currently store binary
625data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
626
627=item $db = cf::db_table "name"
628
629Create and/or open a new database table. The string must not be "db" and must be unique
630within each server.
631
632=cut
633
634sub db_table($) {
635 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV;
637
638 eval {
639 $db->set_flags (BDB::CHKSUM);
640
641 utf8::encode $name;
642 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
643 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
644 cf::cleanup "db_open(db): $!" if $!;
645 };
646 cf::cleanup "db_open(db): $@" if $@;
647
648 $db
649}
650
651our $DB;
652
653sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db";
656 };
657}
658
659sub db_get($$) {
660 my $key = "$_[0]/$_[1]";
661
662 cf::sync_job {
663 BDB::db_get $DB, undef, $key, my $data;
664
665 $! ? ()
666 : $data
370 1 667 }
668}
669
670sub db_put($$$) {
671 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
673}
674
675=item cf::cache $id => [$paths...], $processversion => $process
676
677Generic caching function that returns the value of the resource $id,
678caching and regenerating as required.
679
680This function can block.
681
682=cut
683
684sub cache {
685 my ($id, $src, $processversion, $process) = @_;
686
687 my $meta =
688 join "\x00",
689 $processversion,
690 map {
691 aio_stat $_
692 and Carp::croak "$_: $!";
693
694 ($_, (stat _)[7,9])
695 } @$src;
696
697 my $dbmeta = db_get cache => "$id/meta";
698 if ($dbmeta ne $meta) {
699 # changed, we may need to process
700
701 my @data;
702 my $md5;
703
704 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_]
706 or Carp::croak "$src->[$_]: $!";
707 }
708
709 # if processing is expensive, check
710 # checksum first
711 if (1) {
712 $md5 =
713 join "\x00",
714 $processversion,
715 map {
716 cf::cede_to_tick;
717 ($src->[$_], Digest::MD5::md5_hex $data[$_])
718 } 0.. $#$src;
719
720
721 my $dbmd5 = db_get cache => "$id/md5";
722 if ($dbmd5 eq $md5) {
723 db_put cache => "$id/meta", $meta;
724
725 return db_get cache => "$id/data";
726 }
727 }
728
729 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time;
732
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
734
735 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta;
738
739 return $data;
740 }
741
742 db_get cache => "$id/data"
743}
744
745=item cf::datalog type => key => value, ...
746
747Log a datalog packet of the given type with the given key-value pairs.
748
749=cut
750
751sub datalog($@) {
752 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 754}
372 755
373=back 756=back
374 757
375=cut 758=cut
376 759
377############################################################################# 760#############################################################################
378 761
379=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
380 763
381Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
382attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
383to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
384 767
385In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
386C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
387crossfire+). 770Deliantra).
388 771
389=over 4 772=over 4
390 773
391=item $attachable->attach ($attachment, key => $value...) 774=item $attachable->attach ($attachment, key => $value...)
392 775
… …
436=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
437 820
438Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
439given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
440 823
441Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
442that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
443 826
444These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
445 828
446=over 4 829=over 4
… …
555 $registry = $CB_TYPE[$object_type] ||= []; 938 $registry = $CB_TYPE[$object_type] ||= [];
556 939
557 } elsif ($type eq "subtype") { 940 } elsif ($type eq "subtype") {
558 defined $object_type or Carp::croak "subtype specified without type"; 941 defined $object_type or Carp::croak "subtype specified without type";
559 my $object_subtype = shift @arg; 942 my $object_subtype = shift @arg;
560 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 943 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561 944
562 } elsif ($type eq "package") { 945 } elsif ($type eq "package") {
563 my $pkg = shift @arg; 946 my $pkg = shift @arg;
564 947
565 while (my ($name, $id) = each %cb_id) { 948 while (my ($name, $id) = each %cb_id) {
… …
594 _attach $registry, $klass, @attach; 977 _attach $registry, $klass, @attach;
595 } 978 }
596 979
597 $obj->{$name} = \%arg; 980 $obj->{$name} = \%arg;
598 } else { 981 } else {
599 warn "object uses attachment '$name' that is not available, postponing.\n"; 982 warn "object uses attachment '$name' which is not available, postponing.\n";
600 } 983 }
601 984
602 $obj->{_attachment}{$name} = undef; 985 $obj->{_attachment}{$name} = undef;
603} 986}
604 987
… …
606 if (ref $_[0]) { 989 if (ref $_[0]) {
607 _object_attach @_; 990 _object_attach @_;
608 } else { 991 } else {
609 _attach shift->_attach_registry, @_; 992 _attach shift->_attach_registry, @_;
610 } 993 }
994 _recalc_want;
611}; 995};
612 996
613# all those should be optimised 997# all those should be optimised
614sub cf::attachable::detach { 998sub cf::attachable::detach {
615 my ($obj, $name) = @_; 999 my ($obj, $name) = @_;
… …
618 delete $obj->{_attachment}{$name}; 1002 delete $obj->{_attachment}{$name};
619 reattach ($obj); 1003 reattach ($obj);
620 } else { 1004 } else {
621 Carp::croak "cannot, currently, detach class attachments"; 1005 Carp::croak "cannot, currently, detach class attachments";
622 } 1006 }
1007 _recalc_want;
623}; 1008};
624 1009
625sub cf::attachable::attached { 1010sub cf::attachable::attached {
626 my ($obj, $name) = @_; 1011 my ($obj, $name) = @_;
627 1012
… …
642 "; 1027 ";
643 die if $@; 1028 die if $@;
644} 1029}
645 1030
646our $override; 1031our $override;
647our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1032our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
648 1033
649sub override { 1034sub override {
650 $override = 1; 1035 $override = 1;
651 @invoke_results = (); 1036 @INVOKE_RESULTS = (@_);
652} 1037}
653 1038
654sub do_invoke { 1039sub do_invoke {
655 my $event = shift; 1040 my $event = shift;
656 my $callbacks = shift; 1041 my $callbacks = shift;
657 1042
658 @invoke_results = (); 1043 @INVOKE_RESULTS = ();
659 1044
660 local $override; 1045 local $override;
661 1046
662 for (@$callbacks) { 1047 for (@$callbacks) {
663 eval { &{$_->[1]} }; 1048 eval { &{$_->[1]} };
… …
672 } 1057 }
673 1058
674 0 1059 0
675} 1060}
676 1061
677=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
678 1063
679=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
680 1065
681Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
682 1067
683This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1068This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
684removed in future versions), and there is no public API to access override 1069removed in future versions), and there is no public API to access override
685results (if you must, access C<@cf::invoke_results> directly). 1070results (if you must, access C<@cf::INVOKE_RESULTS> directly).
686 1071
687=back 1072=back
688 1073
689=cut 1074=cut
690 1075
691############################################################################# 1076#############################################################################
692# object support 1077# object support
1078
1079sub _object_equal($$);
1080sub _object_equal($$) {
1081 my ($a, $b) = @_;
1082
1083 return 0 unless (ref $a) eq (ref $b);
1084
1085 if ("HASH" eq ref $a) {
1086 my @ka = keys %$a;
1087 my @kb = keys %$b;
1088
1089 return 0 if @ka != @kb;
1090
1091 for (0 .. $#ka) {
1092 return 0 unless $ka[$_] eq $kb[$_];
1093 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1094 }
1095
1096 } elsif ("ARRAY" eq ref $a) {
1097
1098 return 0 if @$a != @$b;
1099
1100 for (0 .. $#$a) {
1101 return 0 unless _object_equal $a->[$_], $b->[$_];
1102 }
1103
1104 } elsif ($a ne $b) {
1105 return 0;
1106 }
1107
1108 1
1109}
1110
1111our $SLOW_MERGES;#d#
1112sub _can_merge {
1113 my ($ob1, $ob2) = @_;
1114
1115 ++$SLOW_MERGES;#d#
1116
1117 # we do the slow way here
1118 return _object_equal $ob1, $ob2
1119}
693 1120
694sub reattach { 1121sub reattach {
695 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
696 my ($obj) = @_; 1123 my ($obj) = @_;
697 1124
1125 # no longer needed after getting rid of delete_package?
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
699 1127
700 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
701 1129
702 @$registry = (); 1130 @$registry = ();
703 1131
… …
718cf::attachable->attach ( 1146cf::attachable->attach (
719 prio => -1000000, 1147 prio => -1000000,
720 on_instantiate => sub { 1148 on_instantiate => sub {
721 my ($obj, $data) = @_; 1149 my ($obj, $data) = @_;
722 1150
723 $data = from_json $data; 1151 $data = decode_json $data;
724 1152
725 for (@$data) { 1153 for (@$data) {
726 my ($name, $args) = @$_; 1154 my ($name, $args) = @$_;
727 1155
728 $obj->attach ($name, %{$args || {} }); 1156 $obj->attach ($name, %{$args || {} });
… …
744sub object_freezer_save { 1172sub object_freezer_save {
745 my ($filename, $rdata, $objs) = @_; 1173 my ($filename, $rdata, $objs) = @_;
746 1174
747 sync_job { 1175 sync_job {
748 if (length $$rdata) { 1176 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename);
749 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
750 $filename, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
751 1180
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
755 aio_fsync $fh; 1186 aio_fsync $fh;
1187 }
756 close $fh; 1188 aio_close $fh;
757 1189
758 if (@$objs) { 1190 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1195 if ($cf::USE_FSYNC) {
1196 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
763 aio_fsync $fh; 1197 aio_fsync $fh;
1198 }
764 close $fh; 1199 aio_close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
766 } 1201 }
767 } else { 1202 } else {
768 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
769 } 1204 }
770 1205
771 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
772 } else { 1210 } else {
773 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
774 } 1212 }
775 } else { 1213 } else {
776 aio_unlink $filename; 1214 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
778 } 1216 }
779 } 1217 };
780} 1218}
781 1219
782sub object_freezer_as_string { 1220sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 1221 my ($rdata, $objs) = @_;
784 1222
… …
796 or return; 1234 or return;
797 1235
798 unless (aio_stat "$filename.pst") { 1236 unless (aio_stat "$filename.pst") {
799 (aio_load "$filename.pst", $av) >= 0 1237 (aio_load "$filename.pst", $av) >= 0
800 or return; 1238 or return;
1239
801 $av = eval { (Storable::thaw $av)->{objs} }; 1240 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs};
802 } 1242 }
803 1243
1244 utf8::decode (my $decname = $filename);
804 warn sprintf "loading %s (%d)\n", 1245 warn sprintf "loading %s (%d,%d)\n",
805 $filename, length $data, scalar @{$av || []};#d# 1246 $decname, length $data, scalar @{$av || []};
1247
806 return ($data, $av); 1248 ($data, $av)
807} 1249}
1250
1251=head2 COMMAND CALLBACKS
1252
1253=over 4
1254
1255=cut
808 1256
809############################################################################# 1257#############################################################################
810# command handling &c 1258# command handling &c
811 1259
812=item cf::register_command $name => \&callback($ob,$args); 1260=item cf::register_command $name => \&callback($ob,$args);
… …
825 push @{ $COMMAND{$name} }, [$caller, $cb]; 1273 push @{ $COMMAND{$name} }, [$caller, $cb];
826} 1274}
827 1275
828=item cf::register_extcmd $name => \&callback($pl,$packet); 1276=item cf::register_extcmd $name => \&callback($pl,$packet);
829 1277
830Register a callbackf ro execution when the client sends an extcmd packet. 1278Register a callback for execution when the client sends an (synchronous)
1279extcmd packet. Ext commands will be processed in the order they are
1280received by the server, like other user commands. The first argument is
1281the logged-in player. Ext commands can only be processed after a player
1282has logged in successfully.
831 1283
832If the callback returns something, it is sent back as if reply was being 1284If the callback returns something, it is sent back as if reply was being
833called. 1285called.
834 1286
1287=item cf::register_exticmd $name => \&callback($ns,$packet);
1288
1289Register a callback for execution when the client sends an (asynchronous)
1290exticmd packet. Exti commands are processed by the server as soon as they
1291are received, i.e. out of order w.r.t. other commands. The first argument
1292is a client socket. Exti commands can be received anytime, even before
1293log-in.
1294
1295If the callback returns something, it is sent back as if reply was being
1296called.
1297
835=cut 1298=cut
836 1299
837sub register_extcmd { 1300sub register_extcmd {
838 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
839 1302
840 $EXTCMD{$name} = $cb; 1303 $EXTCMD{$name} = $cb;
841} 1304}
1305
1306sub register_exticmd {
1307 my ($name, $cb) = @_;
1308
1309 $EXTICMD{$name} = $cb;
1310}
1311
1312use File::Glob ();
842 1313
843cf::player->attach ( 1314cf::player->attach (
844 on_command => sub { 1315 on_command => sub {
845 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
846 1317
… …
854 cf::override; 1325 cf::override;
855 }, 1326 },
856 on_extcmd => sub { 1327 on_extcmd => sub {
857 my ($pl, $buf) = @_; 1328 my ($pl, $buf) = @_;
858 1329
859 my $msg = eval { from_json $buf }; 1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
860 1331
861 if (ref $msg) { 1332 if (ref $msg) {
1333 my ($type, $reply, @payload) =
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337
1338 my @reply;
1339
862 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1340 if (my $cb = $EXTCMD{$type}) {
863 if (my %reply = $cb->($pl, $msg)) { 1341 @reply = $cb->($pl, @payload);
864 $pl->ext_reply ($msg->{msgid}, %reply);
865 }
866 } 1342 }
1343
1344 $pl->ext_reply ($reply, @reply)
1345 if $reply;
1346
867 } else { 1347 } else {
868 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
869 } 1349 }
870 1350
871 cf::override; 1351 cf::override;
872 }, 1352 },
873); 1353);
874 1354
1355# "readahead" all extensions
875sub load_extension { 1356sub cache_extensions {
876 my ($path) = @_; 1357 my $grp = IO::AIO::aio_group;
877 1358
878 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
879 my $base = $1; 1360 for (grep /\.ext$/, @{$_[0]}) {
880 my $pkg = $1; 1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
881 $pkg =~ s/[^[:word:]]/_/g;
882 $pkg = "ext::$pkg";
883
884 warn "... loading '$path' into '$pkg'\n";
885
886 open my $fh, "<:utf8", $path
887 or die "$path: $!";
888
889 my $source =
890 "package $pkg; use strict; use utf8;\n"
891 . "#line 1 \"$path\"\n{\n"
892 . (do { local $/; <$fh> })
893 . "\n};\n1";
894
895 unless (eval $source) {
896 my $msg = $@ ? "$path: $@\n"
897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 } 1362 }
903 die $@;
904 } 1363 };
905 1364
906 push @EXTS, $pkg; 1365 $grp
907} 1366}
908 1367
909sub load_extensions { 1368sub load_extensions {
1369 cf::sync_job {
1370 my %todo;
1371
910 for my $ext (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
911 next unless -r $ext; 1373 next unless -r $path;
912 eval { 1374
913 load_extension $ext; 1375 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1376 my $base = $1;
1377 my $pkg = $1;
1378 $pkg =~ s/[^[:word:]]/_/g;
1379 $pkg = "ext::$pkg";
1380
1381 open my $fh, "<:utf8", $path
1382 or die "$path: $!";
1383
1384 my $source = do { local $/; <$fh> };
1385
1386 my %ext = (
1387 path => $path,
1388 base => $base,
1389 pkg => $pkg,
1390 );
1391
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394
1395 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1397 . "#line 1 \"$path\"\n{\n"
1398 . $source
1399 . "\n};\n1";
1400
1401 $todo{$base} = \%ext;
1402 }
1403
1404 my $pass = 0;
1405 my %done;
1406 while (%todo) {
1407 my $progress;
1408
1409 ++$pass;
1410
1411 ext:
1412 while (my ($k, $v) = each %todo) {
1413 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext
1415 unless exists $done{$_};
1416 }
1417
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419
1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1423 warn "$v->{path}: $@\n";
1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory};
1427 } else {
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1434 }
914 1 1435 }
915 } or warn "$ext not loaded: $@"; 1436
1437 unless ($progress) {
1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1445 }
916 } 1446 };
917} 1447}
918 1448
919############################################################################# 1449#############################################################################
920 1450
1451=back
1452
921=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
922 1454
923Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
924 1456
925=cut 1457=cut
926 1458
927package cf::player; 1459package cf::player;
928 1460
… …
930 1462
931=head3 cf::player 1463=head3 cf::player
932 1464
933=over 4 1465=over 4
934 1466
1467=item cf::player::num_playing
1468
1469Returns the official number of playing players, as per the Crossfire metaserver rules.
1470
1471=cut
1472
1473sub num_playing {
1474 scalar grep
1475 $_->ob->map
1476 && !$_->hidden
1477 && !$_->ob->flag (cf::FLAG_WIZ),
1478 cf::player::list
1479}
1480
935=item cf::player::find $login 1481=item cf::player::find $login
936 1482
937Returns the given player object, loading it if necessary (might block). 1483Returns the given player object, loading it if necessary (might block).
938 1484
939=cut 1485=cut
940 1486
941sub playerdir($) { 1487sub playerdir($) {
942 cf::localdir 1488 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1489 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1490}
948 1491
949sub path($) { 1492sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1493 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1494
952 (playerdir $login) . "/$login.pl" 1495 (playerdir $login) . "/playerdata"
953} 1496}
954 1497
955sub find_active($) { 1498sub find_active($) {
956 $cf::PLAYER{$_[0]} 1499 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1500 and $cf::PLAYER{$_[0]}->active
… …
960 1503
961sub exists($) { 1504sub exists($) {
962 my ($login) = @_; 1505 my ($login) = @_;
963 1506
964 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
965 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
966} 1509}
967 1510
968sub find($) { 1511sub find($) {
969 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
970 my $login = $_[0]; 1513 my $login = $_[0];
971 1514
972 my $guard = cf::lock_acquire "user_find:$login"; 1515 my $guard = cf::lock_acquire "user_find:$login";
973 1516
974 $cf::PLAYER{$_[0]} || do { 1517 $cf::PLAYER{$_[0]} || do {
975 my $pl = load_pl path $login 1518 # rename old playerfiles to new ones
1519 #TODO: remove when no longer required
1520 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1521 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1522 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1523 aio_unlink +(playerdir $login) . "/$login.pl";
1524
1525 my $f = new_from_file cf::object::thawer path $login
976 or return; 1526 or return;
1527
1528 my $pl = cf::player::load_pl $f
1529 or return;
1530
1531 local $cf::PLAYER_LOADING{$login} = $pl;
1532 $f->resolve_delayed_derefs;
977 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
978 } 1534 }
979 } 1535 }
980} 1536}
981 1537
… …
990 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
991 1547
992 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
993 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
994 1550
1551 cf::get_slot 0.01;
1552
995 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
996 Coro::cede; 1554 cf::cede_to_tick;
997} 1555}
998 1556
999sub new($) { 1557sub new($) {
1000 my ($login) = @_; 1558 my ($login) = @_;
1001 1559
… …
1007 $cf::PLAYER{$login} = $self; 1565 $cf::PLAYER{$login} = $self;
1008 1566
1009 $self 1567 $self
1010} 1568}
1011 1569
1570=item $player->send_msg ($channel, $msg, $color, [extra...])
1571
1572=cut
1573
1574sub send_msg {
1575 my $ns = shift->ns
1576 or return;
1577 $ns->send_msg (@_);
1578}
1579
1012=item $pl->quit_character 1580=item $pl->quit_character
1013 1581
1014Nukes the player without looking back. If logged in, the connection will 1582Nukes the player without looking back. If logged in, the connection will
1015be destroyed. May block for a long time. 1583be destroyed. May block for a long time.
1016 1584
1017=cut 1585=cut
1018 1586
1019sub quit_character { 1587sub quit_character {
1020 my ($pl) = @_; 1588 my ($pl) = @_;
1021 1589
1590 my $name = $pl->ob->name;
1591
1022 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1024 1594
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1027 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1028 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1029 1601
1030 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1604 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1605 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1606 $pl->destroy;
1607
1608 my $prefix = qr<^~\Q$name\E/>;
1609
1610 # nuke player maps
1611 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1612
1035 IO::AIO::aio_rmtree $temp; 1613 IO::AIO::aio_rmtree $temp;
1614}
1615
1616=item $pl->kick
1617
1618Kicks a player out of the game. This destroys the connection.
1619
1620=cut
1621
1622sub kick {
1623 my ($pl, $kicker) = @_;
1624
1625 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1626 $pl->killer ("kicked");
1627 $pl->ns->destroy;
1036} 1628}
1037 1629
1038=item cf::player::list_logins 1630=item cf::player::list_logins
1039 1631
1040Returns am arrayref of all valid playernames in the system, can take a 1632Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1633while and may block, so not sync_job-capable, ever.
1042 1634
1043=cut 1635=cut
1044 1636
1045sub list_logins { 1637sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1638 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1639 or return [];
1048 1640
1049 my @logins; 1641 my @logins;
1050 1642
1051 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1644 my $path = path $login;
1645
1646 # a .pst is a dead give-away for a valid player
1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1052 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1053 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1054 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1652 }
1055 1653
1056 utf8::decode $login; 1654 utf8::decode $login;
1057 push @logins, $login; 1655 push @logins, $login;
1058 } 1656 }
1059 1657
… …
1067 1665
1068=cut 1666=cut
1069 1667
1070sub maps($) { 1668sub maps($) {
1071 my ($pl) = @_; 1669 my ($pl) = @_;
1670
1671 $pl = ref $pl ? $pl->ob->name : $pl;
1072 1672
1073 my $files = aio_readdir playerdir $pl 1673 my $files = aio_readdir playerdir $pl
1074 or return; 1674 or return;
1075 1675
1076 my @paths; 1676 my @paths;
… …
1078 for (@$files) { 1678 for (@$files) {
1079 utf8::decode $_; 1679 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1680 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1681 next unless /^$PATH_SEP/o;
1082 1682
1083 s/\.map$//; 1683 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1684 }
1086 1685
1087 \@paths 1686 \@paths
1088} 1687}
1089 1688
1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1690
1691Expand deliantra pod fragments into protocol xml.
1692
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1693=item $player->ext_reply ($msgid, @msg)
1091 1694
1092Sends an ext reply to the player. 1695Sends an ext reply to the player.
1093 1696
1094=cut 1697=cut
1095 1698
1096sub ext_reply($$$%) { 1699sub ext_reply($$@) {
1097 my ($self, $id, %msg) = @_; 1700 my ($self, $id, @msg) = @_;
1098 1701
1099 $msg{msgid} = $id; 1702 $self->ns->ext_reply ($id, @msg)
1100
1101 $self->send ("ext " . cf::to_json \%msg);
1102} 1703}
1103 1704
1104package cf; 1705=item $player->ext_msg ($type, @msg)
1706
1707Sends an ext event to the client.
1708
1709=cut
1710
1711sub ext_msg($$@) {
1712 my ($self, $type, @msg) = @_;
1713
1714 $self->ns->ext_msg ($type, @msg);
1715}
1716
1717=head3 cf::region
1718
1719=over 4
1720
1721=cut
1722
1723package cf::region;
1724
1725=item cf::region::find_by_path $path
1726
1727Tries to decuce the likely region for a map knowing only its path.
1728
1729=cut
1730
1731sub find_by_path($) {
1732 my ($path) = @_;
1733
1734 my ($match, $specificity);
1735
1736 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity)
1739 if $region->specificity > $specificity;
1740 }
1741 }
1742
1743 $match
1744}
1105 1745
1106=back 1746=back
1107
1108 1747
1109=head3 cf::map 1748=head3 cf::map
1110 1749
1111=over 4 1750=over 4
1112 1751
… …
1124our $MAX_RESET = 3600; 1763our $MAX_RESET = 3600;
1125our $DEFAULT_RESET = 3000; 1764our $DEFAULT_RESET = 3000;
1126 1765
1127sub generate_random_map { 1766sub generate_random_map {
1128 my ($self, $rmp) = @_; 1767 my ($self, $rmp) = @_;
1768
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770
1129 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1130 $self->_create_random_map ( 1772 $self->_create_random_map (
1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1167 my ($self, $merge) = @_; 1809 my ($self, $merge) = @_;
1168 1810
1169 # we have to keep some variables in memory intact 1811 # we have to keep some variables in memory intact
1170 local $self->{path}; 1812 local $self->{path};
1171 local $self->{load_path}; 1813 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174 1814
1175 $self->SUPER::thawer_merge ($merge); 1815 $self->SUPER::thawer_merge ($merge);
1176} 1816}
1177 1817
1178sub normalise { 1818sub normalise {
1179 my ($path, $base) = @_; 1819 my ($path, $base) = @_;
1820
1821 $path = "$path"; # make sure its a string
1822
1823 $path =~ s/\.map$//;
1180 1824
1181 # map plan: 1825 # map plan:
1182 # 1826 #
1183 # /! non-realised random map exit (special hack!) 1827 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1828 # {... are special paths that are not being touched
… …
1221 $self->init; # pass $1 etc. 1865 $self->init; # pass $1 etc.
1222 return $self; 1866 return $self;
1223 } 1867 }
1224 } 1868 }
1225 1869
1226 Carp::carp "unable to resolve path '$path'."; 1870 Carp::cluck "unable to resolve path '$path' (base '$base').";
1227 () 1871 ()
1228} 1872}
1229 1873
1230sub init { 1874sub init {
1231 my ($self) = @_; 1875 my ($self) = @_;
… …
1246 1890
1247# the original (read-only) location 1891# the original (read-only) location
1248sub load_path { 1892sub load_path {
1249 my ($self) = @_; 1893 my ($self) = @_;
1250 1894
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1895 "$MAPDIR/$self->{path}.map"
1252} 1896}
1253 1897
1254# the temporary/swap location 1898# the temporary/swap location
1255sub save_path { 1899sub save_path {
1256 my ($self) = @_; 1900 my ($self) = @_;
1257 1901
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1903 "$TMPDIR/$path.map"
1260} 1904}
1261 1905
1262# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1263sub uniq_path { 1907sub uniq_path {
1264 my ($self) = @_; 1908 my ($self) = @_;
1265 1909
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1911 "$UNIQUEDIR/$path"
1268} 1912}
1269 1913
1270# and all this just because we cannot iterate over 1914sub decay_objects {
1271# all maps in C++...
1272sub change_all_map_light {
1273 my ($change) = @_; 1915 my ($self) = @_;
1274 1916
1275 $_->change_map_light ($change) 1917 return if $self->{deny_reset};
1276 for grep $_->outdoor, values %cf::MAP; 1918
1919 $self->do_decay_objects;
1277} 1920}
1278 1921
1279sub unlink_save { 1922sub unlink_save {
1280 my ($self) = @_; 1923 my ($self) = @_;
1281 1924
… …
1286 1929
1287sub load_header_from($) { 1930sub load_header_from($) {
1288 my ($self, $path) = @_; 1931 my ($self, $path) = @_;
1289 1932
1290 utf8::encode $path; 1933 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1934 my $f = new_from_file cf::object::thawer $path
1292 or return; 1935 or return;
1293 1936
1294 $self->_load_header ($path) 1937 $self->_load_header ($f)
1295 or return; 1938 or return;
1939
1940 local $MAP_LOADING{$self->{path}} = $self;
1941 $f->resolve_delayed_derefs;
1296 1942
1297 $self->{load_path} = $path; 1943 $self->{load_path} = $path;
1298 1944
1299 1 1945 1
1300} 1946}
… …
1339 $self->load_header_orig 1985 $self->load_header_orig
1340 or return; 1986 or return;
1341 $self->prepare_orig; 1987 $self->prepare_orig;
1342 } 1988 }
1343 1989
1990 $self->{deny_reset} = 1
1991 if $self->no_reset;
1992
1993 $self->default_region (cf::region::find_by_path $self->{path})
1994 unless $self->default_region;
1995
1344 1 1996 1
1345} 1997}
1346 1998
1347sub find; 1999sub find;
1348sub find { 2000sub find {
1349 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1350 2002
1351 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1352 2004
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1353 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1354 2007
1355 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
1356 my $guard = cf::lock_acquire "map_find:$path";
1357 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
1358 or return; 2010 or return;
1359 2011
1360 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1361 2013
1362 $map->load_header 2014 $map->load_header
1363 or return; 2015 or return;
1364 2016
1365 if ($map->should_reset) { 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2021 undef $guard1;
1368 $map->reset; 2022 $map->reset;
1369 undef $guard;
1370 $map = find $path 2023 return find $path;
1371 or return;
1372 } 2024 }
1373 2025
1374 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1375 } 2027 }
1376} 2028}
1377 2029
1378sub pre_load { } 2030sub pre_load { }
1379sub post_load { } 2031#sub post_load { } # XS
1380 2032
1381sub load { 2033sub load {
1382 my ($self) = @_; 2034 my ($self) = @_;
1383 2035
2036 local $self->{deny_reset} = 1; # loading can take a long time
2037
1384 my $path = $self->{path}; 2038 my $path = $self->{path};
2039
2040 {
1385 my $guard = cf::lock_acquire "map_load:$path"; 2041 my $guard = cf::lock_acquire "map_data:$path";
1386 2042
2043 return unless $self->valid;
1387 return if $self->in_memory != cf::MAP_SWAPPED; 2044 return unless $self->in_memory == cf::MAP_SWAPPED;
1388 2045
1389 $self->in_memory (cf::MAP_LOADING); 2046 $self->in_memory (cf::MAP_LOADING);
1390 2047
1391 $self->alloc; 2048 $self->alloc;
1392 2049
1393 $self->pre_load; 2050 $self->pre_load;
2051 cf::cede_to_tick;
1394 2052
1395 $self->_load_objects ($self->{load_path}, 1) 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block;
2055 $self->_load_objects ($f)
1396 or return; 2056 or return;
1397 2057
1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
1399 if delete $self->{load_original}; 2059 if delete $self->{load_original};
1400 2060
1401 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
1402 utf8::encode $uniq; 2062 utf8::encode $uniq;
1403 if (aio_open $uniq, O_RDONLY, 0) { 2063 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) {
1404 $self->clear_unique_items; 2065 $self->clear_unique_items;
1405 $self->_load_objects ($uniq, 0); 2066 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs;
2068 }
1406 } 2069 }
1407 } 2070 }
1408 2071
1409 Coro::cede; 2072 $f->resolve_delayed_derefs;
1410 2073
2074 cf::cede_to_tick;
1411 # now do the right thing for maps 2075 # now do the right thing for maps
1412 $self->link_multipart_objects; 2076 $self->link_multipart_objects;
1413
1414 unless ($self->{deny_activate}) {
1415 $self->decay_objects;
1416 $self->fix_auto_apply;
1417 $self->update_buttons;
1418 Coro::cede;
1419 $self->set_darkness_map;
1420 $self->difficulty ($self->estimate_difficulty) 2077 $self->difficulty ($self->estimate_difficulty)
1421 unless $self->difficulty; 2078 unless $self->difficulty;
1422 Coro::cede; 2079 cf::cede_to_tick;
2080
2081 unless ($self->{deny_activate}) {
2082 $self->decay_objects;
2083 $self->fix_auto_apply;
2084 $self->update_buttons;
2085 cf::cede_to_tick;
1423 $self->activate; 2086 $self->activate;
2087 }
2088
2089 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME);
2091
2092 $self->in_memory (cf::MAP_ACTIVE);
1424 } 2093 }
1425 2094
1426 $self->post_load; 2095 $self->post_load;
1427
1428 $self->in_memory (cf::MAP_IN_MEMORY);
1429} 2096}
1430 2097
1431sub customise_for { 2098sub customise_for {
1432 my ($self, $ob) = @_; 2099 my ($self, $ob) = @_;
1433 2100
1434 return find "~" . $ob->name . "/" . $self->{path} 2101 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player; 2102 if $self->per_player;
1436 2103
2104# return find "?party/" . $ob->name . "/" . $self->{path}
2105# if $self->per_party;
2106
1437 $self 2107 $self
1438} 2108}
1439 2109
1440# find and load all maps in the 3x3 area around a map 2110# find and load all maps in the 3x3 area around a map
1441sub load_diag { 2111sub load_neighbours {
1442 my ($map) = @_; 2112 my ($map) = @_;
1443 2113
1444 my @diag; # diagonal neighbours 2114 my @neigh; # diagonal neighbours
1445 2115
1446 for (0 .. 3) { 2116 for (0 .. 3) {
1447 my $neigh = $map->tile_path ($_) 2117 my $neigh = $map->tile_path ($_)
1448 or next; 2118 or next;
1449 $neigh = find $neigh, $map 2119 $neigh = find $neigh, $map
1450 or next; 2120 or next;
1451 $neigh->load; 2121 $neigh->load;
1452 2122
2123 push @neigh,
1453 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2124 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1454 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2125 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1455 } 2126 }
1456 2127
1457 for (@diag) { 2128 for (grep defined $_->[0], @neigh) {
2129 my ($path, $origin) = @$_;
1458 my $neigh = find @$_ 2130 my $neigh = find $path, $origin
1459 or next; 2131 or next;
1460 $neigh->load; 2132 $neigh->load;
1461 } 2133 }
1462} 2134}
1463 2135
… …
1468} 2140}
1469 2141
1470sub do_load_sync { 2142sub do_load_sync {
1471 my ($map) = @_; 2143 my ($map) = @_;
1472 2144
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main;
2147
1473 cf::sync_job { $map->load }; 2148 cf::sync_job { $map->load };
1474} 2149}
1475 2150
1476our %MAP_PREFETCH; 2151our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = undef; 2152our $MAP_PREFETCHER = undef;
1478 2153
1479sub find_async { 2154sub find_async {
1480 my ($path, $origin) = @_; 2155 my ($path, $origin, $load) = @_;
1481 2156
1482 $path = normalise $path, $origin && $origin->{path}; 2157 $path = normalise $path, $origin && $origin->{path};
1483 2158
1484 if (my $map = $cf::MAP{$path}) { 2159 if (my $map = $cf::MAP{$path}) {
1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2160 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1486 } 2161 }
1487 2162
1488 undef $MAP_PREFETCH{$path}; 2163 $MAP_PREFETCH{$path} |= $load;
2164
1489 $MAP_PREFETCHER ||= cf::async { 2165 $MAP_PREFETCHER ||= cf::async {
2166 $Coro::current->{desc} = "map prefetcher";
2167
1490 while (%MAP_PREFETCH) { 2168 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) { 2169 while (my ($k, $v) = each %MAP_PREFETCH) {
1492 my $map = find $path 2170 if (my $map = find $k) {
1493 or next;
1494 $map->load; 2171 $map->load if $v;
2172 }
1495 2173
1496 delete $MAP_PREFETCH{$path}; 2174 delete $MAP_PREFETCH{$k};
1497 } 2175 }
1498 } 2176 }
1499 undef $MAP_PREFETCHER; 2177 undef $MAP_PREFETCHER;
1500 }; 2178 };
1501 $MAP_PREFETCHER->prio (6); 2179 $MAP_PREFETCHER->prio (6);
… …
1504} 2182}
1505 2183
1506sub save { 2184sub save {
1507 my ($self) = @_; 2185 my ($self) = @_;
1508 2186
1509 my $lock = cf::lock_acquire "map_data:" . $self->path; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
1510 2188
1511 $self->{last_save} = $cf::RUNTIME; 2189 $self->{last_save} = $cf::RUNTIME;
1512 2190
1513 return unless $self->dirty; 2191 return unless $self->dirty;
1514 2192
… …
1520 return if $self->{deny_save}; 2198 return if $self->{deny_save};
1521 2199
1522 local $self->{last_access} = $self->last_access;#d# 2200 local $self->{last_access} = $self->last_access;#d#
1523 2201
1524 cf::async { 2202 cf::async {
2203 $Coro::current->{desc} = "map player save";
1525 $_->contr->save for $self->players; 2204 $_->contr->save for $self->players;
1526 }; 2205 };
2206
2207 cf::get_slot 0.02;
1527 2208
1528 if ($uniq) { 2209 if ($uniq) {
1529 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2210 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1530 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2211 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1531 } else { 2212 } else {
… …
1537 my ($self) = @_; 2218 my ($self) = @_;
1538 2219
1539 # save first because save cedes 2220 # save first because save cedes
1540 $self->save; 2221 $self->save;
1541 2222
1542 my $lock = cf::lock_acquire "map_data:" . $self->path; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
1543 2224
1544 return if $self->players; 2225 return if $self->players;
1545 return if $self->in_memory != cf::MAP_IN_MEMORY; 2226 return if $self->in_memory != cf::MAP_ACTIVE;
1546 return if $self->{deny_save}; 2227 return if $self->{deny_save};
1547 2228
2229 $self->in_memory (cf::MAP_SWAPPED);
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
1548 $self->clear; 2233 $self->clear;
1549 $self->in_memory (cf::MAP_SWAPPED);
1550} 2234}
1551 2235
1552sub reset_at { 2236sub reset_at {
1553 my ($self) = @_; 2237 my ($self) = @_;
1554 2238
1555 # TODO: safety, remove and allow resettable per-player maps 2239 # TODO: safety, remove and allow resettable per-player maps
1556 return 1e99 if $self->isa ("ext::map_per_player");#d#
1557 return 1e99 if $self->{deny_reset}; 2240 return 1e99 if $self->{deny_reset};
1558 2241
1559 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1560 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1561 2244
… …
1572 my ($self) = @_; 2255 my ($self) = @_;
1573 2256
1574 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1575 2258
1576 return if $self->players; 2259 return if $self->players;
1577 return if $self->isa ("ext::map_per_player");#d#
1578 2260
1579 warn "resetting map ", $self->path;#d# 2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
1580 2272
1581 delete $cf::MAP{$self->path}; 2273 delete $cf::MAP{$self->path};
1582 2274
1583 $self->in_memory (cf::MAP_SWAPPED); 2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
1584 $self->clear; 2277 $self->clear;
1585
1586 $_->clear_links_to ($self) for values %cf::MAP;
1587 2278
1588 $self->unlink_save; 2279 $self->unlink_save;
1589 $self->destroy; 2280 $self->destroy;
1590} 2281}
1591 2282
1592my $nuke_counter = "aaaa"; 2283my $nuke_counter = "aaaa";
1593 2284
1594sub nuke { 2285sub nuke {
1595 my ($self) = @_; 2286 my ($self) = @_;
1596 2287
2288 {
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
1597 delete $cf::MAP{$self->path}; 2291 delete $cf::MAP{$self->path};
1598 2292
1599 $self->unlink_save; 2293 $self->unlink_save;
1600 2294
1601 bless $self, "cf::map"; 2295 bless $self, "cf::map";
1602 delete $self->{deny_reset}; 2296 delete $self->{deny_reset};
1603 $self->{deny_save} = 1; 2297 $self->{deny_save} = 1;
1604 $self->reset_timeout (1); 2298 $self->reset_timeout (1);
1605 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1606 2300
1607 $cf::MAP{$self->path} = $self; 2301 $cf::MAP{$self->path} = $self;
2302 }
1608 2303
1609 $self->reset; # polite request, might not happen 2304 $self->reset; # polite request, might not happen
2305}
2306
2307=item $maps = cf::map::tmp_maps
2308
2309Returns an arrayref with all map paths of currently instantiated and saved
2310maps. May block.
2311
2312=cut
2313
2314sub tmp_maps() {
2315 [
2316 map {
2317 utf8::decode $_;
2318 /\.map$/
2319 ? normalise $_
2320 : ()
2321 } @{ aio_readdir $TMPDIR or [] }
2322 ]
2323}
2324
2325=item $maps = cf::map::random_maps
2326
2327Returns an arrayref with all map paths of currently instantiated and saved
2328random maps. May block.
2329
2330=cut
2331
2332sub random_maps() {
2333 [
2334 map {
2335 utf8::decode $_;
2336 /\.map$/
2337 ? normalise "?random/$_"
2338 : ()
2339 } @{ aio_readdir $RANDOMDIR or [] }
2340 ]
1610} 2341}
1611 2342
1612=item cf::map::unique_maps 2343=item cf::map::unique_maps
1613 2344
1614Returns an arrayref of paths of all shared maps that have 2345Returns an arrayref of paths of all shared maps that have
1615instantiated unique items. May block. 2346instantiated unique items. May block.
1616 2347
1617=cut 2348=cut
1618 2349
1619sub unique_maps() { 2350sub unique_maps() {
1620 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2351 [
1621 or return; 2352 map {
1622
1623 my @paths;
1624
1625 for (@$files) {
1626 utf8::decode $_; 2353 utf8::decode $_;
1627 next if /\.pst$/; 2354 s/\.map$//; # TODO future compatibility hack
1628 next unless /^$PATH_SEP/o; 2355 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2356 ? ()
2357 : normalise $_
2358 } @{ aio_readdir $UNIQUEDIR or [] }
2359 ]
2360}
1629 2361
2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
1630 s/\.map$//; 2383 s/\.map$// or next;
1631 push @paths, $_; 2384 utf8::decode $_;
1632 } 2385 push @maps, "$dir/$_";
2386 }
1633 2387
1634 \@paths 2388 push @dirs, map "$dir/$_", @$dirs;
1635} 2389 }
1636 2390
1637package cf; 2391 \@maps
2392}
1638 2393
1639=back 2394=back
1640 2395
1641=head3 cf::object 2396=head3 cf::object
1642 2397
… …
1646 2401
1647=over 4 2402=over 4
1648 2403
1649=item $ob->inv_recursive 2404=item $ob->inv_recursive
1650 2405
1651Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
1652 2408
1653=cut 2409=cut
1654 2410
1655sub inv_recursive_; 2411sub inv_recursive_;
1656sub inv_recursive_ { 2412sub inv_recursive_ {
… …
1659 2415
1660sub inv_recursive { 2416sub inv_recursive {
1661 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
1662} 2418}
1663 2419
2420=item $ref = $ob->ref
2421
2422Creates and returns a persistent reference to an object that can be stored as a string.
2423
2424=item $ob = cf::object::deref ($refstring)
2425
2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2427even if the object actually exists. May block.
2428
2429=cut
2430
2431sub deref {
2432 my ($ref) = @_;
2433
2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2435 my ($uuid, $name) = ($1, $2);
2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2437 or return;
2438 $pl->ob->uuid eq $uuid
2439 or return;
2440
2441 $pl->ob
2442 } else {
2443 warn "$ref: cannot resolve object reference\n";
2444 undef
2445 }
2446}
2447
1664package cf; 2448package cf;
1665 2449
1666=back 2450=back
1667 2451
1668=head3 cf::object::player 2452=head3 cf::object::player
… …
1674Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1675can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
1676dialogue with the given NPC character. 2460dialogue with the given NPC character.
1677 2461
1678=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
1679 2477
1680# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
1681# with dialog boxes. 2479# with dialog boxes.
1682#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
1683sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
… …
1685 2483
1686 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2484 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1687 2485
1688 if ($self->{record_replies}) { 2486 if ($self->{record_replies}) {
1689 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2487 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2488
1690 } else { 2489 } else {
2490 my $pl = $self->contr;
2491
2492 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2493 my $dialog = $pl->{npc_dialog};
2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2495
2496 } else {
1691 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
1692 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2499 }
1693 } 2500 }
2501}
2502
2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2504
2505=cut
2506
2507sub cf::object::send_msg {
2508 my $pl = shift->contr
2509 or return;
2510 $pl->send_msg (@_);
1694} 2511}
1695 2512
1696=item $player_object->may ("access") 2513=item $player_object->may ("access")
1697 2514
1698Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
… …
1711 2528
1712=item $player_object->enter_link 2529=item $player_object->enter_link
1713 2530
1714Freezes the player and moves him/her to a special map (C<{link}>). 2531Freezes the player and moves him/her to a special map (C<{link}>).
1715 2532
1716The player should be reasonably safe there for short amounts of time. You 2533The player should be reasonably safe there for short amounts of time (e.g.
1717I<MUST> call C<leave_link> as soon as possible, though. 2534for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link
2536map.
1718 2537
1719Will never block. 2538Will never block.
1720 2539
1721=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
1722 2541
… …
1730=cut 2549=cut
1731 2550
1732sub link_map { 2551sub link_map {
1733 unless ($LINK_MAP) { 2552 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}" 2553 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2554 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1736 $LINK_MAP->load; 2555 $LINK_MAP->load;
1737 } 2556 }
1738 2557
1739 $LINK_MAP 2558 $LINK_MAP
1740} 2559}
… …
1745 $self->deactivate_recursive; 2564 $self->deactivate_recursive;
1746 2565
1747 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2566 return if UNIVERSAL::isa $self->map, "ext::map_link";
1748 2567
1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1750 if $self->map; 2569 if $self->map && $self->map->{path} ne "{link}";
1751 2570
1752 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2571 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1753} 2572}
1754 2573
1755sub cf::object::player::leave_link { 2574sub cf::object::player::leave_link {
1756 my ($self, $map, $x, $y) = @_; 2575 my ($self, $map, $x, $y) = @_;
2576
2577 return unless $self->contr->active;
1757 2578
1758 my $link_pos = delete $self->{_link_pos}; 2579 my $link_pos = delete $self->{_link_pos};
1759 2580
1760 unless ($map) { 2581 unless ($map) {
1761 # restore original map position 2582 # restore original map position
… …
1772 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
1773 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
1774 2595
1775 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
1776 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
1777 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
1778 2599
1779 $map->load; 2600 $map->load;
1780 $map->load_diag; 2601 $map->load_neighbours;
1781 2602
1782 return unless $self->contr->active; 2603 return unless $self->contr->active;
2604
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y);
2607
2608 # only activate afterwards, to support waiting in hooks
1783 $self->activate_recursive; 2609 $self->activate_recursive;
1784 $self->enter_map ($map, $x, $y);
1785} 2610}
1786 2611
1787cf::player->attach ( 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1788 on_logout => sub {
1789 my ($pl) = @_;
1790 2613
1791 # abort map switching before logout 2614Moves the player to the given map-path and coordinates by first freezing
1792 if ($pl->ob->{_link_pos}) { 2615her, loading and preparing them map, calling the provided $check callback
1793 cf::sync_job { 2616that has to return the map if sucecssful, and then unfreezes the player on
1794 $pl->ob->leave_link 2617the new (success) or old (failed) map position. In either case, $done will
1795 }; 2618be called at the end of this process.
1796 }
1797 },
1798 on_login => sub {
1799 my ($pl) = @_;
1800 2619
1801 # try to abort aborted map switching on player login :) 2620Note that $check will be called with a potentially non-loaded map, so if
1802 # should happen only on crashes 2621it needs a loaded map it has to call C<< ->load >>.
1803 if ($pl->ob->{_link_pos}) {
1804 $pl->ob->enter_link;
1805 (async {
1806 # we need this sleep as the login has a concurrent enter_exit running
1807 # and this sleep increases chances of the player not ending up in scorn
1808 $pl->ob->reply (undef,
1809 "There was an internal problem at your last logout, "
1810 . "the server will try to bring you to your intended destination in a second.",
1811 cf::NDI_RED);
1812 Coro::Timer::sleep 1;
1813 $pl->ob->leave_link;
1814 })->prio (2);
1815 }
1816 },
1817);
1818 2622
1819=item $player_object->goto ($path, $x, $y)
1820
1821=cut 2623=cut
2624
2625our $GOTOGEN;
1822 2626
1823sub cf::object::player::goto { 2627sub cf::object::player::goto {
1824 my ($self, $path, $x, $y) = @_; 2628 my ($self, $path, $x, $y, $check, $done) = @_;
2629
2630 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1825 2632
1826 $self->enter_link; 2633 $self->enter_link;
1827 2634
1828 (async { 2635 (async {
1829 my $map = cf::map::find $path; 2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
2657 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef;
2659
2660 if ($map) {
1830 $map = $map->customise_for ($self) if $map; 2661 $map = $map->customise_for ($self);
1831 2662 $map = $check->($map) if $check && $map;
1832# warn "entering ", $map->path, " at ($x, $y)\n" 2663 } else {
1833# if $map;
1834
1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 }
1836 2666
2667 $map
2668 };
2669
2670 if ($@) {
2671 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2672 LOG llevError | logBacktrace, Carp::longmess $@;
2673 }
2674
2675 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation};
1837 $self->leave_link ($map, $x, $y); 2677 $self->leave_link ($map, $x, $y);
2678 }
2679
2680 $done->() if $done;
1838 })->prio (1); 2681 })->prio (1);
1839} 2682}
1840 2683
1841=item $player_object->enter_exit ($exit_object) 2684=item $player_object->enter_exit ($exit_object)
1842 2685
… …
1862} 2705}
1863 2706
1864sub prepare_random_map { 2707sub prepare_random_map {
1865 my ($exit) = @_; 2708 my ($exit) = @_;
1866 2709
1867 my $guard = cf::lock_acquire "exit_prepare:$exit";
1868
1869 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
1870 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
1871 # that depends on the exit object 2712 # that depends on the exit object
1872 2713
1873 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
1874 2715
1875 if ($exit->map) { 2716 if ($exit->map) {
1876 $rmp->{region} = $exit->map->region_name; 2717 $rmp->{region} = $exit->region->name;
1877 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
1878 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
1879 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
1880 } 2723 }
1881 2724
1882 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
1883 2726
1884 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
1885 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
1887 2730
1888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1889 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
1890 undef $fh; 2733 undef $fh;
1891 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
1892 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
1893 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
1894 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
1895 } 2742 }
1896} 2743}
1897 2744
1898sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
1899 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
… …
1901 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
1902 2749
1903 $self->enter_link; 2750 $self->enter_link;
1904 2751
1905 (async { 2752 (async {
1906 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
1907 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
1908 prepare_random_map $exit 2762 prepare_random_map $exit
1909 if $exit->slaying eq "/!"; 2763 if $exit->slaying eq "/!";
2764 }
1910 2765
1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path; 2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
1913 2769
2770 $self->goto ($map, $x, $y);
2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
1914 1; 2776 1
1915 }) { 2777 }) {
1916 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
1917 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
1918 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
1919 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
1920 2782
1921 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
1922 $self->leave_link; 2784 $self->leave_link;
1923 } 2785 }
1924 })->prio (1); 2786 })->prio (1);
… …
1937 2799
1938sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
1939 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
1940 2802
1941 utf8::encode $text; 2803 utf8::encode $text;
1942 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1943} 2805}
1944 2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2830}
2831
2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2833
2834Send a drawinfo or msg packet to the client, formatting the msg for the
2835client if neccessary. C<$type> should be a string identifying the type of
2836the message, with C<log> being the default. If C<$color> is negative, suppress
2837the message unless the client supports the msg packet.
2838
2839=cut
2840
2841# non-persistent channels (usually the info channel)
2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2849 "c/identify" => {
2850 id => "infobox",
2851 title => "Identify",
2852 reply => undef,
2853 tooltip => "Items recently identified",
2854 },
2855 "c/examine" => {
2856 id => "infobox",
2857 title => "Examine",
2858 reply => undef,
2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2866 },
2867 "c/book" => {
2868 id => "infobox",
2869 title => "Book",
2870 reply => undef,
2871 tooltip => "The contents of a note or book",
2872 },
2873 "c/lookat" => {
2874 id => "infobox",
2875 title => "Look",
2876 reply => undef,
2877 tooltip => "What you saw there",
2878 },
2879 "c/who" => {
2880 id => "infobox",
2881 title => "Players",
2882 reply => undef,
2883 tooltip => "Shows players who are currently online",
2884 },
2885 "c/body" => {
2886 id => "infobox",
2887 title => "Body Parts",
2888 reply => undef,
2889 tooltip => "Shows which body parts you posess and are available",
2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2897 "c/skills" => {
2898 id => "infobox",
2899 title => "Skills",
2900 reply => undef,
2901 tooltip => "Shows your experience per skill and item power",
2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2926 },
2927 "c/uptime" => {
2928 id => "infobox",
2929 title => "Uptime",
2930 reply => undef,
2931 tooltip => "How long the server has been running since last restart",
2932 },
2933 "c/mapinfo" => {
2934 id => "infobox",
2935 title => "Map Info",
2936 reply => undef,
2937 tooltip => "Information related to the maps",
2938 },
2939 "c/party" => {
2940 id => "party",
2941 title => "Party",
2942 reply => "gsay ",
2943 tooltip => "Messages and chat related to your party",
2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2953);
2954
2955sub cf::client::send_msg {
2956 my ($self, $channel, $msg, $color, @extra) = @_;
2957
2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2960
2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2962
2963 # check predefined channels, for the benefit of C
2964 if ($CHANNEL{$channel}) {
2965 $channel = $CHANNEL{$channel};
2966
2967 $self->ext_msg (channel_info => $channel);
2968 $channel = $channel->{id};
2969
2970 } elsif (ref $channel) {
2971 # send meta info to client, if not yet sent
2972 unless (exists $self->{channel}{$channel->{id}}) {
2973 $self->{channel}{$channel->{id}} = $channel;
2974 $self->ext_msg (channel_info => $channel);
2975 }
2976
2977 $channel = $channel->{id};
2978 }
2979
2980 return unless @extra || length $msg;
2981
2982 # default colour, mask it out
2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2984 if $color & cf::NDI_DEF;
2985
2986 my $pkt = "msg "
2987 . $self->{json_coder}->encode (
2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2989 );
2990
2991 $self->send_big_packet ($pkt);
2992}
2993
2994=item $client->ext_msg ($type, @msg)
2995
2996Sends an ext event to the client.
2997
2998=cut
2999
3000sub cf::client::ext_msg($$@) {
3001 my ($self, $type, @msg) = @_;
3002
3003 if ($self->extcmd == 2) {
3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3005 } elsif ($self->extcmd == 1) { # TODO: remove
3006 push @msg, msgtype => "event_$type";
3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3008 }
3009}
3010
3011=item $client->ext_reply ($msgid, @msg)
3012
3013Sends an ext reply to the client.
3014
3015=cut
3016
3017sub cf::client::ext_reply($$@) {
3018 my ($self, $id, @msg) = @_;
3019
3020 if ($self->extcmd == 2) {
3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3022 } elsif ($self->extcmd == 1) {
3023 #TODO: version 1, remove
3024 unshift @msg, msgtype => "reply", msgid => $id;
3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026 }
3027}
1945 3028
1946=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
1947 3030
1948Queues a query to the client, calling the given callback with 3031Queues a query to the client, calling the given callback with
1949the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3032the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1950C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3033C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1951 3034
1952Queries can fail, so check the return code. Or don't, as queries will become 3035Queries can fail, so check the return code. Or don't, as queries will
1953reliable at some point in the future. 3036become reliable at some point in the future.
1954 3037
1955=cut 3038=cut
1956 3039
1957sub cf::client::query { 3040sub cf::client::query {
1958 my ($self, $flags, $text, $cb) = @_; 3041 my ($self, $flags, $text, $cb) = @_;
… …
1966 utf8::encode $text; 3049 utf8::encode $text;
1967 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3050 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1968 3051
1969 $self->send_packet ($self->{query_queue}[0][0]) 3052 $self->send_packet ($self->{query_queue}[0][0])
1970 if @{ $self->{query_queue} } == 1; 3053 if @{ $self->{query_queue} } == 1;
3054
3055 1
1971} 3056}
1972 3057
1973cf::client->attach ( 3058cf::client->attach (
3059 on_connect => sub {
3060 my ($ns) = @_;
3061
3062 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3063 },
1974 on_reply => sub { 3064 on_reply => sub {
1975 my ($ns, $msg) = @_; 3065 my ($ns, $msg) = @_;
1976 3066
1977 # this weird shuffling is so that direct followup queries 3067 # this weird shuffling is so that direct followup queries
1978 # get handled first 3068 # get handled first
1979 my $queue = delete $ns->{query_queue} 3069 my $queue = delete $ns->{query_queue}
1980 or return; # be conservative, not sure how that can happen, but we saw a crash here 3070 or return; # be conservative, not sure how that can happen, but we saw a crash here
1981 3071
1982 (shift @$queue)->[1]->($msg); 3072 (shift @$queue)->[1]->($msg);
3073 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1983 3074
1984 push @{ $ns->{query_queue} }, @$queue; 3075 push @{ $ns->{query_queue} }, @$queue;
1985 3076
1986 if (@{ $ns->{query_queue} } == @$queue) { 3077 if (@{ $ns->{query_queue} } == @$queue) {
1987 if (@$queue) { 3078 if (@$queue) {
… …
1989 } else { 3080 } else {
1990 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3081 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1991 } 3082 }
1992 } 3083 }
1993 }, 3084 },
3085 on_exticmd => sub {
3086 my ($ns, $buf) = @_;
3087
3088 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3089
3090 if (ref $msg) {
3091 my ($type, $reply, @payload) =
3092 "ARRAY" eq ref $msg
3093 ? @$msg
3094 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095
3096 my @reply;
3097
3098 if (my $cb = $EXTICMD{$type}) {
3099 @reply = $cb->($ns, @payload);
3100 }
3101
3102 $ns->ext_reply ($reply, @reply)
3103 if $reply;
3104
3105 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 }
3108
3109 cf::override;
3110 },
1994); 3111);
1995 3112
1996=item $client->async (\&cb) 3113=item $client->async (\&cb)
1997 3114
1998Create a new coroutine, running the specified callback. The coroutine will 3115Create a new coroutine, running the specified callback. The coroutine will
… …
2039our $safe = new Safe "safe"; 3156our $safe = new Safe "safe";
2040our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
2041 3158
2042$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
2043 3160
2044$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3161$safe->permit_only (Opcode::opset qw(
3162 :base_core :base_mem :base_orig :base_math :base_loop
3163 grepstart grepwhile mapstart mapwhile
3164 sort time
3165));
2045 3166
2046# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
2047 3168
2048=pod 3169=pod
2049 3170
2050The following fucntions and emthods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
2051 3172
2052 cf::object contr pay_amount pay_player map 3173 cf::object
3174 contr pay_amount pay_player map x y force_find force_add destroy
3175 insert remove name archname title slaying race decrease split
3176 value
3177
2053 cf::object::player player 3178 cf::object::player
2054 cf::player peaceful 3179 player
2055 cf::map trigger 3180
3181 cf::player
3182 peaceful
3183
3184 cf::map
3185 trigger
2056 3186
2057=cut 3187=cut
2058 3188
2059for ( 3189for (
2060 ["cf::object" => qw(contr pay_amount pay_player map)], 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3191 insert remove inv nrof name archname title slaying race
3192 decrease split destroy change_exp value msg lore send_msg)],
2061 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
2062 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
2063 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
2064) { 3196) {
2065 no strict 'refs'; 3197 no strict 'refs';
2066 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
2067 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2085 3217
2086 my $qcode = $code; 3218 my $qcode = $code;
2087 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2088 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
2089 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
2090 local $_; 3225 local $_;
2091 local @safe::cf::_safe_eval_args = values %vars;
2092 3226
2093 my $eval = 3227 my $eval =
2094 "do {\n" 3228 "do {\n"
2095 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2096 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
2097 . $code 3231 . $code
2098 . "\n}" 3232 . "\n}"
2099 ; 3233 ;
2100 3234
3235 if ($CFG{safe_eval}) {
2101 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
2102 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2103 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
2104 3244
2105 if ($@) { 3245 if ($@) {
2106 warn "$@"; 3246 warn "$@";
2107 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
2108 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
2127=cut 3267=cut
2128 3268
2129sub register_script_function { 3269sub register_script_function {
2130 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
2131 3271
2132 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
2133 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
2134} 3274}
2135 3275
2136=back 3276=back
2137 3277
2138=cut 3278=cut
2139 3279
2140############################################################################# 3280#############################################################################
3281# the server's init and main functions
2141 3282
2142=head2 EXTENSION DATABASE SUPPORT 3283sub load_facedata($) {
3284 my ($path) = @_;
2143 3285
2144Crossfire maintains a very simple database for extension use. It can 3286 # HACK to clear player env face cache, we need some signal framework
2145currently store anything that can be serialised using Storable, which 3287 # for this (global event?)
2146excludes objects. 3288 %ext::player_env::MUSIC_FACE_CACHE = ();
2147 3289
2148The parameter C<$family> should best start with the name of the extension 3290 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2149using it, it should be unique.
2150 3291
2151=over 4 3292 warn "loading facedata from $path\n";
2152 3293
2153=item $hashref = cf::db_get $family 3294 my $facedata;
3295 0 < aio_load $path, $facedata
3296 or die "$path: $!";
2154 3297
2155Return a hashref for use by the extension C<$family>, which can be 3298 $facedata = Coro::Storable::thaw $facedata;
2156modified. After modifications, you have to call C<cf::db_dirty> or
2157C<cf::db_sync>.
2158 3299
2159=item $value = cf::db_get $family => $key 3300 $facedata->{version} == 2
3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
2160 3302
2161Returns a single value from the database 3303 # patch in the exptable
2162 3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2163=item cf::db_put $family => $hashref 3305 $facedata->{resource}{"res/exp_table"} = {
2164 3306 type => FT_RSRC,
2165Stores the given family hashref into the database. Updates are delayed, if 3307 data => $exp_table,
2166you want the data to be synced to disk immediately, use C<cf::db_sync>. 3308 hash => (Digest::MD5::md5 $exp_table),
2167
2168=item cf::db_put $family => $key => $value
2169
2170Stores the given C<$value> in the family hash. Updates are delayed, if you
2171want the data to be synced to disk immediately, use C<cf::db_sync>.
2172
2173=item cf::db_dirty
2174
2175Marks the database as dirty, to be updated at a later time.
2176
2177=item cf::db_sync
2178
2179Immediately write the database to disk I<if it is dirty>.
2180
2181=cut
2182
2183our $DB;
2184
2185{
2186 my $path = cf::localdir . "/database.pst";
2187
2188 sub db_load() {
2189 $DB = stat $path ? Storable::retrieve $path : { };
2190 } 3309 };
3310 cf::cede_to_tick;
2191 3311
2192 my $pid;
2193
2194 sub db_save() {
2195 waitpid $pid, 0 if $pid;
2196 if (0 == ($pid = fork)) {
2197 $DB->{_meta}{version} = 1;
2198 Storable::nstore $DB, "$path~";
2199 rename "$path~", $path;
2200 cf::_exit 0 if defined $pid;
2201 }
2202 } 3312 {
3313 my $faces = $facedata->{faceinfo};
2203 3314
2204 my $dirty; 3315 while (my ($face, $info) = each %$faces) {
3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2205 3317
2206 sub db_sync() { 3318 cf::face::set_visibility $idx, $info->{visibility};
2207 db_save if $dirty; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
2208 undef $dirty; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2209 } 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2210 3322
2211 my $idle = Event->idle ( 3323 cf::cede_to_tick;
2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2218 );
2219
2220 sub db_dirty() {
2221 $dirty = 1;
2222 $idle->start;
2223 }
2224
2225 sub db_get($;$) {
2226 @_ >= 2
2227 ? $DB->{$_[0]}{$_[1]}
2228 : ($DB->{$_[0]} ||= { })
2229 }
2230
2231 sub db_put($$;$) {
2232 if (@_ >= 3) {
2233 $DB->{$_[0]}{$_[1]} = $_[2];
2234 } else {
2235 $DB->{$_[0]} = $_[1];
2236 }
2237 db_dirty;
2238 }
2239
2240 cf::global->attach (
2241 prio => 10000,
2242 on_cleanup => sub {
2243 db_sync;
2244 }, 3324 }
2245 );
2246}
2247 3325
2248############################################################################# 3326 while (my ($face, $info) = each %$faces) {
2249# the server's main() 3327 next unless $info->{smooth};
2250 3328
2251sub cfg_load { 3329 my $idx = cf::face::find $face
3330 or next;
3331
3332 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'";
3337 }
3338
3339 cf::cede_to_tick;
3340 }
3341 }
3342
3343 {
3344 my $anims = $facedata->{animinfo};
3345
3346 while (my ($anim, $info) = each %$anims) {
3347 cf::anim::set $anim, $info->{frames}, $info->{facings};
3348 cf::cede_to_tick;
3349 }
3350
3351 cf::anim::invalidate_all; # d'oh
3352 }
3353
3354 {
3355 my $res = $facedata->{resource};
3356
3357 while (my ($name, $info) = each %$res) {
3358 if (defined $info->{type}) {
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type};
3363 } else {
3364 $RESOURCE{$name} = $info;
3365 }
3366
3367 cf::cede_to_tick;
3368 }
3369 }
3370
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372
3373 1
3374}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395
3396register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_;
3398
3399 while (my ($k, $v) = each %$want) {
3400 $ns->fx_want ($k, $v);
3401 }
3402};
3403
3404sub load_resource_file($) {
3405 my $guard = lock_acquire "load_resource_file";
3406
3407 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100;
3409 cf::arch::commit_load;
3410
3411 $status
3412}
3413
3414sub reload_regions {
3415 # HACK to clear player env face cache, we need some signal framework
3416 # for this (global event?)
3417 %ext::player_env::MUSIC_FACE_CACHE = ();
3418
3419 load_resource_file "$MAPDIR/regions"
3420 or die "unable to load regions file\n";
3421
3422 for (cf::region::list) {
3423 $_->{match} = qr/$_->{match}/
3424 if exists $_->{match};
3425 }
3426}
3427
3428sub reload_facedata {
3429 load_facedata "$DATADIR/facedata"
3430 or die "unable to load facedata\n";
3431}
3432
3433sub reload_archetypes {
3434 load_resource_file "$DATADIR/archetypes"
3435 or die "unable to load archetypes\n";
3436}
3437
3438sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n";
3441}
3442
3443sub reload_resources {
3444 warn "reloading resource files...\n";
3445
3446 reload_facedata;
3447 reload_archetypes;
3448 reload_regions;
3449 reload_treasures;
3450
3451 warn "finished reloading resource files\n";
3452}
3453
3454sub reload_config {
3455 warn "reloading config file...\n";
3456
2252 open my $fh, "<:utf8", cf::confdir . "/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
2253 or return; 3458 or return;
2254 3459
2255 local $/; 3460 local $/;
2256 *CFG = YAML::Syck::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
2257 3462
2258 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2259 3464
2260 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2261 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2265 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2266 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
2267 }; 3472 };
2268 warn $@ if $@; 3473 warn $@ if $@;
2269 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3477}
3478
3479sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!";
3482 flock $fh, &Fcntl::LOCK_EX
3483 or die "$PIDFILE: flock: $!";
3484 $fh
3485}
3486
3487# make sure only one server instance is running at any one time
3488sub atomic {
3489 my $fh = pidfile;
3490
3491 my $pid = <$fh>;
3492 kill 9, $pid if $pid > 0;
3493
3494 seek $fh, 0, 0;
3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
2270} 3505}
2271 3506
2272sub main { 3507sub main {
3508 cf::init_globals; # initialise logging
3509
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521
2273 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
2274 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
2275 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2276 (async { 3525 (async {
2277 Event::one_event; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3527 EV::loop EV::LOOP_ONESHOT;
2278 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
2279 }; 3529 };
2280 3530
2281 cfg_load; 3531 evthread_start IO::AIO::poll_fileno;
2282 db_load; 3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3538 reload_config;
3539 db_init;
3540
3541 cf::init_uuid;
3542 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills;
3545
3546 cf::init_beforeplay;
3547
3548 atomic;
3549
2283 load_extensions; 3550 load_extensions;
2284 3551
2285 $TICK_WATCHER->start; 3552 utime time, time, $RUNTIMEFILE;
2286 Event::loop; 3553
3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557
3558 (pop @POST_INIT)->(0) while @POST_INIT;
3559 };
3560
3561 main_loop;
2287} 3562}
2288 3563
2289############################################################################# 3564#############################################################################
2290# initialisation and cleanup 3565# initialisation and cleanup
2291 3566
2292# install some emergency cleanup handlers 3567# install some emergency cleanup handlers
2293BEGIN { 3568BEGIN {
3569 our %SIGWATCHER = ();
2294 for my $signal (qw(INT HUP TERM)) { 3570 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal ( 3571 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2296 reentrant => 0,
2297 data => WF_AUTOCANCEL,
2298 signal => $signal,
2299 cb => sub {
2300 cf::cleanup "SIG$signal"; 3572 cf::cleanup "SIG$signal";
2301 },
2302 ); 3573 };
3574 }
3575}
3576
3577sub write_runtime_sync {
3578 my $t0 = EV::time;
3579
3580 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time.
3582
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3584
3585 my $guard = cf::lock_acquire "write_runtime";
3586
3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3588 or return;
3589
3590 my $value = $cf::RUNTIME + 90 + 10;
3591 # 10 is the runtime save interval, for a monotonic clock
3592 # 60 allows for the watchdog to kill the server.
3593
3594 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3595 and return;
3596
3597 # always fsync - this file is important
3598 aio_fsync $fh
3599 and return;
3600
3601 # touch it again to show we are up-to-date
3602 aio_utime $fh, undef, undef;
3603
3604 close $fh
3605 or return;
3606
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return;
3609
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3611
2303 } 3612 1
3613}
3614
3615our $uuid_lock;
3616our $uuid_skip;
3617
3618sub write_uuid_sync($) {
3619 $uuid_skip ||= $_[0];
3620
3621 return if $uuid_lock;
3622 local $uuid_lock = 1;
3623
3624 my $uuid = "$LOCALDIR/uuid";
3625
3626 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3627 or return;
3628
3629 my $value = uuid_seq uuid_cur;
3630
3631 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n";
3633 return;
3634 }
3635
3636 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0;
3638
3639 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3640 and return;
3641
3642 # always fsync - this file is important
3643 aio_fsync $fh
3644 and return;
3645
3646 close $fh
3647 or return;
3648
3649 aio_rename "$uuid~", $uuid
3650 and return;
3651
3652 warn "uuid file written ($value).\n";
3653
3654 1
3655
3656}
3657
3658sub write_uuid($$) {
3659 my ($skip, $sync) = @_;
3660
3661 $sync ? write_uuid_sync $skip
3662 : async { write_uuid_sync $skip };
2304} 3663}
2305 3664
2306sub emergency_save() { 3665sub emergency_save() {
2307 my $freeze_guard = cf::freeze_mainloop; 3666 my $freeze_guard = cf::freeze_mainloop;
2308 3667
2309 warn "enter emergency perl save\n"; 3668 warn "emergency_perl_save: enter\n";
2310 3669
2311 cf::sync_job { 3670 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675
2312 # use a peculiar iteration method to avoid tripping on perl 3676 # use a peculiar iteration method to avoid tripping on perl
2313 # refcount bugs in for. also avoids problems with players 3677 # refcount bugs in for. also avoids problems with players
2314 # and maps saved/destroyed asynchronously. 3678 # and maps saved/destroyed asynchronously.
2315 warn "begin emergency player save\n"; 3679 warn "emergency_perl_save: begin player save\n";
2316 for my $login (keys %cf::PLAYER) { 3680 for my $login (keys %cf::PLAYER) {
2317 my $pl = $cf::PLAYER{$login} or next; 3681 my $pl = $cf::PLAYER{$login} or next;
2318 $pl->valid or next; 3682 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2319 $pl->save; 3684 $pl->save;
2320 } 3685 }
2321 warn "end emergency player save\n"; 3686 warn "emergency_perl_save: end player save\n";
2322 3687
2323 warn "begin emergency map save\n"; 3688 warn "emergency_perl_save: begin map save\n";
2324 for my $path (keys %cf::MAP) { 3689 for my $path (keys %cf::MAP) {
2325 my $map = $cf::MAP{$path} or next; 3690 my $map = $cf::MAP{$path} or next;
2326 $map->valid or next; 3691 $map->valid or next;
2327 $map->save; 3692 $map->save;
2328 } 3693 }
2329 warn "end emergency map save\n"; 3694 warn "emergency_perl_save: end map save\n";
3695
3696 warn "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n";
3699
3700 warn "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1;
3702 warn "emergency_perl_save: end write uuid\n";
2330 }; 3703 };
2331 3704
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
2332 warn "leave emergency perl save\n"; 3710 warn "emergency_perl_save: leave\n";
2333} 3711}
2334 3712
3713sub post_cleanup {
3714 my ($make_core) = @_;
3715
3716 warn Carp::longmess "post_cleanup backtrace"
3717 if $make_core;
3718
3719 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$;
3721}
3722
3723# a safer delete_package, copied from Symbol
3724sub clear_package($) {
3725 my $pkg = shift;
3726
3727 # expand to full symbol table name if needed
3728 unless ($pkg =~ /^main::.*::$/) {
3729 $pkg = "main$pkg" if $pkg =~ /^::/;
3730 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3731 $pkg .= '::' unless $pkg =~ /::$/;
3732 }
3733
3734 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3735 my $stem_symtab = *{$stem}{HASH};
3736
3737 defined $stem_symtab and exists $stem_symtab->{$leaf}
3738 or return;
3739
3740 # clear all symbols
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 }
3746 warn "cleared package $pkg\n";#d#
3747}
3748
2335sub reload() { 3749sub do_reload_perl() {
2336 # can/must only be called in main 3750 # can/must only be called in main
2337 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
2338 warn "can only reload from main coroutine"; 3752 warn "can only reload from main coroutine";
2339 return; 3753 return;
2340 } 3754 }
2341 3755
3756 return if $RELOAD++;
3757
3758 my $t1 = EV::time;
3759
3760 while ($RELOAD) {
2342 warn "reloading..."; 3761 warn "reloading...";
2343 3762
2344 warn "cancelling server ticker"; 3763 warn "entering sync_job";
2345 $TICK_WATCHER->cancel;
2346 3764
3765 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
2347 cf::emergency_save; 3767 cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
2348 3769
2349 eval { 3770 warn "syncing database to disk";
3771 BDB::db_env_txn_checkpoint $DB_ENV;
3772
2350 # if anything goes wrong in here, we should simply crash as we already saved 3773 # if anything goes wrong in here, we should simply crash as we already saved
2351 3774
2352 warn "syncing database to disk";
2353 cf::db_sync;
2354
2355 warn "cancelling all WF_AUTOCANCEL watchers";
2356 for (Event::all_watchers) {
2357 $_->cancel if $_->data & WF_AUTOCANCEL;
2358 }
2359
2360 warn "flushing outstanding aio requests"; 3775 warn "flushing outstanding aio requests";
2361 for (;;) { 3776 while (IO::AIO::nreqs || BDB::nreqs) {
2362 IO::AIO::flush; 3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2363 Coro::cede;
2364 last unless IO::AIO::nreqs;
2365 warn "iterate...";
2366 }
2367
2368 warn "cancelling all extension coros";
2369 $_->cancel for values %EXT_CORO;
2370 %EXT_CORO = ();
2371
2372 warn "removing commands";
2373 %COMMAND = ();
2374
2375 warn "removing ext commands";
2376 %EXTCMD = ();
2377
2378 warn "unloading/nuking all extensions";
2379 for my $pkg (@EXTS) {
2380 warn "... unloading $pkg";
2381
2382 if (my $cb = $pkg->can ("unload")) {
2383 eval {
2384 $cb->($pkg);
2385 1
2386 } or warn "$pkg unloaded, but with errors: $@";
2387 } 3778 }
2388 3779
2389 warn "... nuking $pkg"; 3780 warn "cancelling all extension coros";
2390 Symbol::delete_package $pkg; 3781 $_->cancel for values %EXT_CORO;
2391 } 3782 %EXT_CORO = ();
2392 3783
2393 warn "unloading all perl modules loaded from $LIBDIR"; 3784 warn "removing commands";
2394 while (my ($k, $v) = each %INC) { 3785 %COMMAND = ();
2395 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2396 3786
3787 warn "removing ext/exti commands";
3788 %EXTCMD = ();
3789 %EXTICMD = ();
3790
3791 warn "unloading/nuking all extensions";
3792 for my $pkg (@EXTS) {
2397 warn "... unloading $k"; 3793 warn "... unloading $pkg";
2398 delete $INC{$k};
2399 3794
2400 $k =~ s/\.pm$//;
2401 $k =~ s/\//::/g;
2402
2403 if (my $cb = $k->can ("unload_module")) { 3795 if (my $cb = $pkg->can ("unload")) {
3796 eval {
2404 $cb->(); 3797 $cb->($pkg);
3798 1
3799 } or warn "$pkg unloaded, but with errors: $@";
3800 }
3801
3802 warn "... clearing $pkg";
3803 clear_package $pkg;
2405 } 3804 }
2406 3805
2407 Symbol::delete_package $k; 3806 warn "unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809
3810 warn "... unloading $k";
3811 delete $INC{$k};
3812
3813 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g;
3815
3816 if (my $cb = $k->can ("unload_module")) {
3817 $cb->();
3818 }
3819
3820 clear_package $k;
2408 } 3821 }
2409 3822
2410 warn "getting rid of safe::, as good as possible"; 3823 warn "getting rid of safe::, as good as possible";
2411 Symbol::delete_package "safe::$_" 3824 clear_package "safe::$_"
2412 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2413 3826
2414 warn "unloading cf.pm \"a bit\""; 3827 warn "unloading cf.pm \"a bit\"";
2415 delete $INC{"cf.pm"}; 3828 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2416 3830
2417 # don't, removes xs symbols, too, 3831 # don't, removes xs symbols, too,
2418 # and global variables created in xs 3832 # and global variables created in xs
2419 #Symbol::delete_package __PACKAGE__; 3833 #clear_package __PACKAGE__;
2420 3834
2421 warn "unload completed, starting to reload now"; 3835 warn "unload completed, starting to reload now";
2422 3836
2423 warn "reloading cf.pm"; 3837 warn "reloading cf.pm";
2424 require cf; 3838 require cf;
2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3839 cf::_connect_to_perl_1;
2426 3840
2427 warn "loading config and database again"; 3841 warn "loading config and database again";
2428 cf::cfg_load; 3842 cf::reload_config;
2429 cf::db_load;
2430 3843
2431 warn "loading extensions"; 3844 warn "loading extensions";
2432 cf::load_extensions; 3845 cf::load_extensions;
2433 3846
3847 if ($REATTACH_ON_RELOAD) {
2434 warn "reattaching attachments to objects/players"; 3848 warn "reattaching attachments to objects/players";
2435 _global_reattach; 3849 _global_reattach; # objects, sockets
2436 warn "reattaching attachments to maps"; 3850 warn "reattaching attachments to maps";
2437 reattach $_ for values %MAP; 3851 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players";
3853 reattach $_ for values %PLAYER;
3854 }
2438 3855
2439 warn "restarting server ticker"; 3856 warn "running post_init jobs";
3857 (pop @POST_INIT)->(1) while @POST_INIT;
2440 3858
2441 $TICK_WATCHER->start; 3859 warn "leaving sync_job";
3860
3861 1
3862 } or do {
3863 warn $@;
3864 cf::cleanup "error while reloading, exiting.";
3865 };
3866
3867 warn "reloaded";
3868 --$RELOAD;
3869 }
3870
3871 $t1 = EV::time - $t1;
3872 warn "reload completed in ${t1}s\n";
3873};
3874
3875our $RELOAD_WATCHER; # used only during reload
3876
3877sub reload_perl() {
3878 # doing reload synchronously and two reloads happen back-to-back,
3879 # coro crashes during coro_state_free->destroy here.
3880
3881 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions;
3883
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl;
3886 undef $RELOAD_WATCHER;
3887 };
2442 }; 3888 };
2443 3889}
2444 if ($@) {
2445 warn $@;
2446 warn "error while reloading, exiting.";
2447 exit 1;
2448 }
2449
2450 warn "reloaded";
2451};
2452
2453our $RELOAD_WATCHER; # used only during reload
2454 3890
2455register_command "reload" => sub { 3891register_command "reload" => sub {
2456 my ($who, $arg) = @_; 3892 my ($who, $arg) = @_;
2457 3893
2458 if ($who->flag (FLAG_WIZ)) { 3894 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("reloading server."); 3895 $who->message ("reloading server.");
2460 3896 async {
2461 # doing reload synchronously and two reloads happen back-to-back, 3897 $Coro::current->{desc} = "perl_reload";
2462 # coro crashes during coro_state_free->destroy here.
2463
2464 $RELOAD_WATCHER ||= Event->timer (
2465 reentrant => 0,
2466 after => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => sub {
2469 reload; 3898 reload_perl;
2470 undef $RELOAD_WATCHER;
2471 },
2472 ); 3899 };
2473 } 3900 }
2474}; 3901};
2475 3902
2476unshift @INC, $LIBDIR; 3903unshift @INC, $LIBDIR;
2477 3904
2478my $bug_warning = 0; 3905my $bug_warning = 0;
2479 3906
2480$TICK_WATCHER = Event->timer ( 3907our @WAIT_FOR_TICK;
2481 reentrant => 0, 3908our @WAIT_FOR_TICK_BEGIN;
2482 parked => 1, 3909
2483 prio => 0, 3910sub wait_for_tick {
2484 at => $NEXT_TICK || $TICK, 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2485 data => WF_AUTOCANCEL, 3912
2486 cb => sub { 3913 my $signal = new Coro::Signal;
3914 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait;
3916}
3917
3918sub wait_for_tick_begin {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3920
3921 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait;
3924}
3925
3926sub tick {
2487 if ($Coro::current != $Coro::main) { 3927 if ($Coro::current != $Coro::main) {
2488 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3928 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2489 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
2490 return; 3930 return;
2491 } 3931 }
2492 3932
2493 $NOW = Event::time;
2494
2495 cf::server_tick; # one server iteration 3933 cf::server_tick; # one server iteration
2496 $RUNTIME += $TICK;
2497 $NEXT_TICK += $TICK;
2498 3934
2499 $WAIT_FOR_TICK->broadcast; 3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501 3936
2502 # if we are delayed by four ticks or more, skip them all 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2503 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2504 3939 Coro::async_pool {
2505 $TICK_WATCHER->at ($NEXT_TICK); 3940 $Coro::current->{desc} = "runtime saver";
2506 $TICK_WATCHER->start;
2507 },
2508);
2509
2510IO::AIO::max_poll_time $TICK * 0.2;
2511
2512undef $Coro::AIO::WATCHER;
2513$AIO_POLL_WATCHER = Event->io (
2514 reentrant => 0,
2515 fd => IO::AIO::poll_fileno,
2516 poll => 'r',
2517 prio => 6,
2518 data => WF_AUTOCANCEL,
2519 cb => \&IO::AIO::poll_cb,
2520);
2521
2522$WRITE_RUNTIME_WATCHER = Event->timer (
2523 reentrant => 0,
2524 data => WF_AUTOCANCEL,
2525 after => 1,
2526 interval => 10,
2527 prio => 6, # keep it lowest so it acts like a watchdog
2528 cb => Coro::unblock_sub {
2529 write_runtime 3941 write_runtime_sync
2530 or warn "ERROR: unable to write runtime file: $!"; 3942 or warn "ERROR: unable to write runtime file: $!";
3943 };
2531 }, 3944 }
2532); 3945
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send;
3948 }
3949 while (my $sig = shift @WAIT_FOR_TICK) {
3950 $sig->send;
3951 }
3952
3953 $LOAD = ($NOW - $TICK_START) / $TICK;
3954 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3955
3956 if (0) {
3957 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d#
3961 }
3962 }
3963}
3964
3965{
3966 # configure BDB
3967
3968 BDB::min_parallel 16;
3969 BDB::max_poll_reqs $TICK * 0.1;
3970 $AnyEvent::BDB::WATCHER->priority (1);
3971
3972 unless ($DB_ENV) {
3973 $DB_ENV = BDB::db_env_create;
3974 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3975 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3976 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3977 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3978 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3979
3980 cf::sync_job {
3981 eval {
3982 BDB::db_env_open
3983 $DB_ENV,
3984 $BDBDIR,
3985 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3986 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3987 0666;
3988
3989 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3990 };
3991
3992 cf::cleanup "db_env_open(db): $@" if $@;
3993 };
3994 }
3995
3996 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3997 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3998 };
3999 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4000 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4001 };
4002 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4003 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4004 };
4005}
4006
4007{
4008 # configure IO::AIO
4009
4010 IO::AIO::min_parallel 8;
4011 IO::AIO::max_poll_time $TICK * 0.1;
4012 undef $AnyEvent::AIO::WATCHER;
4013}
4014
4015my $_log_backtrace;
4016
4017sub _log_backtrace {
4018 my ($msg, @addr) = @_;
4019
4020 $msg =~ s/\n//;
4021
4022 # limit the # of concurrent backtraces
4023 if ($_log_backtrace < 2) {
4024 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg;
4026 async {
4027 $Coro::current->{desc} = "abt $msg";
4028
4029 my @bt = fork_call {
4030 @addr = map { sprintf "%x", $_ } @addr;
4031 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
4032 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
4033 or die "addr2line: $!";
4034
4035 my @funcs;
4036 my @res = <$fh>;
4037 chomp for @res;
4038 while (@res) {
4039 my ($func, $line) = splice @res, 0, 2, ();
4040 push @funcs, "[$func] $line";
4041 }
4042
4043 @funcs
4044 };
4045
4046 LOG llevInfo, "[ABT] $perl_bt\n";
4047 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
4048 LOG llevInfo, "[ABT] $_\n" for @bt;
4049 --$_log_backtrace;
4050 };
4051 } else {
4052 LOG llevInfo, "[ABT] $msg\n";
4053 LOG llevInfo, "[ABT] [suppressed]\n";
4054 }
4055}
4056
4057# load additional modules
4058require "cf/$_.pm" for @EXTRA_MODULES;
4059cf::_connect_to_perl_2;
2533 4060
2534END { cf::emergency_save } 4061END { cf::emergency_save }
2535 4062
25361 40631
2537 4064

Diff Legend

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