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.160 by root, Wed Jan 10 22:54:06 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS ();
27use BDB ();
20use Data::Dumper; 28use Data::Dumper;
21use Digest::MD5; 29use Digest::MD5;
22use Fcntl; 30use Fcntl;
31use YAML::Syck ();
23use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF;
35use Digest::MD5 ();
26 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 44
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
33 47
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
36our %COMMAND = (); 52our %COMMAND = ();
37our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
38 54
39our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps
42 60
61our $RELOAD; # number of reloads so far
43our @EVENT; 62our @EVENT;
44our $LIBDIR = datadir . "/ext";
45 63
46our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
47our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
48our $NEXT_TICK; 80our $NEXT_TICK;
49our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
50 86
51our %CFG; 87our %CFG;
52 88
53our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
54our $RUNTIME; 90our $RUNTIME;
55 91
56our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
57our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
58our $LINK_MAP; # the special {link} map 94our $LINK_MAP; # the special {link} map, which is always available
59our $RANDOM_MAPS = cf::localdir . "/random";
60 95
61our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 96# used to convert map paths into valid unix filenames by replacing / by ∕
62our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
63 102
64binmode STDOUT; 103binmode STDOUT;
65binmode STDERR; 104binmode STDERR;
66 105
67# read virtual server time, if available 106# read virtual server time, if available
68unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
69 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
70 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
71 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
72} 111}
73 112
74mkdir cf::localdir; 113mkdir $_
75mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
76mkdir cf::localdir . "/" . cf::tmpdir;
77mkdir cf::localdir . "/" . cf::uniquedir;
78mkdir $RANDOM_MAPS;
79 115
80# a special map that is always available
81our $LINK_MAP;
82our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
117
118sub cf::map::normalise;
83 119
84############################################################################# 120#############################################################################
85 121
86=head2 GLOBAL VARIABLES 122=head2 GLOBAL VARIABLES
87 123
94=item $cf::RUNTIME 130=item $cf::RUNTIME
95 131
96The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
97every server tick. 133every server tick.
98 134
99=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
100 138
101The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
102be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
103 143
104=item $cf::NOW 144=item $cf::NOW
105 145
106The time of the last (current) server tick. 146The time of the last (current) server tick.
107 147
108=item $cf::TICK 148=item $cf::TICK
109 149
110The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
111 161
112=item %cf::CFG 162=item %cf::CFG
113 163
114Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
115from wherever your confdir points to. 165from wherever your confdir points to.
116 166
117=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
118 168
119These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
120or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
121processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
122window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
123 178
124=back 179=back
125 180
126=cut 181=cut
127 182
128BEGIN { 183BEGIN {
129 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
130 my $msg = join "", @_; 185 my $msg = join "", @_;
131 utf8::encode $msg;
132 186
133 $msg .= "\n" 187 $msg .= "\n"
134 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
135 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
136 LOG llevError, $msg; 193 LOG llevError, $msg;
137 }; 194 };
138} 195}
139 196
140@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
141@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
142@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
143@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
144@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
145@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
146 204
147# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
148# within the Safe compartment. 206# within the Safe compartment.
149for my $pkg (qw( 207for my $pkg (qw(
150 cf::global cf::attachable 208 cf::global cf::attachable
158} 216}
159 217
160$Event::DIED = sub { 218$Event::DIED = sub {
161 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
162}; 220};
221
222#############################################################################
163 223
164=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
165 225
166=over 4 226=over 4
167 227
186 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
187 $d 247 $d
188 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
189} 249}
190 250
191use JSON::Syck (); # TODO# replace by JSON::PC once working
192
193=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
194 252
195Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
196 254
197=cut
198
199sub from_json($) {
200 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
201 JSON::Syck::Load $_[0]
202}
203
204=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
205 256
206Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
207 258
208=cut 259=cut
209 260
210sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
211 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
212 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
213} 264sub from_json ($) { $json_coder->decode ($_[0]) }
214 265
215=item cf::lock_wait $string 266=item cf::lock_wait $string
216 267
217Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
218 269
221Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
222a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
223for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
224returned. 275returned.
225 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
226Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
227uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
228 282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
286
229=cut 287=cut
230 288
231our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
232 291
233sub lock_wait($) { 292sub lock_wait($) {
234 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
235 299
236 # wait for lock, if any 300 # wait for lock, if any
237 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
238 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
239 Coro::schedule; 303 Coro::schedule;
245 309
246 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
247 lock_wait $key; 311 lock_wait $key;
248 312
249 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
250 315
251 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
252 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
253 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
254 } 320 }
255} 321}
256 322
323sub lock_active($) {
324 my ($key) = @_;
325
326 ! ! $LOCK{$key}
327}
328
257sub freeze_mainloop { 329sub freeze_mainloop {
258 return unless $TICK_WATCHER->is_active; 330 return unless $TICK_WATCHER->is_active;
259 331
260 my $guard = Coro::guard { $TICK_WATCHER->start }; 332 my $guard = Coro::guard {
333 $TICK_WATCHER->start;
334 };
261 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
262 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
263} 393}
264 394
265=item cf::async { BLOCK } 395=item cf::async { BLOCK }
266 396
267Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
272 402
273BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
274 404
275=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
276 406
277The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
278always able to handle events or runnable, as crossfire+ is only partly 408is always able to handle events or runnable, as Crossfire TRT is only
279reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
280 411
281If it must be done, put the blocking parts into C<sync_job>. This will run 412If it must be done, put the blocking parts into C<sync_job>. This will run
282the given BLOCK in another coroutine while waiting for the result. The 413the given BLOCK in another coroutine while waiting for the result. The
283server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
284fast or be very important. 415fast or be very important.
287 418
288sub sync_job(&) { 419sub sync_job(&) {
289 my ($job) = @_; 420 my ($job) = @_;
290 421
291 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
292 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
293 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
294 427
295 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
296 # (but this is cancel-safe) 429 # (but this is cancel-safe)
307 440
308 while ($busy) { 441 while ($busy) {
309 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
310 } 443 }
311 444
445 $time = Event::time - $time;
446
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load
451
312 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
313 } else { 453 } else {
314 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
315 455
316 $job->() 456 $job->()
335 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
336 476
337 $coro 477 $coro
338} 478}
339 479
340sub write_runtime { 480=item fork_call { }, $args
341 my $runtime = cf::localdir . "/runtime";
342 481
343 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 482Executes the given code block with the given arguments in a seperate
344 or return; 483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
345 486
346 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 487=cut
347 (aio_write $fh, 0, (length $value), $value, 0) <= 0
348 and return;
349 488
350 aio_fsync $fh 489sub fork_call(&@) {
351 and return; 490 my ($cb, @args) = @_;
352 491
353 close $fh 492 # we seemingly have to make a local copy of the whole thing,
354 or return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
355 495
356 aio_rename "$runtime~", $runtime 496 my @res = Coro::Util::fork_eval {
357 and return; 497 reset_signals;
498 &$cb
499 }, @args;
358 500
501 wantarray ? @res : $res[-1]
502}
503
504=item $value = cf::db_get $family => $key
505
506Returns a single value from the environment database.
507
508=item cf::db_put $family => $key => $value
509
510Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512
513=cut
514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
359 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
618}
619
620=item cf::datalog type => key => value, ...
621
622Log a datalog packet of the given type with the given key-value pairs.
623
624=cut
625
626sub datalog($@) {
627 my ($type, %kv) = @_;
628 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
360} 629}
361 630
362=back 631=back
363 632
364=cut 633=cut
365
366#############################################################################
367
368package cf::path;
369
370use overload
371 '""' => \&as_string;
372
373# used to convert map paths into valid unix filenames by repalcing / by ∕
374our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
375
376sub new {
377 my ($class, $path, $base) = @_;
378
379 $path = $path->as_string if ref $path;
380
381 my $self = bless { }, $class;
382
383 # {... are special paths that are not touched
384 # ?xxx/... are special absolute paths
385 # ?random/... random maps
386 # /! non-realised random map exit
387 # /... normal maps
388 # ~/... per-player maps without a specific player (DO NOT USE)
389 # ~user/... per-player map of a specific user
390
391 $path =~ s/$PATH_SEP/\//go;
392
393 if ($path =~ /^{/) {
394 # fine as it is
395 } elsif ($path =~ s{^\?random/}{}) {
396 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397 $self->{random} = cf::from_json $data;
398 } else {
399 if ($path =~ s{^~([^/]+)?}{}) {
400 $self->{user_rel} = 1;
401
402 if (defined $1) {
403 $self->{user} = $1;
404 } elsif ($base =~ m{^~([^/]+)/}) {
405 $self->{user} = $1;
406 } else {
407 warn "cannot resolve user-relative path without user <$path,$base>\n";
408 }
409 } elsif ($path =~ /^\//) {
410 # already absolute
411 } else {
412 $base =~ s{[^/]+/?$}{};
413 return $class->new ("$base/$path");
414 }
415
416 for ($path) {
417 redo if s{/\.?/}{/};
418 redo if s{/[^/]+/\.\./}{/};
419 }
420 }
421
422 $self->{path} = $path;
423
424 $self
425}
426
427# the name / primary key / in-game path
428sub as_string {
429 my ($self) = @_;
430
431 $self->{user_rel} ? "~$self->{user}$self->{path}"
432 : $self->{random} ? "?random/$self->{path}"
433 : $self->{path}
434}
435
436# the displayed name, this is a one way mapping
437sub visible_name {
438 my ($self) = @_;
439
440# if (my $rmp = $self->{random}) {
441# # todo: be more intelligent about this
442# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
443# } else {
444 $self->as_string
445# }
446}
447
448# escape the /'s in the path
449sub _escaped_path {
450 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
451 $path
452}
453
454# the original (read-only) location
455sub load_path {
456 my ($self) = @_;
457
458 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
459}
460
461# the temporary/swap location
462sub save_path {
463 my ($self) = @_;
464
465 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
466 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
467 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
468}
469
470# the unique path, might be eq to save_path
471sub uniq_path {
472 my ($self) = @_;
473
474 $self->{user_rel} || $self->{random}
475 ? undef
476 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
477}
478
479# return random map parameters, or undef
480sub random_map_params {
481 my ($self) = @_;
482
483 $self->{random}
484}
485
486# this is somewhat ugly, but style maps do need special treatment
487sub is_style_map {
488 $_[0]{path} =~ m{^/styles/}
489}
490
491package cf;
492 634
493############################################################################# 635#############################################################################
494 636
495=head2 ATTACHABLE OBJECTS 637=head2 ATTACHABLE OBJECTS
496 638
498attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
499to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
500 642
501In the following description, CLASS can be any of C<global>, C<object> 643In the following description, CLASS can be any of C<global>, C<object>
502C<player>, C<client> or C<map> (i.e. the attachable objects in 644C<player>, C<client> or C<map> (i.e. the attachable objects in
503crossfire+). 645Crossfire TRT).
504 646
505=over 4 647=over 4
506 648
507=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
508 650
622our @CB_TYPE = (); # registry for type (cf-object class) based events 764our @CB_TYPE = (); # registry for type (cf-object class) based events
623our @CB_MAP = (); 765our @CB_MAP = ();
624 766
625my %attachment; 767my %attachment;
626 768
769sub cf::attachable::thawer_merge {
770 # simply override everything except _meta
771 local $_[0]{_meta};
772 %{$_[0]} = %{$_[1]};
773}
774
627sub _attach_cb($$$$) { 775sub _attach_cb($$$$) {
628 my ($registry, $event, $prio, $cb) = @_; 776 my ($registry, $event, $prio, $cb) = @_;
629 777
630 use sort 'stable'; 778 use sort 'stable';
631 779
665 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
666 814
667 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
668 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
669 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
670 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
671 819
672 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
673 my $pkg = shift @arg; 821 my $pkg = shift @arg;
674 822
675 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
704 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
705 } 853 }
706 854
707 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
708 } else { 856 } else {
709 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
710 } 858 }
711 859
712 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
713} 861}
714 862
716 if (ref $_[0]) { 864 if (ref $_[0]) {
717 _object_attach @_; 865 _object_attach @_;
718 } else { 866 } else {
719 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
720 } 868 }
869 _recalc_want;
721}; 870};
722 871
723# all those should be optimised 872# all those should be optimised
724sub cf::attachable::detach { 873sub cf::attachable::detach {
725 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
728 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
729 reattach ($obj); 878 reattach ($obj);
730 } else { 879 } else {
731 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
732 } 881 }
882 _recalc_want;
733}; 883};
734 884
735sub cf::attachable::attached { 885sub cf::attachable::attached {
736 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
737 887
752 "; 902 ";
753 die if $@; 903 die if $@;
754} 904}
755 905
756our $override; 906our $override;
757our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
758 908
759sub override { 909sub override {
760 $override = 1; 910 $override = 1;
761 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
762} 912}
763 913
764sub do_invoke { 914sub do_invoke {
765 my $event = shift; 915 my $event = shift;
766 my $callbacks = shift; 916 my $callbacks = shift;
767 917
768 @invoke_results = (); 918 @INVOKE_RESULTS = ();
769 919
770 local $override; 920 local $override;
771 921
772 for (@$callbacks) { 922 for (@$callbacks) {
773 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
790 940
791Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
792 942
793This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
794removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
795results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
796 946
797=back 947=back
798 948
799=cut 949=cut
800 950
801############################################################################# 951#############################################################################
802# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
803 964
804sub reattach { 965sub reattach {
805 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
806 my ($obj) = @_; 967 my ($obj) = @_;
968
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
807 970
808 my $registry = $obj->registry; 971 my $registry = $obj->registry;
809 972
810 @$registry = (); 973 @$registry = ();
811 974
850); 1013);
851 1014
852sub object_freezer_save { 1015sub object_freezer_save {
853 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
854 1017
1018 my $guard = cf::lock_acquire "io";
1019
855 sync_job { 1020 sync_job {
856 if (length $$rdata) { 1021 if (length $$rdata) {
857 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
858 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
859 1024
860 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
861 chmod SAVE_MODE, $fh; 1026 chmod SAVE_MODE, $fh;
862 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
863 aio_fsync $fh; 1028 aio_fsync $fh if $cf::USE_FSYNC;
864 close $fh; 1029 close $fh;
865 1030
866 if (@$objs) { 1031 if (@$objs) {
867 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
868 chmod SAVE_MODE, $fh; 1033 chmod SAVE_MODE, $fh;
869 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1034 my $data = Storable::nfreeze { version => 1, objs => $objs };
870 aio_write $fh, 0, (length $data), $data, 0; 1035 aio_write $fh, 0, (length $data), $data, 0;
871 aio_fsync $fh; 1036 aio_fsync $fh if $cf::USE_FSYNC;
872 close $fh; 1037 close $fh;
873 aio_rename "$filename.pst~", "$filename.pst"; 1038 aio_rename "$filename.pst~", "$filename.pst";
874 } 1039 }
875 } else { 1040 } else {
876 aio_unlink "$filename.pst"; 1041 aio_unlink "$filename.pst";
882 } 1047 }
883 } else { 1048 } else {
884 aio_unlink $filename; 1049 aio_unlink $filename;
885 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
886 } 1051 }
887 } 1052 };
1053
1054 undef $guard;
888} 1055}
889 1056
890sub object_freezer_as_string { 1057sub object_freezer_as_string {
891 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
892 1059
897 1064
898sub object_thawer_load { 1065sub object_thawer_load {
899 my ($filename) = @_; 1066 my ($filename) = @_;
900 1067
901 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
902 1071
903 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
904 or return; 1073 or return;
905 1074
906 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
907 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
908 or return; 1077 or return;
1078
1079 undef $guard;
909 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
910 } 1081 }
911 1082
912 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
913 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
914 return ($data, $av); 1086 ($data, $av)
915} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
916 1094
917############################################################################# 1095#############################################################################
918# command handling &c 1096# command handling &c
919 1097
920=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
933 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
934} 1112}
935 1113
936=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
937 1115
938Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
939 1121
940If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
941called. 1123called.
942 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
943=cut 1136=cut
944 1137
945sub register_extcmd { 1138sub register_extcmd {
946 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
947 1140
948 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
949} 1148}
950 1149
951cf::player->attach ( 1150cf::player->attach (
952 on_command => sub { 1151 on_command => sub {
953 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
962 cf::override; 1161 cf::override;
963 }, 1162 },
964 on_extcmd => sub { 1163 on_extcmd => sub {
965 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
966 1165
967 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
968 1167
969 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
970 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
971 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
972 $pl->ext_reply ($msg->{msgid}, %reply);
973 }
974 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
975 } else { 1183 } else {
976 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
977 } 1185 }
978 1186
979 cf::override; 1187 cf::override;
980 }, 1188 },
981); 1189);
982 1190
983sub load_extension {
984 my ($path) = @_;
985
986 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
987 my $base = $1;
988 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg";
991
992 warn "... loading '$path' into '$pkg'\n";
993
994 open my $fh, "<:utf8", $path
995 or die "$path: $!";
996
997 my $source =
998 "package $pkg; use strict; use utf8;\n"
999 . "#line 1 \"$path\"\n{\n"
1000 . (do { local $/; <$fh> })
1001 . "\n};\n1";
1002
1003 eval $source
1004 or die $@ ? "$path: $@\n"
1005 : "extension disabled.\n";
1006
1007 push @EXTS, $pkg;
1008}
1009
1010sub load_extensions { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
1011 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
1012 next unless -r $ext; 1196 next unless -r $path;
1013 eval { 1197
1014 load_extension $ext; 1198 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1199 my $base = $1;
1200 my $pkg = $1;
1201 $pkg =~ s/[^[:word:]]/_/g;
1202 $pkg = "ext::$pkg";
1203
1204 open my $fh, "<:utf8", $path
1205 or die "$path: $!";
1206
1207 my $source = do { local $/; <$fh> };
1208
1209 my %ext = (
1210 path => $path,
1211 base => $base,
1212 pkg => $pkg,
1213 );
1214
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217
1218 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n"
1221 . $source
1222 . "\n};\n1";
1223
1224 $todo{$base} = \%ext;
1225 }
1226
1227 my %done;
1228 while (%todo) {
1229 my $progress;
1230
1231 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip
1234 unless exists $done{$_};
1235 }
1236
1237 warn "... loading '$k' into '$v->{pkg}'\n";
1238
1239 unless (eval $v->{source}) {
1240 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n";
1242
1243 if (exists $v->{meta}{mandatory}) {
1244 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n";
1246 exit 1;
1247 }
1248
1249 warn $msg;
1250 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
1015 1 1255 }
1016 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
1017 } 1261 };
1018} 1262}
1019 1263
1020############################################################################# 1264#############################################################################
1021# load/save/clean perl data associated with a map
1022 1265
1023*cf::mapsupport::on_clean = sub { 1266=back
1024 my ($map) = @_;
1025
1026 my $path = $map->tmpname;
1027 defined $path or return;
1028
1029 unlink "$path.pst";
1030};
1031
1032cf::map->attach (prio => -10000, package => cf::mapsupport::);
1033
1034#############################################################################
1035 1267
1036=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
1037 1269
1038Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
1039 1271
1045 1277
1046=head3 cf::player 1278=head3 cf::player
1047 1279
1048=over 4 1280=over 4
1049 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1050=item cf::player::find $login 1296=item cf::player::find $login
1051 1297
1052Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1053 1299
1054=cut 1300=cut
1055 1301
1056sub playerdir($) { 1302sub playerdir($) {
1057 cf::localdir 1303 "$PLAYERDIR/"
1058 . "/"
1059 . cf::playerdir
1060 . "/"
1061 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1304 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1062} 1305}
1063 1306
1064sub path($) { 1307sub path($) {
1065 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1308 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1066 1309
1067 (playerdir $login) . "/$login.pl" 1310 (playerdir $login) . "/playerdata"
1068} 1311}
1069 1312
1070sub find_active($) { 1313sub find_active($) {
1071 $cf::PLAYER{$_[0]} 1314 $cf::PLAYER{$_[0]}
1072 and $cf::PLAYER{$_[0]}->active 1315 and $cf::PLAYER{$_[0]}->active
1075 1318
1076sub exists($) { 1319sub exists($) {
1077 my ($login) = @_; 1320 my ($login) = @_;
1078 1321
1079 $cf::PLAYER{$login} 1322 $cf::PLAYER{$login}
1080 or cf::sync_job { !aio_stat $login } 1323 or cf::sync_job { !aio_stat path $login }
1081} 1324}
1082 1325
1083sub find($) { 1326sub find($) {
1084 return $cf::PLAYER{$_[0]} || do { 1327 return $cf::PLAYER{$_[0]} || do {
1085 my $login = $_[0]; 1328 my $login = $_[0];
1086 1329
1087 my $guard = cf::lock_acquire "user_find:$login"; 1330 my $guard = cf::lock_acquire "user_find:$login";
1088 1331
1089 $cf::PLAYER{$_[0]} || do { 1332 $cf::PLAYER{$_[0]} || do {
1090 my $pl = load_pl path $login 1333 # rename old playerfiles to new ones
1334 #TODO: remove when no longer required
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl";
1339
1340 my $f = new_from_file cf::object::thawer path $login
1091 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1092 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1093 } 1349 }
1094 } 1350 }
1095} 1351}
1096 1352
1106 1362
1107 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1108 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1109 1365
1110 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1111 Coro::cede; 1367 cf::cede_to_tick;
1112} 1368}
1113 1369
1114sub new($) { 1370sub new($) {
1115 my ($login) = @_; 1371 my ($login) = @_;
1116 1372
1122 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1123 1379
1124 $self 1380 $self
1125} 1381}
1126 1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1391}
1392
1127=item $pl->quit_character 1393=item $pl->quit_character
1128 1394
1129Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
1130be destroyed. May block for a long time. 1396be destroyed. May block for a long time.
1131 1397
1132=cut 1398=cut
1133 1399
1134sub quit_character { 1400sub quit_character {
1135 my ($pl) = @_; 1401 my ($pl) = @_;
1402
1403 my $name = $pl->ob->name;
1136 1404
1137 $pl->{deny_save} = 1; 1405 $pl->{deny_save} = 1;
1138 $pl->password ("*"); # this should lock out the player until we nuked the dir 1406 $pl->password ("*"); # this should lock out the player until we nuked the dir
1139 1407
1140 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1145 my $path = playerdir $pl; 1413 my $path = playerdir $pl;
1146 my $temp = "$path~$cf::RUNTIME~deleting~"; 1414 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 aio_rename $path, $temp; 1415 aio_rename $path, $temp;
1148 delete $cf::PLAYER{$pl->ob->name}; 1416 delete $cf::PLAYER{$pl->ob->name};
1149 $pl->destroy; 1417 $pl->destroy;
1418
1419 my $prefix = qr<^~\Q$name\E/>;
1420
1421 # nuke player maps
1422 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1423
1150 IO::AIO::aio_rmtree $temp; 1424 IO::AIO::aio_rmtree $temp;
1425}
1426
1427=item $pl->kick
1428
1429Kicks a player out of the game. This destroys the connection.
1430
1431=cut
1432
1433sub kick {
1434 my ($pl, $kicker) = @_;
1435
1436 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1437 $pl->killer ("kicked");
1438 $pl->ns->destroy;
1151} 1439}
1152 1440
1153=item cf::player::list_logins 1441=item cf::player::list_logins
1154 1442
1155Returns am arrayref of all valid playernames in the system, can take a 1443Returns am arrayref of all valid playernames in the system, can take a
1156while and may block, so not sync_job-capable, ever. 1444while and may block, so not sync_job-capable, ever.
1157 1445
1158=cut 1446=cut
1159 1447
1160sub list_logins { 1448sub list_logins {
1161 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1449 my $dirs = aio_readdir $PLAYERDIR
1162 or return []; 1450 or return [];
1163 1451
1164 my @logins; 1452 my @logins;
1165 1453
1166 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1167 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1168 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1169 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1170 1463
1171 utf8::decode $login; 1464 utf8::decode $login;
1172 push @logins, $login; 1465 push @logins, $login;
1173 } 1466 }
1174 1467
1175 \@logins 1468 \@logins
1176} 1469}
1177 1470
1178=item $player->maps 1471=item $player->maps
1179 1472
1180Returns an arrayref of cf::path's of all maps that are private for this 1473Returns an arrayref of map paths that are private for this
1181player. May block. 1474player. May block.
1182 1475
1183=cut 1476=cut
1184 1477
1185sub maps($) { 1478sub maps($) {
1186 my ($pl) = @_; 1479 my ($pl) = @_;
1480
1481 $pl = ref $pl ? $pl->ob->name : $pl;
1187 1482
1188 my $files = aio_readdir playerdir $pl 1483 my $files = aio_readdir playerdir $pl
1189 or return; 1484 or return;
1190 1485
1191 my @paths; 1486 my @paths;
1193 for (@$files) { 1488 for (@$files) {
1194 utf8::decode $_; 1489 utf8::decode $_;
1195 next if /\.(?:pl|pst)$/; 1490 next if /\.(?:pl|pst)$/;
1196 next unless /^$PATH_SEP/o; 1491 next unless /^$PATH_SEP/o;
1197 1492
1198 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1493 push @paths, cf::map::normalise "~$pl/$_";
1199 } 1494 }
1200 1495
1201 \@paths 1496 \@paths
1202} 1497}
1203 1498
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1500
1501Expand crossfire pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549
1204=item $player->ext_reply ($msgid, $msgtype, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1205 1551
1206Sends an ext reply to the player. 1552Sends an ext reply to the player.
1207 1553
1208=cut 1554=cut
1209 1555
1210sub ext_reply($$$%) { 1556sub ext_reply($$@) {
1211 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1212 1558
1213 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1214
1215 $self->send ("ext " . cf::to_json \%msg);
1216} 1560}
1217 1561
1218package cf; 1562=item $player->ext_msg ($type, @msg)
1563
1564Sends an ext event to the client.
1565
1566=cut
1567
1568sub ext_msg($$@) {
1569 my ($self, $type, @msg) = @_;
1570
1571 $self->ns->ext_msg ($type, @msg);
1572}
1573
1574=head3 cf::region
1575
1576=over 4
1577
1578=cut
1579
1580package cf::region;
1581
1582=item cf::region::find_by_path $path
1583
1584Tries to decuce the likely region for a map knowing only its path.
1585
1586=cut
1587
1588sub find_by_path($) {
1589 my ($path) = @_;
1590
1591 my ($match, $specificity);
1592
1593 for my $region (list) {
1594 if ($region->{match} && $path =~ $region->{match}) {
1595 ($match, $specificity) = ($region, $region->specificity)
1596 if $region->specificity > $specificity;
1597 }
1598 }
1599
1600 $match
1601}
1219 1602
1220=back 1603=back
1221
1222 1604
1223=head3 cf::map 1605=head3 cf::map
1224 1606
1225=over 4 1607=over 4
1226 1608
1229package cf::map; 1611package cf::map;
1230 1612
1231use Fcntl; 1613use Fcntl;
1232use Coro::AIO; 1614use Coro::AIO;
1233 1615
1616use overload
1617 '""' => \&as_string,
1618 fallback => 1;
1619
1234our $MAX_RESET = 3600; 1620our $MAX_RESET = 3600;
1235our $DEFAULT_RESET = 3000; 1621our $DEFAULT_RESET = 3000;
1236 1622
1237sub generate_random_map { 1623sub generate_random_map {
1238 my ($path, $rmp) = @_; 1624 my ($self, $rmp) = @_;
1239
1240 # mit "rum" bekleckern, nicht 1625 # mit "rum" bekleckern, nicht
1241 cf::map::_create_random_map 1626 $self->_create_random_map (
1242 $path,
1243 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1244 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1245 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1246 $rmp->{exit_on_final_map}, 1630 $rmp->{exit_on_final_map},
1247 $rmp->{xsize}, $rmp->{ysize}, 1631 $rmp->{xsize}, $rmp->{ysize},
1248 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1632 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1249 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1633 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1250 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1634 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1251 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1635 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1252 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1636 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1253 (cf::region::find $rmp->{region}) 1637 (cf::region::find $rmp->{region}), $rmp->{custom}
1638 )
1639}
1640
1641=item cf::map->register ($regex, $prio)
1642
1643Register a handler for the map path matching the given regex at the
1644givne priority (higher is better, built-in handlers have priority 0, the
1645default).
1646
1647=cut
1648
1649sub register {
1650 my (undef, $regex, $prio) = @_;
1651 my $pkg = caller;
1652
1653 no strict;
1654 push @{"$pkg\::ISA"}, __PACKAGE__;
1655
1656 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1657}
1658
1659# also paths starting with '/'
1660$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1661
1662sub thawer_merge {
1663 my ($self, $merge) = @_;
1664
1665 # we have to keep some variables in memory intact
1666 local $self->{path};
1667 local $self->{load_path};
1668
1669 $self->SUPER::thawer_merge ($merge);
1670}
1671
1672sub normalise {
1673 my ($path, $base) = @_;
1674
1675 $path = "$path"; # make sure its a string
1676
1677 $path =~ s/\.map$//;
1678
1679 # map plan:
1680 #
1681 # /! non-realised random map exit (special hack!)
1682 # {... are special paths that are not being touched
1683 # ?xxx/... are special absolute paths
1684 # ?random/... random maps
1685 # /... normal maps
1686 # ~user/... per-player map of a specific user
1687
1688 $path =~ s/$PATH_SEP/\//go;
1689
1690 # treat it as relative path if it starts with
1691 # something that looks reasonable
1692 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1693 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1694
1695 $base =~ s{[^/]+/?$}{};
1696 $path = "$base/$path";
1697 }
1698
1699 for ($path) {
1700 redo if s{//}{/};
1701 redo if s{/\.?/}{/};
1702 redo if s{/[^/]+/\.\./}{/};
1703 }
1704
1705 $path
1706}
1707
1708sub new_from_path {
1709 my (undef, $path, $base) = @_;
1710
1711 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1712
1713 $path = normalise $path, $base;
1714
1715 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1716 if ($path =~ $EXT_MAP{$pkg}[1]) {
1717 my $self = bless cf::map::new, $pkg;
1718 $self->{path} = $path; $self->path ($path);
1719 $self->init; # pass $1 etc.
1720 return $self;
1721 }
1722 }
1723
1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1725 ()
1726}
1727
1728sub init {
1729 my ($self) = @_;
1730
1731 $self
1732}
1733
1734sub as_string {
1735 my ($self) = @_;
1736
1737 "$self->{path}"
1738}
1739
1740# the displayed name, this is a one way mapping
1741sub visible_name {
1742 &as_string
1743}
1744
1745# the original (read-only) location
1746sub load_path {
1747 my ($self) = @_;
1748
1749 "$MAPDIR/$self->{path}.map"
1750}
1751
1752# the temporary/swap location
1753sub save_path {
1754 my ($self) = @_;
1755
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1757 "$TMPDIR/$path.map"
1758}
1759
1760# the unique path, undef == no special unique path
1761sub uniq_path {
1762 my ($self) = @_;
1763
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1765 "$UNIQUEDIR/$path"
1254} 1766}
1255 1767
1256# and all this just because we cannot iterate over 1768# and all this just because we cannot iterate over
1257# all maps in C++... 1769# all maps in C++...
1258sub change_all_map_light { 1770sub change_all_map_light {
1260 1772
1261 $_->change_map_light ($change) 1773 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1774 for grep $_->outdoor, values %cf::MAP;
1263} 1775}
1264 1776
1777sub decay_objects {
1778 my ($self) = @_;
1779
1780 return if $self->{deny_reset};
1781
1782 $self->do_decay_objects;
1783}
1784
1785sub unlink_save {
1786 my ($self) = @_;
1787
1788 utf8::encode (my $save = $self->save_path);
1789 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1790 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1791}
1792
1265sub try_load_header($) { 1793sub load_header_from($) {
1266 my ($path) = @_; 1794 my ($self, $path) = @_;
1267 1795
1268 utf8::encode $path; 1796 utf8::encode $path;
1269 aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1270 or return; 1798 or return;
1271 1799
1272 my $map = cf::map::new 1800 $self->_load_header ($f)
1273 or return; 1801 or return;
1274 1802
1275 # for better error messages only, will be overwritten 1803 local $MAP_LOADING{$self->{path}} = $self;
1276 $map->path ($path); 1804 $f->resolve_delayed_derefs;
1277 1805
1278 $map->load_header ($path) 1806 $self->{load_path} = $path;
1807
1808 1
1809}
1810
1811sub load_header_orig {
1812 my ($self) = @_;
1813
1814 $self->load_header_from ($self->load_path)
1815}
1816
1817sub load_header_temp {
1818 my ($self) = @_;
1819
1820 $self->load_header_from ($self->save_path)
1821}
1822
1823sub prepare_temp {
1824 my ($self) = @_;
1825
1826 $self->last_access ((delete $self->{last_access})
1827 || $cf::RUNTIME); #d#
1828 # safety
1829 $self->{instantiate_time} = $cf::RUNTIME
1830 if $self->{instantiate_time} > $cf::RUNTIME;
1831}
1832
1833sub prepare_orig {
1834 my ($self) = @_;
1835
1836 $self->{load_original} = 1;
1837 $self->{instantiate_time} = $cf::RUNTIME;
1838 $self->last_access ($cf::RUNTIME);
1839 $self->instantiate;
1840}
1841
1842sub load_header {
1843 my ($self) = @_;
1844
1845 if ($self->load_header_temp) {
1846 $self->prepare_temp;
1847 } else {
1848 $self->load_header_orig
1279 or return; 1849 or return;
1850 $self->prepare_orig;
1851 }
1280 1852
1281 $map->{load_path} = $path; 1853 $self->{deny_reset} = 1
1854 if $self->no_reset;
1282 1855
1283 $map 1856 $self->default_region (cf::region::find_by_path $self->{path})
1857 unless $self->default_region;
1858
1859 1
1284} 1860}
1285 1861
1286sub find; 1862sub find;
1287sub find { 1863sub find {
1288 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1289 1865
1290 #warn "find<$path,$origin>\n";#d#
1291
1292 $path = new cf::path $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1293 my $key = $path->as_string;
1294 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1295 cf::lock_wait "map_find:$key"; 1869 cf::lock_wait "map_find:$path";
1296 1870
1297 $cf::MAP{$key} || do { 1871 $cf::MAP{$path} || do {
1298 my $guard = cf::lock_acquire "map_find:$key"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1299 1874
1300 # do it the slow way 1875 my $map = new_from_path cf::map $path
1301 my $map = try_load_header $path->save_path;
1302
1303 Coro::cede;
1304
1305 if ($map) {
1306 $map->last_access ((delete $map->{last_access})
1307 || $cf::RUNTIME); #d#
1308 # safety
1309 $map->{instantiate_time} = $cf::RUNTIME
1310 if $map->{instantiate_time} > $cf::RUNTIME;
1311 } else {
1312 if (my $rmp = $path->random_map_params) {
1313 $map = generate_random_map $key, $rmp;
1314 } else {
1315 $map = try_load_header $path->load_path;
1316 }
1317
1318 $map or return; 1876 or return;
1319 1877
1320 $map->{load_original} = 1;
1321 $map->{instantiate_time} = $cf::RUNTIME;
1322 $map->last_access ($cf::RUNTIME);
1323 $map->instantiate;
1324
1325 # per-player maps become, after loading, normal maps
1326 $map->per_player (0) if $path->{user_rel};
1327 }
1328
1329 $map->path ($key);
1330 $map->{path} = $path;
1331 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1332 1879
1333 Coro::cede; 1880 $map->load_header
1881 or return;
1334 1882
1335 if ($map->should_reset) { 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1336 $map->reset; 1888 $map->reset;
1337 undef $guard;
1338 $map = find $path 1889 return find $path;
1339 or return;
1340 } 1890 }
1341 1891
1342 $cf::MAP{$key} = $map 1892 $cf::MAP{$path} = $map
1343 } 1893 }
1344} 1894}
1895
1896sub pre_load { }
1897sub post_load { }
1345 1898
1346sub load { 1899sub load {
1347 my ($self) = @_; 1900 my ($self) = @_;
1348 1901
1902 local $self->{deny_reset} = 1; # loading can take a long time
1903
1349 my $path = $self->{path}; 1904 my $path = $self->{path};
1905
1906 {
1350 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1907 my $guard = cf::lock_acquire "map_data:$path";
1351 1908
1909 return unless $self->valid;
1352 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1353 1911
1354 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1355 1913
1356 $self->alloc; 1914 $self->alloc;
1357 $self->load_objects ($self->{load_path}, 1) 1915
1916 $self->pre_load;
1917 cf::cede_to_tick;
1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1921 $self->_load_objects ($f)
1358 or return; 1922 or return;
1359 1923
1360 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1361 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1362 1926
1363 if (my $uniq = $path->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1364 utf8::encode $uniq; 1928 utf8::encode $uniq;
1365 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1366 $self->clear_unique_items; 1931 $self->clear_unique_items;
1367 $self->load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1368 } 1935 }
1369 } 1936 }
1370 1937
1371 Coro::cede; 1938 $f->resolve_delayed_derefs;
1372 1939
1940 cf::cede_to_tick;
1373 # now do the right thing for maps 1941 # now do the right thing for maps
1374 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1375
1376 if ($self->{path}->is_style_map) {
1377 $self->{deny_save} = 1;
1378 $self->{deny_reset} = 1;
1379 } else {
1380 $self->fix_auto_apply;
1381 $self->decay_objects;
1382 $self->update_buttons;
1383 $self->set_darkness_map;
1384 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1385 unless $self->difficulty; 1944 unless $self->difficulty;
1945 cf::cede_to_tick;
1946
1947 unless ($self->{deny_activate}) {
1948 $self->decay_objects;
1949 $self->fix_auto_apply;
1950 $self->update_buttons;
1951 cf::cede_to_tick;
1952 $self->set_darkness_map;
1953 cf::cede_to_tick;
1386 $self->activate; 1954 $self->activate;
1387 } 1955 }
1388 1956
1389 Coro::cede; 1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1390 1959
1391 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1961 }
1962
1963 $self->post_load;
1964}
1965
1966sub customise_for {
1967 my ($self, $ob) = @_;
1968
1969 return find "~" . $ob->name . "/" . $self->{path}
1970 if $self->per_player;
1971
1972# return find "?party/" . $ob->name . "/" . $self->{path}
1973# if $self->per_party;
1974
1975 $self
1392} 1976}
1393 1977
1394# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1395sub load_diag { 1979sub load_neighbours {
1396 my ($map) = @_; 1980 my ($map) = @_;
1397 1981
1398 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1399 1983
1400 for (0 .. 3) { 1984 for (0 .. 3) {
1401 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1402 or next; 1986 or next;
1403 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1404 or next; 1988 or next;
1405 $neigh->load; 1989 $neigh->load;
1406 1990
1991 push @neigh,
1407 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1408 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1409 } 1994 }
1410 1995
1411 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1412 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1413 or next; 1999 or next;
1414 $neigh->load; 2000 $neigh->load;
1415 } 2001 }
1416} 2002}
1417 2003
1422} 2008}
1423 2009
1424sub do_load_sync { 2010sub do_load_sync {
1425 my ($map) = @_; 2011 my ($map) = @_;
1426 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1427 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1428} 2017}
1429 2018
1430our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
2020our $MAP_PREFETCHER = undef;
2021
2022sub find_async {
2023 my ($path, $origin, $load) = @_;
2024
2025 $path = normalise $path, $origin && $origin->{path};
2026
2027 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2029 }
2030
2031 $MAP_PREFETCH{$path} |= $load;
2032
1431our $MAP_PREFETCHER = Coro::async { 2033 $MAP_PREFETCHER ||= cf::async {
1432 while () {
1433 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1434 my $key = each %MAP_PREFETCH 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1435 or next; 2036 if (my $map = find $k) {
2037 $map->load if $v;
2038 }
2039
1436 my $path = delete $MAP_PREFETCH{$key}; 2040 delete $MAP_PREFETCH{$k};
1437
1438 my $map = find $path
1439 or next;
1440 $map->load;
1441 } 2041 }
1442 Coro::schedule; 2042 }
2043 undef $MAP_PREFETCHER;
1443 } 2044 };
1444};
1445
1446sub find_async {
1447 my ($path, $origin) = @_;
1448
1449 $path = new cf::path $path, $origin && $origin->path;
1450 my $key = $path->as_string;
1451
1452 if (my $map = $cf::MAP{$key}) {
1453 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1454 }
1455
1456 $MAP_PREFETCH{$key} = $path;
1457 $MAP_PREFETCHER->ready; 2045 $MAP_PREFETCHER->prio (6);
1458 2046
1459 () 2047 ()
1460} 2048}
1461 2049
1462sub save { 2050sub save {
1463 my ($self) = @_; 2051 my ($self) = @_;
1464 2052
1465 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1466 2054
1467 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1468 2056
1469 return unless $self->dirty; 2057 return unless $self->dirty;
1470 2058
1471 my $save = $self->{path}->save_path; utf8::encode $save; 2059 my $save = $self->save_path; utf8::encode $save;
1472 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 2060 my $uniq = $self->uniq_path; utf8::encode $uniq;
1473 2061
1474 $self->{load_path} = $save; 2062 $self->{load_path} = $save;
1475 2063
1476 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1477 2065
1480 cf::async { 2068 cf::async {
1481 $_->contr->save for $self->players; 2069 $_->contr->save for $self->players;
1482 }; 2070 };
1483 2071
1484 if ($uniq) { 2072 if ($uniq) {
1485 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1486 $self->save_objects ($uniq, cf::IO_UNIQUES); 2074 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1487 } else { 2075 } else {
1488 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2076 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1489 } 2077 }
1490} 2078}
1491 2079
1492sub swap_out { 2080sub swap_out {
1493 my ($self) = @_; 2081 my ($self) = @_;
1494 2082
1495 # save first because save cedes 2083 # save first because save cedes
1496 $self->save; 2084 $self->save;
1497 2085
1498 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1499 2087
1500 return if $self->players; 2088 return if $self->players;
1501 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1502 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1503 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1504 $self->clear; 2096 $self->clear;
1505 $self->in_memory (cf::MAP_SWAPPED);
1506} 2097}
1507 2098
1508sub reset_at { 2099sub reset_at {
1509 my ($self) = @_; 2100 my ($self) = @_;
1510 2101
1511 # TODO: safety, remove and allow resettable per-player maps 2102 # TODO: safety, remove and allow resettable per-player maps
1512 return 1e99 if $self->{path}{user_rel};
1513 return 1e99 if $self->{deny_reset}; 2103 return 1e99 if $self->{deny_reset};
1514 2104
1515 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2105 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1516 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2106 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1517 2107
1522 my ($self) = @_; 2112 my ($self) = @_;
1523 2113
1524 $self->reset_at <= $cf::RUNTIME 2114 $self->reset_at <= $cf::RUNTIME
1525} 2115}
1526 2116
1527sub unlink_save {
1528 my ($self) = @_;
1529
1530 utf8::encode (my $save = $self->{path}->save_path);
1531 aioreq_pri 3; IO::AIO::aio_unlink $save;
1532 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1533}
1534
1535sub rename {
1536 my ($self, $new_path) = @_;
1537
1538 $self->unlink_save;
1539
1540 delete $cf::MAP{$self->path};
1541 $self->{path} = new cf::path $new_path;
1542 $self->path ($self->{path}->as_string);
1543 $cf::MAP{$self->path} = $self;
1544
1545 $self->save;
1546}
1547
1548sub reset { 2117sub reset {
1549 my ($self) = @_; 2118 my ($self) = @_;
1550 2119
1551 my $lock = cf::lock_acquire "map_data:" . $self->path; 2120 my $lock = cf::lock_acquire "map_data:$self->{path}";
1552 2121
1553 return if $self->players; 2122 return if $self->players;
1554 return if $self->{path}{user_rel};#d#
1555 2123
1556 warn "resetting map ", $self->path;#d# 2124 warn "resetting map ", $self->path;
2125
2126 $self->in_memory (cf::MAP_SWAPPED);
2127
2128 # need to save uniques path
2129 unless ($self->{deny_save}) {
2130 my $uniq = $self->uniq_path; utf8::encode $uniq;
2131
2132 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2133 if $uniq;
2134 }
1557 2135
1558 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
1559 2137
2138 $self->deactivate;
1560 $_->clear_links_to ($self) for values %cf::MAP; 2139 $_->clear_links_to ($self) for values %cf::MAP;
2140 $self->clear;
1561 2141
1562 $self->unlink_save; 2142 $self->unlink_save;
1563 $self->destroy; 2143 $self->destroy;
1564} 2144}
1565 2145
1566my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
1567 2147
1568sub nuke { 2148sub nuke {
1569 my ($self) = @_; 2149 my ($self) = @_;
1570 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2154 delete $cf::MAP{$self->path};
2155
2156 $self->unlink_save;
2157
2158 bless $self, "cf::map";
2159 delete $self->{deny_reset};
1571 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
1572 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
1573 $self->rename ("{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2163
2164 $cf::MAP{$self->path} = $self;
2165 }
2166
1574 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
1575} 2168}
1576 2169
1577sub customise_for { 2170=item $maps = cf::map::tmp_maps
1578 my ($map, $ob) = @_;
1579 2171
1580 if ($map->per_player) { 2172Returns an arrayref with all map paths of currently instantiated and saved
1581 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 2173maps. May block.
2174
2175=cut
2176
2177sub tmp_maps() {
1582 } 2178 [
2179 map {
2180 utf8::decode $_;
2181 /\.map$/
2182 ? normalise $_
2183 : ()
2184 } @{ aio_readdir $TMPDIR or [] }
2185 ]
2186}
1583 2187
1584 $map 2188=item $maps = cf::map::random_maps
2189
2190Returns an arrayref with all map paths of currently instantiated and saved
2191random maps. May block.
2192
2193=cut
2194
2195sub random_maps() {
2196 [
2197 map {
2198 utf8::decode $_;
2199 /\.map$/
2200 ? normalise "?random/$_"
2201 : ()
2202 } @{ aio_readdir $RANDOMDIR or [] }
2203 ]
1585} 2204}
1586 2205
1587=item cf::map::unique_maps 2206=item cf::map::unique_maps
1588 2207
1589Returns an arrayref of cf::path's of all shared maps that have 2208Returns an arrayref of paths of all shared maps that have
1590instantiated unique items. May block. 2209instantiated unique items. May block.
1591 2210
1592=cut 2211=cut
1593 2212
1594sub unique_maps() { 2213sub unique_maps() {
1595 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2214 [
1596 or return; 2215 map {
1597
1598 my @paths;
1599
1600 for (@$files) {
1601 utf8::decode $_; 2216 utf8::decode $_;
1602 next if /\.pst$/; 2217 /\.map$/
1603 next unless /^$PATH_SEP/o; 2218 ? normalise $_
1604 2219 : ()
1605 push @paths, new cf::path $_; 2220 } @{ aio_readdir $UNIQUEDIR or [] }
1606 } 2221 ]
1607
1608 \@paths
1609} 2222}
1610 2223
1611package cf; 2224package cf;
1612 2225
1613=back 2226=back
1631 map { $_, inv_recursive_ $_->inv } @_ 2244 map { $_, inv_recursive_ $_->inv } @_
1632} 2245}
1633 2246
1634sub inv_recursive { 2247sub inv_recursive {
1635 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2249}
2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
1636} 2280}
1637 2281
1638package cf; 2282package cf;
1639 2283
1640=back 2284=back
1659 2303
1660 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2304 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1661 2305
1662 if ($self->{record_replies}) { 2306 if ($self->{record_replies}) {
1663 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2307 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2308
1664 } else { 2309 } else {
2310 my $pl = $self->contr;
2311
2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2313 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315
2316 } else {
1665 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
1666 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2319 }
1667 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
1668} 2331}
1669 2332
1670=item $player_object->may ("access") 2333=item $player_object->may ("access")
1671 2334
1672Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
1685 2348
1686=item $player_object->enter_link 2349=item $player_object->enter_link
1687 2350
1688Freezes the player and moves him/her to a special map (C<{link}>). 2351Freezes the player and moves him/her to a special map (C<{link}>).
1689 2352
1690The player should be reaosnably safe there for short amounts of time. You 2353The player should be reasonably safe there for short amounts of time. You
1691I<MUST> call C<leave_link> as soon as possible, though. 2354I<MUST> call C<leave_link> as soon as possible, though.
1692 2355
2356Will never block.
2357
1693=item $player_object->leave_link ($map, $x, $y) 2358=item $player_object->leave_link ($map, $x, $y)
1694 2359
1695Moves the player out of the specila link map onto the given map. If the 2360Moves the player out of the special C<{link}> map onto the specified
1696map is not valid (or omitted), the player will be moved back to the 2361map. If the map is not valid (or omitted), the player will be moved back
1697location he/she was before the call to C<enter_link>, or, if that fails, 2362to the location he/she was before the call to C<enter_link>, or, if that
1698to the emergency map position. 2363fails, to the emergency map position.
1699 2364
1700Might block. 2365Might block.
1701 2366
1702=cut 2367=cut
2368
2369sub link_map {
2370 unless ($LINK_MAP) {
2371 $LINK_MAP = cf::map::find "{link}"
2372 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
2373 $LINK_MAP->load;
2374 }
2375
2376 $LINK_MAP
2377}
1703 2378
1704sub cf::object::player::enter_link { 2379sub cf::object::player::enter_link {
1705 my ($self) = @_; 2380 my ($self) = @_;
1706 2381
1707 $self->deactivate_recursive; 2382 $self->deactivate_recursive;
1708 2383
1709 return if $self->map == $LINK_MAP; 2384 return if UNIVERSAL::isa $self->map, "ext::map_link";
1710 2385
1711 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2386 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1712 if $self->map; 2387 if $self->map && $self->map->{path} ne "{link}";
1713 2388
1714 $self->enter_map ($LINK_MAP, 20, 20); 2389 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1715} 2390}
1716 2391
1717sub cf::object::player::leave_link { 2392sub cf::object::player::leave_link {
1718 my ($self, $map, $x, $y) = @_; 2393 my ($self, $map, $x, $y) = @_;
2394
2395 return unless $self->contr->active;
1719 2396
1720 my $link_pos = delete $self->{_link_pos}; 2397 my $link_pos = delete $self->{_link_pos};
1721 2398
1722 unless ($map) { 2399 unless ($map) {
1723 # restore original map position 2400 # restore original map position
1737 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
1738 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
1739 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
1740 2417
1741 $map->load; 2418 $map->load;
1742 $map->load_diag; 2419 $map->load_neighbours;
1743 2420
1744 return unless $self->contr->active; 2421 return unless $self->contr->active;
1745 $self->activate_recursive; 2422 $self->activate_recursive;
2423
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1746 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
1747} 2426}
1748 2427
1749cf::player->attach ( 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1750 on_logout => sub {
1751 my ($pl) = @_;
1752 2429
1753 # abort map switching before logout 2430Moves the player to the given map-path and coordinates by first freezing
1754 if ($pl->ob->{_link_pos}) { 2431her, loading and preparing them map, calling the provided $check callback
1755 cf::sync_job { 2432that has to return the map if sucecssful, and then unfreezes the player on
1756 $pl->ob->leave_link 2433the new (success) or old (failed) map position. In either case, $done will
1757 }; 2434be called at the end of this process.
1758 }
1759 },
1760 on_login => sub {
1761 my ($pl) = @_;
1762 2435
1763 # try to abort aborted map switching on player login :)
1764 # should happen only on crashes
1765 if ($pl->ob->{_link_pos}) {
1766 $pl->ob->enter_link;
1767 (async {
1768 # we need this sleep as the login has a concurrent enter_exit running
1769 # and this sleep increases chances of the player not ending up in scorn
1770 $pl->ob->reply (undef,
1771 "There was an internal problem at your last logout, "
1772 . "the server will try to bring you to your intended destination in a second.",
1773 cf::NDI_RED);
1774 Coro::Timer::sleep 1;
1775 $pl->ob->leave_link;
1776 })->prio (2);
1777 }
1778 },
1779);
1780
1781=item $player_object->goto ($path, $x, $y)
1782
1783=cut 2436=cut
2437
2438our $GOTOGEN;
1784 2439
1785sub cf::object::player::goto { 2440sub cf::object::player::goto {
1786 my ($self, $path, $x, $y) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
1787 2442
1788 $path = new cf::path $path; 2443 # do generation counting so two concurrent goto's will be executed in-order
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1789 2445
1790 $self->enter_link; 2446 $self->enter_link;
1791 2447
1792 (async { 2448 (async {
2449 my $map = eval {
1793 my $map = cf::map::find $path->as_string; 2450 my $map = cf::map::find $path;
2451
2452 if ($map) {
1794 $map = $map->customise_for ($self) if $map; 2453 $map = $map->customise_for ($self);
1795 2454 $map = $check->($map) if $check && $map;
1796# warn "entering ", $map->path, " at ($x, $y)\n" 2455 } else {
1797# if $map;
1798
1799 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2457 }
1800 2458
2459 $map
2460 };
2461
2462 if ($@) {
2463 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2464 LOG llevError | logBacktrace, Carp::longmess $@;
2465 }
2466
2467 if ($gen == $self->{_goto_generation}) {
2468 delete $self->{_goto_generation};
1801 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2470 }
2471
2472 $done->() if $done;
1802 })->prio (1); 2473 })->prio (1);
1803} 2474}
1804 2475
1805=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
1806 2477
1808 2479
1809sub parse_random_map_params { 2480sub parse_random_map_params {
1810 my ($spec) = @_; 2481 my ($spec) = @_;
1811 2482
1812 my $rmp = { # defaults 2483 my $rmp = { # defaults
1813 xsize => 10, 2484 xsize => (cf::rndm 15, 40),
1814 ysize => 10, 2485 ysize => (cf::rndm 15, 40),
2486 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2487 #layout => string,
1815 }; 2488 };
1816 2489
1817 for (split /\n/, $spec) { 2490 for (split /\n/, $spec) {
1818 my ($k, $v) = split /\s+/, $_, 2; 2491 my ($k, $v) = split /\s+/, $_, 2;
1819 2492
1823 $rmp 2496 $rmp
1824} 2497}
1825 2498
1826sub prepare_random_map { 2499sub prepare_random_map {
1827 my ($exit) = @_; 2500 my ($exit) = @_;
2501
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
1828 2503
1829 # all this does is basically replace the /! path by 2504 # all this does is basically replace the /! path by
1830 # a new random map path (?random/...) with a seed 2505 # a new random map path (?random/...) with a seed
1831 # that depends on the exit object 2506 # that depends on the exit object
1832 2507
1833 my $rmp = parse_random_map_params $exit->msg; 2508 my $rmp = parse_random_map_params $exit->msg;
1834 2509
1835 if ($exit->map) { 2510 if ($exit->map) {
1836 $rmp->{region} = $exit->map->region_name; 2511 $rmp->{region} = $exit->region->name;
1837 $rmp->{origin_map} = $exit->map->path; 2512 $rmp->{origin_map} = $exit->map->path;
1838 $rmp->{origin_x} = $exit->x; 2513 $rmp->{origin_x} = $exit->x;
1839 $rmp->{origin_y} = $exit->y; 2514 $rmp->{origin_y} = $exit->y;
1840 } 2515 }
1841 2516
1842 $rmp->{random_seed} ||= $exit->random_seed; 2517 $rmp->{random_seed} ||= $exit->random_seed;
1843 2518
1844 my $data = cf::to_json $rmp; 2519 my $data = cf::to_json $rmp;
1845 my $md5 = Digest::MD5::md5_hex $data; 2520 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta";
1846 2522
1847 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1848 aio_write $fh, 0, (length $data), $data, 0; 2524 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh;
2526 aio_rename "$meta~", $meta;
1849 2527
1850 $exit->slaying ("?random/$md5"); 2528 $exit->slaying ("?random/$md5");
1851 $exit->msg (undef); 2529 $exit->msg (undef);
1852 } 2530 }
1853} 2531}
1855sub cf::object::player::enter_exit { 2533sub cf::object::player::enter_exit {
1856 my ($self, $exit) = @_; 2534 my ($self, $exit) = @_;
1857 2535
1858 return unless $self->type == cf::PLAYER; 2536 return unless $self->type == cf::PLAYER;
1859 2537
2538 if ($exit->slaying eq "/!") {
2539 #TODO: this should de-fi-ni-te-ly not be a sync-job
2540 # the problem is that $exit might not survive long enough
2541 # so it needs to be done right now, right here
2542 cf::sync_job { prepare_random_map $exit };
2543 }
2544
2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2546 my $hp = $exit->stats->hp;
2547 my $sp = $exit->stats->sp;
2548
1860 $self->enter_link; 2549 $self->enter_link;
2550
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
1861 2554
1862 (async { 2555 (async {
1863 $self->deactivate_recursive; # just to be sure 2556 $self->deactivate_recursive; # just to be sure
1864 unless (eval { 2557 unless (eval {
1865 prepare_random_map $exit 2558 $self->goto ($slaying, $hp, $sp);
1866 if $exit->slaying eq "/!";
1867
1868 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1869 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1870 2559
1871 1; 2560 1;
1872 }) { 2561 }) {
1873 $self->message ("Something went wrong deep within the crossfire server. " 2562 $self->message ("Something went wrong deep within the crossfire server. "
1874 . "I'll try to bring you back to the map you were before. " 2563 . "I'll try to bring you back to the map you were before. "
1875 . "Please report this to the dungeon master!", 2564 . "Please report this to the dungeon master!",
1876 cf::NDI_UNIQUE | cf::NDI_RED); 2565 cf::NDI_UNIQUE | cf::NDI_RED);
1877 2566
1878 warn "ERROR in enter_exit: $@"; 2567 warn "ERROR in enter_exit: $@";
1879 $self->leave_link; 2568 $self->leave_link;
1880 } 2569 }
1881 })->prio (1); 2570 })->prio (1);
1894 2583
1895sub cf::client::send_drawinfo { 2584sub cf::client::send_drawinfo {
1896 my ($self, $text, $flags) = @_; 2585 my ($self, $text, $flags) = @_;
1897 2586
1898 utf8::encode $text; 2587 utf8::encode $text;
1899 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1900} 2589}
1901 2590
2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2592
2593Send a drawinfo or msg packet to the client, formatting the msg for the
2594client if neccessary. C<$type> should be a string identifying the type of
2595the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet.
2597
2598=cut
2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2615sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_;
2617
2618 $msg = $self->pl->expand_cfpod ($msg);
2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2636 return unless @extra || length $msg;
2637
2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2645 } else {
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670}
2671
2672=item $client->ext_msg ($type, @msg)
2673
2674Sends an ext event to the client.
2675
2676=cut
2677
2678sub cf::client::ext_msg($$@) {
2679 my ($self, $type, @msg) = @_;
2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2684 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2705}
1902 2706
1903=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
1904 2708
1905Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
1906the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2710the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1907C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2711C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1908 2712
1909Queries can fail, so check the return code. Or don't, as queries will become 2713Queries can fail, so check the return code. Or don't, as queries will
1910reliable at some point in the future. 2714become reliable at some point in the future.
1911 2715
1912=cut 2716=cut
1913 2717
1914sub cf::client::query { 2718sub cf::client::query {
1915 my ($self, $flags, $text, $cb) = @_; 2719 my ($self, $flags, $text, $cb) = @_;
1923 utf8::encode $text; 2727 utf8::encode $text;
1924 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2728 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1925 2729
1926 $self->send_packet ($self->{query_queue}[0][0]) 2730 $self->send_packet ($self->{query_queue}[0][0])
1927 if @{ $self->{query_queue} } == 1; 2731 if @{ $self->{query_queue} } == 1;
2732
2733 1
1928} 2734}
1929 2735
1930cf::client->attach ( 2736cf::client->attach (
2737 on_connect => sub {
2738 my ($ns) = @_;
2739
2740 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2741 },
1931 on_reply => sub { 2742 on_reply => sub {
1932 my ($ns, $msg) = @_; 2743 my ($ns, $msg) = @_;
1933 2744
1934 # this weird shuffling is so that direct followup queries 2745 # this weird shuffling is so that direct followup queries
1935 # get handled first 2746 # get handled first
1936 my $queue = delete $ns->{query_queue} 2747 my $queue = delete $ns->{query_queue}
1937 or return; # be conservative, not sure how that can happen, but we saw a crash here 2748 or return; # be conservative, not sure how that can happen, but we saw a crash here
1938 2749
1939 (shift @$queue)->[1]->($msg); 2750 (shift @$queue)->[1]->($msg);
2751 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1940 2752
1941 push @{ $ns->{query_queue} }, @$queue; 2753 push @{ $ns->{query_queue} }, @$queue;
1942 2754
1943 if (@{ $ns->{query_queue} } == @$queue) { 2755 if (@{ $ns->{query_queue} } == @$queue) {
1944 if (@$queue) { 2756 if (@$queue) {
1946 } else { 2758 } else {
1947 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2759 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1948 } 2760 }
1949 } 2761 }
1950 }, 2762 },
2763 on_exticmd => sub {
2764 my ($ns, $buf) = @_;
2765
2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2767
2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2776 if (my $cb = $EXTICMD{$type}) {
2777 @reply = $cb->($ns, @payload);
2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2783 } else {
2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2785 }
2786
2787 cf::override;
2788 },
1951); 2789);
1952 2790
1953=item $client->async (\&cb) 2791=item $client->async (\&cb)
1954 2792
1955Create a new coroutine, running the specified callback. The coroutine will 2793Create a new coroutine, running the specified callback. The coroutine will
1996our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
1997our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
1998 2836
1999$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2000 2838
2001$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2002 2844
2003# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2004 2846
2005=pod 2847=pod
2006 2848
2007The following fucntions and emthods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2008 2850
2009 cf::object contr pay_amount pay_player map 2851 cf::object
2852 contr pay_amount pay_player map x y force_find force_add
2853 insert remove name archname title slaying race decrease_ob_nr
2854
2010 cf::object::player player 2855 cf::object::player
2011 cf::player peaceful 2856 player
2012 cf::map trigger 2857
2858 cf::player
2859 peaceful
2860
2861 cf::map
2862 trigger
2013 2863
2014=cut 2864=cut
2015 2865
2016for ( 2866for (
2017 ["cf::object" => qw(contr pay_amount pay_player map)], 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2018 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2019 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2020 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2021) { 2873) {
2022 no strict 'refs'; 2874 no strict 'refs';
2093=back 2945=back
2094 2946
2095=cut 2947=cut
2096 2948
2097############################################################################# 2949#############################################################################
2950# the server's init and main functions
2098 2951
2099=head2 EXTENSION DATABASE SUPPORT 2952sub load_facedata($) {
2953 my ($path) = @_;
2100 2954
2101Crossfire maintains a very simple database for extension use. It can 2955 # HACK to clear player env face cache, we need some signal framework
2102currently store anything that can be serialised using Storable, which 2956 # for this (global event?)
2103excludes objects. 2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2104 2958
2105The parameter C<$family> should best start with the name of the extension 2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2106using it, it should be unique.
2107 2960
2108=over 4 2961 warn "loading facedata from $path\n";
2109 2962
2110=item $hashref = cf::db_get $family 2963 my $facedata;
2964 0 < aio_load $path, $facedata
2965 or die "$path: $!";
2111 2966
2112Return a hashref for use by the extension C<$family>, which can be 2967 $facedata = Coro::Storable::thaw $facedata;
2113modified. After modifications, you have to call C<cf::db_dirty> or
2114C<cf::db_sync>.
2115 2968
2116=item $value = cf::db_get $family => $key 2969 $facedata->{version} == 2
2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2117 2971
2118Returns a single value from the database 2972 # patch in the exptable
2119 2973 $facedata->{resource}{"res/exp_table"} = {
2120=item cf::db_put $family => $hashref 2974 type => FT_RSRC,
2121 2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2122Stores the given family hashref into the database. Updates are delayed, if
2123you want the data to be synced to disk immediately, use C<cf::db_sync>.
2124
2125=item cf::db_put $family => $key => $value
2126
2127Stores the given C<$value> in the family hash. Updates are delayed, if you
2128want the data to be synced to disk immediately, use C<cf::db_sync>.
2129
2130=item cf::db_dirty
2131
2132Marks the database as dirty, to be updated at a later time.
2133
2134=item cf::db_sync
2135
2136Immediately write the database to disk I<if it is dirty>.
2137
2138=cut
2139
2140our $DB;
2141
2142{
2143 my $path = cf::localdir . "/database.pst";
2144
2145 sub db_load() {
2146 $DB = stat $path ? Storable::retrieve $path : { };
2147 }
2148
2149 my $pid;
2150
2151 sub db_save() {
2152 waitpid $pid, 0 if $pid;
2153 if (0 == ($pid = fork)) {
2154 $DB->{_meta}{version} = 1;
2155 Storable::nstore $DB, "$path~";
2156 rename "$path~", $path;
2157 cf::_exit 0 if defined $pid;
2158 }
2159 }
2160
2161 my $dirty;
2162
2163 sub db_sync() {
2164 db_save if $dirty;
2165 undef $dirty;
2166 }
2167
2168 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2169 db_sync;
2170 }); 2976 };
2977 cf::cede_to_tick;
2171 2978
2172 sub db_dirty() {
2173 $dirty = 1;
2174 $idle->start;
2175 } 2979 {
2980 my $faces = $facedata->{faceinfo};
2176 2981
2177 sub db_get($;$) { 2982 while (my ($face, $info) = each %$faces) {
2178 @_ >= 2 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2179 ? $DB->{$_[0]}{$_[1]} 2984 cf::face::set_visibility $idx, $info->{visibility};
2180 : ($DB->{$_[0]} ||= { }) 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2181 } 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2182 2988
2183 sub db_put($$;$) { 2989 cf::cede_to_tick;
2184 if (@_ >= 3) {
2185 $DB->{$_[0]}{$_[1]} = $_[2];
2186 } else {
2187 $DB->{$_[0]} = $_[1];
2188 }
2189 db_dirty;
2190 }
2191
2192 cf::global->attach (
2193 prio => 10000,
2194 on_cleanup => sub {
2195 db_sync;
2196 }, 2990 }
2197 );
2198}
2199 2991
2200############################################################################# 2992 while (my ($face, $info) = each %$faces) {
2201# the server's main() 2993 next unless $info->{smooth};
2994 my $idx = cf::face::find $face
2995 or next;
2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
3001 }
2202 3002
2203sub cfg_load { 3003 cf::cede_to_tick;
3004 }
3005 }
3006
3007 {
3008 my $anims = $facedata->{animinfo};
3009
3010 while (my ($anim, $info) = each %$anims) {
3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
3012 cf::cede_to_tick;
3013 }
3014
3015 cf::anim::invalidate_all; # d'oh
3016 }
3017
3018 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource};
3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028
3029 if ($info->{type} & 1) {
3030 # prepend meta info
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else {
3039 $data = $info->{data};
3040 }
3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 }
3066
3067 1
3068}
3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
3083 load_resource_file "$MAPDIR/regions"
3084 or die "unable to load regions file\n";
3085
3086 for (cf::region::list) {
3087 $_->{match} = qr/$_->{match}/
3088 if exists $_->{match};
3089 }
3090}
3091
3092sub reload_facedata {
3093 load_facedata "$DATADIR/facedata"
3094 or die "unable to load facedata\n";
3095}
3096
3097sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
3105}
3106
3107sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n";
3110}
3111
3112sub reload_resources {
3113 warn "reloading resource files...\n";
3114
3115 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures;
3120
3121 warn "finished reloading resource files\n";
3122}
3123
3124sub init {
3125 reload_resources;
3126}
3127
3128sub reload_config {
2204 open my $fh, "<:utf8", cf::confdir . "/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2205 or return; 3130 or return;
2206 3131
2207 local $/; 3132 local $/;
2208 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
2209 3134
2223 3148
2224sub main { 3149sub main {
2225 # we must not ever block the main coroutine 3150 # we must not ever block the main coroutine
2226 local $Coro::idle = sub { 3151 local $Coro::idle = sub {
2227 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async {
2228 async { Event::one_event }; 3154 Event::one_event;
3155 })->prio (Coro::PRIO_MAX);
2229 }; 3156 };
2230 3157
2231 cfg_load; 3158 reload_config;
2232 db_load; 3159 db_init;
2233 load_extensions; 3160 load_extensions;
3161
3162 $TICK_WATCHER->start;
2234 Event::loop; 3163 Event::loop;
2235} 3164}
2236 3165
2237############################################################################# 3166#############################################################################
2238# initialisation and cleanup 3167# initialisation and cleanup
2239 3168
2240# install some emergency cleanup handlers 3169# install some emergency cleanup handlers
2241BEGIN { 3170BEGIN {
2242 for my $signal (qw(INT HUP TERM)) { 3171 for my $signal (qw(INT HUP TERM)) {
2243 Event->signal ( 3172 Event->signal (
3173 reentrant => 0,
2244 data => WF_AUTOCANCEL, 3174 data => WF_AUTOCANCEL,
2245 signal => $signal, 3175 signal => $signal,
3176 prio => 0,
2246 cb => sub { 3177 cb => sub {
2247 cf::cleanup "SIG$signal"; 3178 cf::cleanup "SIG$signal";
2248 }, 3179 },
2249 ); 3180 );
2250 } 3181 }
2251} 3182}
2252 3183
3184sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time.
3189
3190 IO::AIO::aio_utime $runtime, undef, undef;
3191
3192 my $guard = cf::lock_acquire "write_runtime";
3193
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3195 or return;
3196
3197 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server.
3200
3201 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3202 and return;
3203
3204 # always fsync - this file is important
3205 aio_fsync $fh
3206 and return;
3207
3208 # touch it again to show we are up-to-date
3209 aio_utime $fh, undef, undef;
3210
3211 close $fh
3212 or return;
3213
3214 aio_rename "$runtime~", $runtime
3215 and return;
3216
3217 warn "runtime file written.\n";
3218
3219 1
3220}
3221
2253sub emergency_save() { 3222sub emergency_save() {
2254 my $freeze_guard = cf::freeze_mainloop; 3223 my $freeze_guard = cf::freeze_mainloop;
2255 3224
2256 warn "enter emergency perl save\n"; 3225 warn "enter emergency perl save\n";
2257 3226
2258 cf::sync_job { 3227 cf::sync_job {
2259 # use a peculiar iteration method to avoid tripping on perl 3228 # use a peculiar iteration method to avoid tripping on perl
2260 # refcount bugs in for. also avoids problems with players 3229 # refcount bugs in for. also avoids problems with players
2261 # and maps saved/Destroyed asynchronously. 3230 # and maps saved/destroyed asynchronously.
2262 warn "begin emergency player save\n"; 3231 warn "begin emergency player save\n";
2263 for my $login (keys %cf::PLAYER) { 3232 for my $login (keys %cf::PLAYER) {
2264 my $pl = $cf::PLAYER{$login} or next; 3233 my $pl = $cf::PLAYER{$login} or next;
2265 $pl->valid or next; 3234 $pl->valid or next;
2266 $pl->save; 3235 $pl->save;
2272 my $map = $cf::MAP{$path} or next; 3241 my $map = $cf::MAP{$path} or next;
2273 $map->valid or next; 3242 $map->valid or next;
2274 $map->save; 3243 $map->save;
2275 } 3244 }
2276 warn "end emergency map save\n"; 3245 warn "end emergency map save\n";
3246
3247 warn "begin emergency database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV;
3249 warn "end emergency database checkpoint\n";
2277 }; 3250 };
2278 3251
2279 warn "leave emergency perl save\n"; 3252 warn "leave emergency perl save\n";
2280} 3253}
2281 3254
3255sub post_cleanup {
3256 my ($make_core) = @_;
3257
3258 warn Carp::longmess "post_cleanup backtrace"
3259 if $make_core;
3260}
3261
2282sub reload() { 3262sub do_reload_perl() {
2283 # can/must only be called in main 3263 # can/must only be called in main
2284 if ($Coro::current != $Coro::main) { 3264 if ($Coro::current != $Coro::main) {
2285 warn "can only reload from main coroutine\n"; 3265 warn "can only reload from main coroutine";
2286 return; 3266 return;
2287 } 3267 }
2288 3268
2289 warn "reloading..."; 3269 warn "reloading...";
2290 3270
2291 warn "freezing server"; 3271 warn "entering sync_job";
2292 my $guard = freeze_mainloop; 3272
3273 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark
2293 cf::emergency_save; 3275 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark
2294 3277
2295 warn "sync database to disk"; 3278 warn "syncing database to disk";
2296 cf::db_sync; 3279 BDB::db_env_txn_checkpoint $DB_ENV;
2297 IO::AIO::flush;
2298 3280
2299 eval {
2300 # if anything goes wrong in here, we should simply crash as we already saved 3281 # if anything goes wrong in here, we should simply crash as we already saved
2301 3282
2302 warn "cancel all watchers"; 3283 warn "cancelling all WF_AUTOCANCEL watchers";
2303 for (Event::all_watchers) { 3284 for (Event::all_watchers) {
2304 $_->cancel if $_->data & WF_AUTOCANCEL; 3285 $_->cancel if $_->data & WF_AUTOCANCEL;
2305 } 3286 }
2306 3287
3288 warn "flushing outstanding aio requests";
3289 for (;;) {
3290 BDB::flush;
3291 IO::AIO::flush;
3292 Coro::cede;
3293 last unless IO::AIO::nreqs || BDB::nreqs;
3294 warn "iterate...";
3295 }
3296
3297 ++$RELOAD;
3298
2307 warn "cancel all extension coros"; 3299 warn "cancelling all extension coros";
2308 $_->cancel for values %EXT_CORO; 3300 $_->cancel for values %EXT_CORO;
2309 %EXT_CORO = (); 3301 %EXT_CORO = ();
2310 3302
2311 warn "remove commands"; 3303 warn "removing commands";
2312 %COMMAND = (); 3304 %COMMAND = ();
2313 3305
2314 warn "remove ext commands"; 3306 warn "removing ext/exti commands";
2315 %EXTCMD = (); 3307 %EXTCMD = ();
3308 %EXTICMD = ();
2316 3309
2317 warn "unload/nuke all extensions"; 3310 warn "unloading/nuking all extensions";
2318 for my $pkg (@EXTS) { 3311 for my $pkg (@EXTS) {
2319 warn "... unloading $pkg"; 3312 warn "... unloading $pkg";
2320 3313
2321 if (my $cb = $pkg->can ("unload")) { 3314 if (my $cb = $pkg->can ("unload")) {
2322 eval { 3315 eval {
2327 3320
2328 warn "... nuking $pkg"; 3321 warn "... nuking $pkg";
2329 Symbol::delete_package $pkg; 3322 Symbol::delete_package $pkg;
2330 } 3323 }
2331 3324
2332 warn "unload all perl modules loaded from $LIBDIR"; 3325 warn "unloading all perl modules loaded from $LIBDIR";
2333 while (my ($k, $v) = each %INC) { 3326 while (my ($k, $v) = each %INC) {
2334 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2335 3328
2336 warn "removing <$k>"; 3329 warn "... unloading $k";
2337 delete $INC{$k}; 3330 delete $INC{$k};
2338 3331
2339 $k =~ s/\.pm$//; 3332 $k =~ s/\.pm$//;
2340 $k =~ s/\//::/g; 3333 $k =~ s/\//::/g;
2341 3334
2344 } 3337 }
2345 3338
2346 Symbol::delete_package $k; 3339 Symbol::delete_package $k;
2347 } 3340 }
2348 3341
2349 warn "get rid of safe::, as good as possible"; 3342 warn "getting rid of safe::, as good as possible";
2350 Symbol::delete_package "safe::$_" 3343 Symbol::delete_package "safe::$_"
2351 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2352 3345
2353 warn "unload cf.pm \"a bit\""; 3346 warn "unloading cf.pm \"a bit\"";
2354 delete $INC{"cf.pm"}; 3347 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"};
2355 3349
2356 # don't, removes xs symbols, too, 3350 # don't, removes xs symbols, too,
2357 # and global variables created in xs 3351 # and global variables created in xs
2358 #Symbol::delete_package __PACKAGE__; 3352 #Symbol::delete_package __PACKAGE__;
2359 3353
3354 warn "unload completed, starting to reload now";
3355
2360 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
2361 require cf; 3357 require cf;
2362 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2363 3359
2364 warn "load config and database again"; 3360 warn "loading config and database again";
2365 cf::cfg_load; 3361 cf::reload_config;
2366 cf::db_load;
2367 3362
2368 warn "load extensions"; 3363 warn "loading extensions";
2369 cf::load_extensions; 3364 cf::load_extensions;
2370 3365
2371 warn "reattach attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
2372 _global_reattach; 3367 _global_reattach; # objects, sockets
2373 warn "reattach attachments to maps"; 3368 warn "reattaching attachments to maps";
2374 reattach $_ for values %MAP; 3369 reattach $_ for values %MAP;
2375 }; 3370 warn "reattaching attachments to players";
3371 reattach $_ for values %PLAYER;
2376 3372
2377 if ($@) { 3373 warn "leaving sync_job";
3374
3375 1
3376 } or do {
2378 warn $@; 3377 warn $@;
2379 warn "error while reloading, exiting."; 3378 warn "error while reloading, exiting.";
2380 exit 1; 3379 exit 1;
2381 } 3380 };
2382 3381
2383 warn "reloaded"; 3382 warn "reloaded";
2384}; 3383};
2385 3384
2386############################################################################# 3385our $RELOAD_WATCHER; # used only during reload
2387 3386
2388unless ($LINK_MAP) { 3387sub reload_perl() {
2389 $LINK_MAP = cf::map::new; 3388 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here.
2390 3390
2391 $LINK_MAP->width (41); 3391 $RELOAD_WATCHER ||= Event->timer (
2392 $LINK_MAP->height (41); 3392 reentrant => 0,
2393 $LINK_MAP->alloc;
2394 $LINK_MAP->path ("{link}");
2395 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2396 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2397
2398 # dirty hack because... archetypes are not yet loaded
2399 Event->timer (
2400 after => 10, 3393 after => 0,
3394 data => WF_AUTOCANCEL,
2401 cb => sub { 3395 cb => sub {
2402 $_[0]->w->cancel; 3396 do_reload_perl;
2403 3397 undef $RELOAD_WATCHER;
2404 # provide some exits "home"
2405 my $exit = cf::object::new "exit";
2406
2407 $exit->slaying ($EMERGENCY_POSITION->[0]);
2408 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2409 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2410
2411 $LINK_MAP->insert ($exit->clone, 19, 19);
2412 $LINK_MAP->insert ($exit->clone, 19, 20);
2413 $LINK_MAP->insert ($exit->clone, 19, 21);
2414 $LINK_MAP->insert ($exit->clone, 20, 19);
2415 $LINK_MAP->insert ($exit->clone, 20, 21);
2416 $LINK_MAP->insert ($exit->clone, 21, 19);
2417 $LINK_MAP->insert ($exit->clone, 21, 20);
2418 $LINK_MAP->insert ($exit->clone, 21, 21);
2419
2420 $exit->destroy;
2421 }); 3398 },
2422 3399 );
2423 $LINK_MAP->{deny_save} = 1;
2424 $LINK_MAP->{deny_reset} = 1;
2425
2426 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2427} 3400}
2428 3401
2429register_command "reload" => sub { 3402register_command "reload" => sub {
2430 my ($who, $arg) = @_; 3403 my ($who, $arg) = @_;
2431 3404
2432 if ($who->flag (FLAG_WIZ)) { 3405 if ($who->flag (FLAG_WIZ)) {
2433 $who->message ("start of reload.");
2434 reload;
2435 $who->message ("end of reload."); 3406 $who->message ("reloading server.");
3407 async { reload_perl };
2436 } 3408 }
2437}; 3409};
2438 3410
2439unshift @INC, $LIBDIR; 3411unshift @INC, $LIBDIR;
2440 3412
3413my $bug_warning = 0;
3414
3415our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN;
3417
3418sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main;
3421
3422 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait;
3425}
3426
3427sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main;
3430
3431 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait;
3434}
3435
3436 my $min = 1e6;#d#
3437 my $avg = 10;
2441$TICK_WATCHER = Event->timer ( 3438$TICK_WATCHER = Event->timer (
2442 reentrant => 0, 3439 reentrant => 0,
3440 parked => 1,
2443 prio => 0, 3441 prio => 0,
2444 at => $NEXT_TICK || $TICK, 3442 at => $NEXT_TICK || $TICK,
2445 data => WF_AUTOCANCEL, 3443 data => WF_AUTOCANCEL,
2446 cb => sub { 3444 cb => sub {
3445 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10;
3448 return;
3449 }
3450
3451 $NOW = $tick_start = Event::time;
3452
2447 cf::server_tick; # one server iteration 3453 cf::server_tick; # one server iteration
3454
3455 0 && sync_job {#d#
3456 for(1..10) {
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 };
3477
2448 $RUNTIME += $TICK; 3478 $RUNTIME += $TICK;
2449 $NEXT_TICK += $TICK; 3479 $NEXT_TICK += $TICK;
2450 3480
2451 $WAIT_FOR_TICK->broadcast; 3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2452 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
3483 Coro::async_pool {
3484 write_runtime
3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
3487 }
3488
3489# my $AFTER = Event::time;
3490# warn $AFTER - $NOW;#d#
3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send;
3494 }
3495 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send;
3497 }
3498
3499 $NOW = Event::time;
2453 3500
2454 # if we are delayed by four ticks or more, skip them all 3501 # if we are delayed by four ticks or more, skip them all
2455 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2456 3503
2457 $TICK_WATCHER->at ($NEXT_TICK); 3504 $TICK_WATCHER->at ($NEXT_TICK);
2458 $TICK_WATCHER->start; 3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509
3510 _post_tick;
3511
3512
2459 }, 3513 },
2460); 3514);
2461 3515
3516{
2462IO::AIO::max_poll_time $TICK * 0.2; 3517 BDB::max_poll_time $TICK * 0.1;
2463 3518 $BDB_POLL_WATCHER = Event->io (
2464Event->io ( 3519 reentrant => 0,
2465 fd => IO::AIO::poll_fileno, 3520 fd => BDB::poll_fileno,
2466 poll => 'r', 3521 poll => 'r',
2467 prio => 5, 3522 prio => 0,
2468 data => WF_AUTOCANCEL,
2469 cb => \&IO::AIO::poll_cb,
2470);
2471
2472Event->timer (
2473 data => WF_AUTOCANCEL, 3523 data => WF_AUTOCANCEL,
2474 after => 0, 3524 cb => \&BDB::poll_cb,
2475 interval => 10, 3525 );
2476 cb => sub { 3526 BDB::min_parallel 8;
2477 (Coro::unblock_sub { 3527
2478 write_runtime 3528 BDB::set_sync_prepare {
2479 or warn "ERROR: unable to write runtime file: $!"; 3529 my $status;
3530 my $current = $Coro::current;
3531 (
3532 sub {
3533 $status = $!;
3534 $current->ready; undef $current;
3535 },
3536 sub {
3537 Coro::schedule while defined $current;
3538 $! = $status;
3539 },
3540 )
3541 };
3542
3543 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create;
3545
3546 cf::sync_job {
3547 eval {
3548 BDB::db_env_open
3549 $DB_ENV,
3550 $BDBDIR,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666;
3554
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3556
3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3558 $DB_ENV->set_lk_detect;
3559 };
3560
3561 cf::cleanup "db_env_open(db): $@" if $@;
2480 })->(); 3562 };
2481 }, 3563 }
2482); 3564}
3565
3566{
3567 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io (
3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
3574 fd => IO::AIO::poll_fileno,
3575 poll => 'r',
3576 prio => 6,
3577 cb => \&IO::AIO::poll_cb,
3578 );
3579}
3580
3581my $_log_backtrace;
3582
3583sub _log_backtrace {
3584 my ($msg, @addr) = @_;
3585
3586 $msg =~ s/\n//;
3587
3588 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace;
3591 async {
3592 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!";
3597
3598 my @funcs;
3599 my @res = <$fh>;
3600 chomp for @res;
3601 while (@res) {
3602 my ($func, $line) = splice @res, 0, 2, ();
3603 push @funcs, "[$func] $line";
3604 }
3605
3606 @funcs
3607 };
3608
3609 LOG llevInfo, "[ABT] $msg\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace;
3612 };
3613 } else {
3614 LOG llevInfo, "[ABT] $msg\n";
3615 LOG llevInfo, "[ABT] [suppressed]\n";
3616 }
3617}
3618
3619# load additional modules
3620use cf::pod;
2483 3621
2484END { cf::emergency_save } 3622END { cf::emergency_save }
2485 3623
24861 36241
2487 3625

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines