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.117 by root, Mon Jan 1 17:50:26 2007 UTC vs.
Revision 1.143 by root, Sun Jan 7 02:39:14 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
817 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
818 or return; 871 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
820 } 873 }
821 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 877 return ($data, $av);
823} 878}
824 879
825############################################################################# 880#############################################################################
826# command handling &c 881# command handling &c
… …
1017 1072
1018=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1019 1074
1020Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1021 1076
1077=cut
1078
1079package cf::player;
1080
1022=head3 cf::player 1081=head3 cf::player
1023 1082
1024=over 4 1083=over 4
1025 1084
1026=item cf::player::exists $login 1085=item cf::player::find $login
1027 1086
1028Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1029 1088
1030=cut 1089=cut
1031 1090
1032sub cf::player::exists($) { 1091sub path($) {
1033 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1034 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 cf::localdir, cf::playerdir,
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
1095}
1096
1097sub find_active($) {
1098 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active
1100 and $cf::PLAYER{$_[0]}
1101}
1102
1103sub exists($) {
1104 my ($login) = @_;
1105
1106 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login }
1108}
1109
1110sub find($) {
1111 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0];
1113
1114 my $guard = cf::lock_acquire "user_find:$login";
1115
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1117 };
1118}
1119
1120sub save($) {
1121 my ($pl) = @_;
1122
1123 return if $pl->{deny_save};
1124
1125 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path";
1127
1128 return if $pl->{deny_save};
1129 $pl->{last_save} = $cf::RUNTIME;
1130
1131 Coro::cede;
1132 $pl->save_pl ($path);
1133 Coro::cede;
1134}
1135
1136sub new($) {
1137 my ($login) = @_;
1138
1139 my $self = create;
1140
1141 $self->ob->name ($login);
1142 $self->{deny_save} = 1;
1143
1144 $cf::PLAYER{$login} = $self;
1145
1146 $self
1035} 1147}
1036 1148
1037=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1038 1150
1039Sends an ext reply to the player. 1151Sends an ext reply to the player.
1040 1152
1041=cut 1153=cut
1042 1154
1043sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1044 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1045 1157
1046 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1047 1159
1048 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1049} 1161}
1162
1163package cf;
1050 1164
1051=back 1165=back
1052 1166
1053 1167
1054=head3 cf::map 1168=head3 cf::map
… …
1060package cf::map; 1174package cf::map;
1061 1175
1062use Fcntl; 1176use Fcntl;
1063use Coro::AIO; 1177use Coro::AIO;
1064 1178
1065our $MAX_RESET = 7200; 1179our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1180our $DEFAULT_RESET = 3000;
1067 1181
1068sub generate_random_map { 1182sub generate_random_map {
1069 my ($path, $rmp) = @_; 1183 my ($path, $rmp) = @_;
1070 1184
1071 # mit "rum" bekleckern, nicht 1185 # mit "rum" bekleckern, nicht
… …
1087# and all this just because we cannot iterate over 1201# and all this just because we cannot iterate over
1088# all maps in C++... 1202# all maps in C++...
1089sub change_all_map_light { 1203sub change_all_map_light {
1090 my ($change) = @_; 1204 my ($change) = @_;
1091 1205
1092 $_->change_map_light ($change) for values %cf::MAP; 1206 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP;
1093} 1208}
1094 1209
1095sub try_load_header($) { 1210sub try_load_header($) {
1096 my ($path) = @_; 1211 my ($path) = @_;
1097 1212
… …
1100 or return; 1215 or return;
1101 1216
1102 my $map = cf::map::new 1217 my $map = cf::map::new
1103 or return; 1218 or return;
1104 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1105 $map->load_header ($path) 1223 $map->load_header ($path)
1106 or return; 1224 or return;
1107 1225
1108 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1109 1227
1110 $map 1228 $map
1111} 1229}
1112 1230
1231sub find;
1113sub find_map { 1232sub find {
1114 my ($path, $origin) = @_; 1233 my ($path, $origin) = @_;
1115 1234
1116 #warn "find_map<$path,$origin>\n";#d# 1235 #warn "find<$path,$origin>\n";#d#
1117 1236
1118 $path = new cf::path $path, $origin && $origin->path; 1237 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1238 my $key = $path->as_string;
1120 1239
1240 cf::lock_wait "map_find:$key";
1241
1121 $cf::MAP{$key} || do { 1242 $cf::MAP{$key} || do {
1243 my $guard = cf::lock_acquire "map_find:$key";
1244
1122 # do it the slow way 1245 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1246 my $map = try_load_header $path->save_path;
1124 1247
1248 Coro::cede;
1249
1125 if ($map) { 1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1126 # safety 1253 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1254 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1255 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1256 } else {
1130 if (my $rmp = $path->random_map_params) { 1257 if (my $rmp = $path->random_map_params) {
… …
1135 1262
1136 $map or return; 1263 $map or return;
1137 1264
1138 $map->{load_original} = 1; 1265 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1268 $map->instantiate;
1141 1269
1142 # per-player maps become, after loading, normal maps 1270 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1271 $map->per_player (0) if $path->{user_rel};
1144 } 1272 }
1145 1273
1146 $map->path ($key); 1274 $map->path ($key);
1147 $map->{path} = $path; 1275 $map->{path} = $path;
1148 $map->{last_save} = $cf::RUNTIME; 1276 $map->{last_save} = $cf::RUNTIME;
1149 $map->last_access ($cf::RUNTIME); 1277
1278 Coro::cede;
1150 1279
1151 if ($map->should_reset) { 1280 if ($map->should_reset) {
1152 $map->reset; 1281 $map->reset;
1282 undef $guard;
1153 $map = find_map $path; 1283 $map = find $path
1284 or return;
1154 } 1285 }
1155 1286
1156 $cf::MAP{$key} = $map 1287 $cf::MAP{$key} = $map
1157 } 1288 }
1158} 1289}
1159 1290
1160sub load { 1291sub load {
1161 my ($self) = @_; 1292 my ($self) = @_;
1162 1293
1294 my $path = $self->{path};
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1296
1163 return if $self->in_memory != cf::MAP_SWAPPED; 1297 return if $self->in_memory != cf::MAP_SWAPPED;
1164 1298
1165 $self->in_memory (cf::MAP_LOADING); 1299 $self->in_memory (cf::MAP_LOADING);
1166
1167 my $path = $self->{path};
1168 1300
1169 $self->alloc; 1301 $self->alloc;
1170 $self->load_objects ($self->{load_path}, 1) 1302 $self->load_objects ($self->{load_path}, 1)
1171 or return; 1303 or return;
1172 1304
… …
1178 if (aio_open $uniq, O_RDONLY, 0) { 1310 if (aio_open $uniq, O_RDONLY, 0) {
1179 $self->clear_unique_items; 1311 $self->clear_unique_items;
1180 $self->load_objects ($uniq, 0); 1312 $self->load_objects ($uniq, 0);
1181 } 1313 }
1182 } 1314 }
1315
1316 Coro::cede;
1183 1317
1184 # now do the right thing for maps 1318 # now do the right thing for maps
1185 $self->link_multipart_objects; 1319 $self->link_multipart_objects;
1186 1320
1187 if ($self->{path}->is_style_map) { 1321 if ($self->{path}->is_style_map) {
… …
1195 $self->difficulty ($self->estimate_difficulty) 1329 $self->difficulty ($self->estimate_difficulty)
1196 unless $self->difficulty; 1330 unless $self->difficulty;
1197 $self->activate; 1331 $self->activate;
1198 } 1332 }
1199 1333
1334 Coro::cede;
1335
1200 $self->in_memory (cf::MAP_IN_MEMORY); 1336 $self->in_memory (cf::MAP_IN_MEMORY);
1201} 1337}
1202 1338
1203sub load_map_sync { 1339sub find_sync {
1204 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1205 1341
1206 #warn "load_map_sync<$path, $origin>\n";#d# 1342 cf::sync_job { cf::map::find $path, $origin }
1343}
1207 1344
1208 cf::sync_job { 1345sub do_load_sync {
1209 my $map = cf::map::find_map $path, $origin 1346 my ($map) = @_;
1210 or return; 1347
1211 $map->load; 1348 cf::sync_job { $map->load };
1212 $map
1213 }
1214} 1349}
1215 1350
1216sub save { 1351sub save {
1217 my ($self) = @_; 1352 my ($self) = @_;
1218 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1219 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1220 1357
1221 return unless $self->dirty; 1358 return unless $self->dirty;
1222 1359
1223 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
1224 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1225 1362
1226 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1227 1364
1228 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1366
1367 local $self->{last_access} = $self->last_access;#d#
1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1229 1372
1230 if ($uniq) { 1373 if ($uniq) {
1231 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1232 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1233 } else { 1376 } else {
… …
1236} 1379}
1237 1380
1238sub swap_out { 1381sub swap_out {
1239 my ($self) = @_; 1382 my ($self) = @_;
1240 1383
1384 # save first because save cedes
1385 $self->save;
1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1241 return if $self->players; 1389 return if $self->players;
1242 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1243 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1244 1392
1245 $self->save;
1246 $self->clear; 1393 $self->clear;
1247 $self->in_memory (cf::MAP_SWAPPED); 1394 $self->in_memory (cf::MAP_SWAPPED);
1248} 1395}
1249 1396
1250sub reset_at { 1397sub reset_at {
… …
1288} 1435}
1289 1436
1290sub reset { 1437sub reset {
1291 my ($self) = @_; 1438 my ($self) = @_;
1292 1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1441
1293 return if $self->players; 1442 return if $self->players;
1294 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1295 1444
1296 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
1297 1446
… …
1316 1465
1317sub customise_for { 1466sub customise_for {
1318 my ($map, $ob) = @_; 1467 my ($map, $ob) = @_;
1319 1468
1320 if ($map->per_player) { 1469 if ($map->per_player) {
1321 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1322 } 1471 }
1323 1472
1324 $map 1473 $map
1325} 1474}
1326 1475
1327sub emergency_save { 1476sub emergency_save {
1328 local $cf::FREEZE = 1; 1477 my $freeze_guard = cf::freeze_mainloop;
1329 1478
1330 warn "enter emergency map save\n"; 1479 warn "enter emergency map save\n";
1331 1480
1332 cf::sync_job { 1481 cf::sync_job {
1333 warn "begin emergency map save\n"; 1482 warn "begin emergency map save\n";
… …
1405=cut 1554=cut
1406 1555
1407sub cf::object::player::enter_link { 1556sub cf::object::player::enter_link {
1408 my ($self) = @_; 1557 my ($self) = @_;
1409 1558
1559 $self->deactivate_recursive;
1560
1410 return if $self->map == $LINK_MAP; 1561 return if $self->map == $LINK_MAP;
1411 1562
1412 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1563 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1413 if $self->map; 1564 if $self->map;
1414 1565
1415 $self->enter_map ($LINK_MAP, 20, 20); 1566 $self->enter_map ($LINK_MAP, 20, 20);
1416 $self->deactivate_recursive;
1417} 1567}
1418 1568
1419sub cf::object::player::leave_link { 1569sub cf::object::player::leave_link {
1420 my ($self, $map, $x, $y) = @_; 1570 my ($self, $map, $x, $y) = @_;
1421 1571
1422 my $link_pos = delete $self->{_link_pos}; 1572 my $link_pos = delete $self->{_link_pos};
1423 1573
1424 unless ($map) { 1574 unless ($map) {
1425 # restore original map position 1575 # restore original map position
1426 ($map, $x, $y) = @{ $link_pos || [] }; 1576 ($map, $x, $y) = @{ $link_pos || [] };
1427 $map = cf::map::find_map $map; 1577 $map = cf::map::find $map;
1428 1578
1429 unless ($map) { 1579 unless ($map) {
1430 ($map, $x, $y) = @$EMERGENCY_POSITION; 1580 ($map, $x, $y) = @$EMERGENCY_POSITION;
1431 $map = cf::map::find_map $map 1581 $map = cf::map::find $map
1432 or die "FATAL: cannot load emergency map\n"; 1582 or die "FATAL: cannot load emergency map\n";
1433 } 1583 }
1434 } 1584 }
1435 1585
1436 ($x, $y) = (-1, -1) 1586 ($x, $y) = (-1, -1)
… …
1440 ($x, $y) = ($map->enter_x, $map->enter_y) 1590 ($x, $y) = ($map->enter_x, $map->enter_y)
1441 if $x <=0 && $y <= 0; 1591 if $x <=0 && $y <= 0;
1442 1592
1443 $map->load; 1593 $map->load;
1444 1594
1595 return unless $self->contr->active;
1445 $self->activate_recursive; 1596 $self->activate_recursive;
1446 $self->enter_map ($map, $x, $y); 1597 $self->enter_map ($map, $x, $y);
1447} 1598}
1448 1599
1600cf::player->attach (
1601 on_logout => sub {
1602 my ($pl) = @_;
1603
1604 # abort map switching before logout
1605 if ($pl->ob->{_link_pos}) {
1606 cf::sync_job {
1607 $pl->ob->leave_link
1608 };
1609 }
1610 },
1611 on_login => sub {
1612 my ($pl) = @_;
1613
1614 # try to abort aborted map switching on player login :)
1615 # should happen only on crashes
1616 if ($pl->ob->{_link_pos}) {
1617 $pl->ob->enter_link;
1618 (async {
1619 # we need this sleep as the login has a concurrent enter_exit running
1620 # and this sleep increases chances of the player not ending up in scorn
1621 $pl->ob->reply (undef,
1622 "There was an internal problem at your last logout, "
1623 . "the server will try to bring you to your intended destination in a second.",
1624 cf::NDI_RED);
1625 Coro::Timer::sleep 1;
1626 $pl->ob->leave_link;
1627 })->prio (2);
1628 }
1629 },
1630);
1631
1449=item $player_object->goto_map ($map, $x, $y) 1632=item $player_object->goto ($path, $x, $y)
1450 1633
1451=cut 1634=cut
1452 1635
1453sub cf::object::player::goto_map { 1636sub cf::object::player::goto {
1454 my ($self, $path, $x, $y) = @_; 1637 my ($self, $path, $x, $y) = @_;
1455 1638
1456 $self->enter_link; 1639 $self->enter_link;
1457 1640
1458 (Coro::async { 1641 (async {
1459 $path = new cf::path $path; 1642 $path = new cf::path $path;
1460 1643
1461 my $map = cf::map::find_map $path->as_string; 1644 my $map = cf::map::find $path->as_string;
1462 $map = $map->customise_for ($self) if $map; 1645 $map = $map->customise_for ($self) if $map;
1463 1646
1464 warn "entering ", $map->path, " at ($x, $y)\n" 1647# warn "entering ", $map->path, " at ($x, $y)\n"
1465 if $map; 1648# if $map;
1466 1649
1467 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1650 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1468 1651
1469 $self->leave_link ($map, $x, $y); 1652 $self->leave_link ($map, $x, $y);
1470 })->prio (1); 1653 })->prio (1);
… …
1525 1708
1526 return unless $self->type == cf::PLAYER; 1709 return unless $self->type == cf::PLAYER;
1527 1710
1528 $self->enter_link; 1711 $self->enter_link;
1529 1712
1530 (Coro::async { 1713 (async {
1714 $self->deactivate_recursive; # just to be sure
1531 unless (eval { 1715 unless (eval {
1532
1533 prepare_random_map $exit 1716 prepare_random_map $exit
1534 if $exit->slaying eq "/!"; 1717 if $exit->slaying eq "/!";
1535 1718
1536 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1719 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1537 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1720 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1538 1721
1539 1; 1722 1;
1540 }) { 1723 }) {
1541 $self->message ("Something went wrong deep within the crossfire server. " 1724 $self->message ("Something went wrong deep within the crossfire server. "
1542 . "I'll try to bring you back to the map you were before. " 1725 . "I'll try to bring you back to the map you were before. "
… …
1599 on_reply => sub { 1782 on_reply => sub {
1600 my ($ns, $msg) = @_; 1783 my ($ns, $msg) = @_;
1601 1784
1602 # this weird shuffling is so that direct followup queries 1785 # this weird shuffling is so that direct followup queries
1603 # get handled first 1786 # get handled first
1604 my $queue = delete $ns->{query_queue}; 1787 my $queue = delete $ns->{query_queue}
1788 or return; # be conservative, not sure how that can happen, but we saw a crash here
1605 1789
1606 (shift @$queue)->[1]->($msg); 1790 (shift @$queue)->[1]->($msg);
1607 1791
1608 push @{ $ns->{query_queue} }, @$queue; 1792 push @{ $ns->{query_queue} }, @$queue;
1609 1793
… …
1615 } 1799 }
1616 } 1800 }
1617 }, 1801 },
1618); 1802);
1619 1803
1620=item $client->coro (\&cb) 1804=item $client->async (\&cb)
1621 1805
1622Create a new coroutine, running the specified callback. The coroutine will 1806Create a new coroutine, running the specified callback. The coroutine will
1623be automatically cancelled when the client gets destroyed (e.g. on logout, 1807be automatically cancelled when the client gets destroyed (e.g. on logout,
1624or loss of connection). 1808or loss of connection).
1625 1809
1626=cut 1810=cut
1627 1811
1628sub cf::client::coro { 1812sub cf::client::async {
1629 my ($self, $cb) = @_; 1813 my ($self, $cb) = @_;
1630 1814
1631 my $coro; $coro = async { 1815 my $coro = &Coro::async ($cb);
1632 eval {
1633 $cb->();
1634 };
1635 warn $@ if $@;
1636 };
1637 1816
1638 $coro->on_destroy (sub { 1817 $coro->on_destroy (sub {
1639 delete $self->{_coro}{$coro+0}; 1818 delete $self->{_coro}{$coro+0};
1640 }); 1819 });
1641 1820
… …
1813 1992
1814{ 1993{
1815 my $path = cf::localdir . "/database.pst"; 1994 my $path = cf::localdir . "/database.pst";
1816 1995
1817 sub db_load() { 1996 sub db_load() {
1818 warn "loading database $path\n";#d# remove later
1819 $DB = stat $path ? Storable::retrieve $path : { }; 1997 $DB = stat $path ? Storable::retrieve $path : { };
1820 } 1998 }
1821 1999
1822 my $pid; 2000 my $pid;
1823 2001
1824 sub db_save() { 2002 sub db_save() {
1825 warn "saving database $path\n";#d# remove later
1826 waitpid $pid, 0 if $pid; 2003 waitpid $pid, 0 if $pid;
1827 if (0 == ($pid = fork)) { 2004 if (0 == ($pid = fork)) {
1828 $DB->{_meta}{version} = 1; 2005 $DB->{_meta}{version} = 1;
1829 Storable::nstore $DB, "$path~"; 2006 Storable::nstore $DB, "$path~";
1830 rename "$path~", $path; 2007 rename "$path~", $path;
… …
1878 open my $fh, "<:utf8", cf::confdir . "/config" 2055 open my $fh, "<:utf8", cf::confdir . "/config"
1879 or return; 2056 or return;
1880 2057
1881 local $/; 2058 local $/;
1882 *CFG = YAML::Syck::Load <$fh>; 2059 *CFG = YAML::Syck::Load <$fh>;
2060
2061 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2062
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065
2066 if (exists $CFG{mlockall}) {
2067 eval {
2068 $CFG{mlockall} ? &mlockall : &munlockall
2069 and die "WARNING: m(un)lockall failed: $!\n";
2070 };
2071 warn $@ if $@;
2072 }
1883} 2073}
1884 2074
1885sub main { 2075sub main {
1886 # we must not ever block the main coroutine 2076 # we must not ever block the main coroutine
1887 local $Coro::idle = sub { 2077 local $Coro::idle = sub {
1888 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2078 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1889 (Coro::unblock_sub {
1890 Event::one_event; 2079 async { Event::one_event };
1891 })->();
1892 }; 2080 };
1893 2081
1894 cfg_load; 2082 cfg_load;
1895 db_load; 2083 db_load;
1896 load_extensions; 2084 load_extensions;
… …
1907 return; 2095 return;
1908 } 2096 }
1909 2097
1910 warn "reloading..."; 2098 warn "reloading...";
1911 2099
1912 local $FREEZE = 1; 2100 my $guard = freeze_mainloop;
1913 cf::emergency_save; 2101 cf::emergency_save;
1914 2102
1915 eval { 2103 eval {
1916 # if anything goes wrong in here, we should simply crash as we already saved 2104 # if anything goes wrong in here, we should simply crash as we already saved
1917 2105
… …
2004 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2005 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2006 2194
2007 # dirty hack because... archetypes are not yet loaded 2195 # dirty hack because... archetypes are not yet loaded
2008 Event->timer ( 2196 Event->timer (
2009 after => 2, 2197 after => 10,
2010 cb => sub { 2198 cb => sub {
2011 $_[0]->w->cancel; 2199 $_[0]->w->cancel;
2012 2200
2013 # provide some exits "home" 2201 # provide some exits "home"
2014 my $exit = cf::object::new "exit"; 2202 my $exit = cf::object::new "exit";
… …
2053 reentrant => 0, 2241 reentrant => 0,
2054 prio => 0, 2242 prio => 0,
2055 at => $NEXT_TICK || $TICK, 2243 at => $NEXT_TICK || $TICK,
2056 data => WF_AUTOCANCEL, 2244 data => WF_AUTOCANCEL,
2057 cb => sub { 2245 cb => sub {
2058 unless ($FREEZE) {
2059 cf::server_tick; # one server iteration 2246 cf::server_tick; # one server iteration
2060 $RUNTIME += $TICK; 2247 $RUNTIME += $TICK;
2061 }
2062
2063 $NEXT_TICK += $TICK; 2248 $NEXT_TICK += $TICK;
2064 2249
2065 # if we are delayed by four ticks or more, skip them all 2250 # if we are delayed by four ticks or more, skip them all
2066 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2251 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2067 2252
… …
2090 or warn "ERROR: unable to write runtime file: $!"; 2275 or warn "ERROR: unable to write runtime file: $!";
2091 })->(); 2276 })->();
2092 }, 2277 },
2093); 2278);
2094 2279
2280END { cf::emergency_save }
2281
20951 22821
2096 2283

Diff Legend

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