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.322 by root, Fri Jul 27 10:10:51 2007 UTC vs.
Revision 1.534 by root, Thu Apr 29 08:13:51 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines